X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fnetdb;h=b324866c1b152262c220173e84ee6e4b911b484d;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=59f26891d469a2e2fee205209d6ee6ff67639179;hpb=3864a29763baff1d01895a57f73729fd53cc5fbf;p=gnulib.git

diff --git a/modules/netdb b/modules/netdb
index 59f26891d..b324866c1 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -6,10 +6,10 @@ lib/netdb.in.h
 m4/netdb_h.m4
 
 Depends-on:
-c++defs
 include_next
-arg-nonnull
-warn-on-use
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
 sys_socket
 
 configure.ac:
@@ -23,12 +23,13 @@ BUILT_SOURCES += netdb.h
 netdb.h: netdb.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_NETDB_H''@|$(NEXT_NETDB_H)|g' \
 	      -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \
-	      -e 's|@''GNULIB_GETADDRINFO''@|$(GNULIB_GETADDRINFO)|g' \
+	      -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \
 	      -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \
 	      -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \
 	      -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \