projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extensions: port better to MINUX 3, HP-UX, autoheader 2.62
[gnulib.git]
/
m4
/
search_h.m4
diff --git
a/m4/search_h.m4
b/m4/search_h.m4
index
d894ed0
..
11afde5
100644
(file)
--- a/
m4/search_h.m4
+++ b/
m4/search_h.m4
@@
-1,5
+1,5
@@
-# search_h.m4 serial
1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# search_h.m4 serial
8
+dnl Copyright (C) 2007
-2013
Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@
-7,28
+7,33
@@
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_SEARCH_H],
[
AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
AC_DEFUN([gl_SEARCH_H],
[
AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
-
AC_CHECK_HEADERS_ONCE
([search.h])
+
gl_CHECK_NEXT_HEADERS
([search.h])
if test $ac_cv_header_search_h = yes; then
HAVE_SEARCH_H=1
if test $ac_cv_header_search_h = yes; then
HAVE_SEARCH_H=1
- gl_ABSOLUTE_HEADER([search.h])
- ABSOLUTE_SEARCH_H=\"$gl_cv_absolute_search_h\"
else
HAVE_SEARCH_H=0
fi
AC_SUBST([HAVE_SEARCH_H])
else
HAVE_SEARCH_H=0
fi
AC_SUBST([HAVE_SEARCH_H])
- AC_SUBST([ABSOLUTE_SEARCH_H])
+
+ dnl Check for declarations of anything we want to poison if the
+ dnl corresponding gnulib module is not in use.
+ gl_WARN_ON_USE_PREPARE([[#include <search.h>
+ ]], [tdelete tfind tsearch twalk])
])
AC_DEFUN([gl_SEARCH_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
])
AC_DEFUN([gl_SEARCH_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
- GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+ dnl Define it also as a C macro, for the benefit of the unit tests.
+ gl_MODULE_INDICATOR_FOR_TESTS([$1])
])
AC_DEFUN([gl_SEARCH_H_DEFAULTS],
[
GNULIB_TSEARCH=0; AC_SUBST([GNULIB_TSEARCH])
dnl Assume proper GNU behavior unless another module says otherwise.
])
AC_DEFUN([gl_SEARCH_H_DEFAULTS],
[
GNULIB_TSEARCH=0; AC_SUBST([GNULIB_TSEARCH])
dnl Assume proper GNU behavior unless another module says otherwise.
- HAVE_TSEARCH=1; AC_SUBST([HAVE_TSEARCH])
+ HAVE_TSEARCH=1; AC_SUBST([HAVE_TSEARCH])
+ REPLACE_TSEARCH=0; AC_SUBST([REPLACE_TSEARCH])
])
])