X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsearch;h=7adddc144d4bd336aba9c397bd373b6b2f6f7573;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=9ab82eaec7e6a0b895de7d15e5702c4b336db85b;hpb=b6a9d33ee89de0a0f7bf482449339e97cbbbdaef;p=gnulib.git

diff --git a/modules/search b/modules/search
index 9ab82eaec..7adddc144 100644
--- a/modules/search
+++ b/modules/search
@@ -2,12 +2,14 @@ Description:
 A GNU-like <search.h>.
 
 Files:
-lib/search_.h
+lib/search.in.h
 m4/search_h.m4
 
 Depends-on:
 include_next
-link-warning
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_SEARCH_H
@@ -17,25 +19,31 @@ BUILT_SOURCES += search.h
 
 # We need the following in order to create <search.h> when the system
 # doesn't have one that works with the given compiler.
-search.h: search_.h
-	rm -f $@-t $@
+search.h: search.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
-	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
-	      -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
+	      -e 's/@''GNULIB_TSEARCH''@/$(GNULIB_TSEARCH)/g' \
 	      -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      < $(srcdir)/search_.h; \
-	} > $@-t
+	      -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/search.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += search.h search.h-t
 
 Include:
-#include <search.h>
+<search.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all