Mercurial > hg > octave-shane > gnulib-hg
annotate m4/search_h.m4 @ 17627:4d899884c95c
m4: fix gl_TIMER_TIME() detection of threads on uClibc
The timer_time.m4 gl_TIMER_TIME function determines which libraries
need to be linked to get access to the timer function, generally -lrt
for Linux systems. On platforms where threads are used, librt
typically uses thread functions from libpthread.
However, the test to determine whether the platform has thread or not
is incorrect: it assumes that if the C library is uClibc, then threads
are not available. This is actually not true: uClibc has configurable
thread support, and when thread support is available, librt calls
libpthread functions.
This is important when static linking is used, because otherwise only
-lrt is used at link time, which fails because librt calls undefined
thread functions. Both -lrt and -lpthread must be passed.
This problem is fixed by making the uClibc thread detection a bit
smarter, thanks to the usage of the __HAS_NO_THREADS__ macro defined
in <bits/uClibc_config.h>, which itself is included by <features.h>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
---|---|
date | Sat, 22 Feb 2014 00:41:38 +0100 |
parents | 344018b6e5d7 |
children |
rev | line source |
---|---|
14211
26a04a37c3d3
gl_CHECK_NEXT_HEADERS implies AC_CHECK_HEADERS_ONCE
Paul Eggert <eggert@cs.ucla.edu>
parents:
14079
diff
changeset
|
1 # search_h.m4 serial 8 |
17587 | 2 dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. |
8532 | 3 dnl This file is free software; the Free Software Foundation |
4 dnl gives unlimited permission to copy and/or distribute it, | |
5 dnl with or without modifications, as long as this notice is preserved. | |
6 | |
7 AC_DEFUN([gl_SEARCH_H], | |
8 [ | |
9 AC_REQUIRE([gl_SEARCH_H_DEFAULTS]) | |
8995
1025663f7658
* m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST
Paul Eggert <eggert@cs.ucla.edu>
parents:
8532
diff
changeset
|
10 gl_CHECK_NEXT_HEADERS([search.h]) |
8532 | 11 if test $ac_cv_header_search_h = yes; then |
12 HAVE_SEARCH_H=1 | |
13 else | |
14 HAVE_SEARCH_H=0 | |
15 fi | |
16 AC_SUBST([HAVE_SEARCH_H]) | |
12766
2c14f1e449e5
warn-on-use: use instead of link-warning
Eric Blake <ebb9@byu.net>
parents:
12563
diff
changeset
|
17 |
2c14f1e449e5
warn-on-use: use instead of link-warning
Eric Blake <ebb9@byu.net>
parents:
12563
diff
changeset
|
18 dnl Check for declarations of anything we want to poison if the |
2c14f1e449e5
warn-on-use: use instead of link-warning
Eric Blake <ebb9@byu.net>
parents:
12563
diff
changeset
|
19 dnl corresponding gnulib module is not in use. |
2c14f1e449e5
warn-on-use: use instead of link-warning
Eric Blake <ebb9@byu.net>
parents:
12563
diff
changeset
|
20 gl_WARN_ON_USE_PREPARE([[#include <search.h> |
2c14f1e449e5
warn-on-use: use instead of link-warning
Eric Blake <ebb9@byu.net>
parents:
12563
diff
changeset
|
21 ]], [tdelete tfind tsearch twalk]) |
8532 | 22 ]) |
23 | |
24 AC_DEFUN([gl_SEARCH_MODULE_INDICATOR], | |
25 [ | |
26 dnl Use AC_REQUIRE here, so that the default settings are expanded once only. | |
27 AC_REQUIRE([gl_SEARCH_H_DEFAULTS]) | |
13066
fc8c984b0733
Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents:
12961
diff
changeset
|
28 gl_MODULE_INDICATOR_SET_VARIABLE([$1]) |
12961
633887b7a0d3
Tests of module 'search' in C++ mode.
Bruno Haible <bruno@clisp.org>
parents:
12766
diff
changeset
|
29 dnl Define it also as a C macro, for the benefit of the unit tests. |
13071
b2385e7b332e
Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents:
13066
diff
changeset
|
30 gl_MODULE_INDICATOR_FOR_TESTS([$1]) |
8532 | 31 ]) |
32 | |
33 AC_DEFUN([gl_SEARCH_H_DEFAULTS], | |
34 [ | |
35 GNULIB_TSEARCH=0; AC_SUBST([GNULIB_TSEARCH]) | |
36 dnl Assume proper GNU behavior unless another module says otherwise. | |
9595
53dc0fa4233a
Work around OpenBSD 4.0 tdelete() bug.
Bruno Haible <bruno@clisp.org>
parents:
8995
diff
changeset
|
37 HAVE_TSEARCH=1; AC_SUBST([HAVE_TSEARCH]) |
53dc0fa4233a
Work around OpenBSD 4.0 tdelete() bug.
Bruno Haible <bruno@clisp.org>
parents:
8995
diff
changeset
|
38 REPLACE_TSEARCH=0; AC_SUBST([REPLACE_TSEARCH]) |
8532 | 39 ]) |