inet_ntop. getaddrinfo: Respect rules for use of AC_LIBOBJ.

[pspp] / modules / search

diff --git a/modules/search b/modules/search
index dce574756a417e9598f21c31fe62ff91b2867ec0..16de9ea6942750ba7e5815d562fa58028d03168f 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -19,14 +19,16 @@ 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.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+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' \
+         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 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -41,7 +43,7 @@ Include:
 <search.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all