X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsearch;h=8ba2a1c2a25ba9809d360c06cab786c23ab537c2;hb=0aeacfbbc772ef589c713039cf8ee2ab40595b03;hp=0ed8b8da48a3585ce00115fdafee37f1ac680ccb;hpb=ab681e53f8100fdb144e0a100d6f2da9ff7c005f;p=gnulib.git

diff --git a/modules/search b/modules/search
index 0ed8b8da4..8ba2a1c2a 100644
--- a/modules/search
+++ b/modules/search
@@ -2,11 +2,11 @@ Description:
 A GNU-like <search.h>.
 
 Files:
-lib/search_.h
+lib/search.in.h
 m4/search_h.m4
 
 Depends-on:
-absolute-header
+include_next
 link-warning
 
 configure.ac:
@@ -17,16 +17,18 @@ 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
+search.h: search.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
-	      -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \
-	      -e 's|@''ABSOLUTE_SEARCH_H''@|$(ABSOLUTE_SEARCH_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
 	      -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
 	      -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
+	      -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      < $(srcdir)/search_.h; \
+	      < $(srcdir)/search.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += search.h search.h-t