X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flocale;h=d7e3789ed053b20256c5cab928a62ff08ddd8696;hb=e1c466d11a91615c413789ea8bc3ec358f2c6aa9;hp=70e5e286e5f01492791ce6177e16a8e5163c304c;hpb=95e1b7bdbfc6111b5aea7a32aa874ec0f4af7f86;p=gnulib.git

diff --git a/modules/locale b/modules/locale
index 70e5e286e..d7e3789ed 100644
--- a/modules/locale
+++ b/modules/locale
@@ -6,12 +6,12 @@ lib/locale.in.h
 m4/locale_h.m4
 
 Depends-on:
-c++defs
 extensions
 include_next
 snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
 stddef
-warn-on-use
 
 configure.ac:
 gl_LOCALE_H
@@ -29,12 +29,15 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
 	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
 	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
 	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
 	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
 	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
 	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|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)' \