X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flanginfo;h=c7f545e7bc3452f33cbb43a1fcb460e72c1f9e85;hb=d9981c909aa1ea316367d76e4049e4322c32df18;hp=f9298d05f52bd8a18a762257c30ad782a9cc7c18;hpb=8d8788c406b9a62a06294fd44aa3725c9ecd3919;p=gnulib.git

diff --git a/modules/langinfo b/modules/langinfo
index f9298d05f..c7f545e7b 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -8,7 +8,8 @@ m4/langinfo_h.m4
 Depends-on:
 extensions
 include_next
-link-warning
+c++defs
+warn-on-use
 
 configure.ac:
 gl_LANGINFO_H
@@ -18,7 +19,7 @@ BUILT_SOURCES += langinfo.h
 
 # We need the following in order to create an empty placeholder for
 # <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(LINK_WARNING_H)
+langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
@@ -30,7 +31,8 @@ langinfo.h: langinfo.in.h $(LINK_WARNING_H)
 	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
 	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
 	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/langinfo.in.h; \
 	} > $@-t && \
 	mv $@-t $@