X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsearch_h.m4;h=11afde507a5e23771f1e33993919162dd6b1fa99;hb=8866a241ddbf4a459347b7147e325f539e4c07fe;hp=07c9fae88c62e5c4486d072d4253601cf710c74b;hpb=3030c5b5e0a5199e16b05927da72c43c42f211c3;p=gnulib.git

diff --git a/m4/search_h.m4 b/m4/search_h.m4
index 07c9fae88..11afde507 100644
--- a/m4/search_h.m4
+++ b/m4/search_h.m4
@@ -1,5 +1,5 @@
-# search_h.m4 serial 3
-dnl Copyright (C) 2007-2009 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.
@@ -14,13 +14,20 @@ AC_DEFUN([gl_SEARCH_H],
     HAVE_SEARCH_H=0
   fi
   AC_SUBST([HAVE_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])
-  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],