X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv-h;h=e20b0738722e43ca795d708614ecc8fa44a9c273;hb=cdab46314ef271e8dc491739dddbaaa197ca3ede;hp=df0e0708618d9dff3da2b44c2a02781b3cf54a98;hpb=f480581dc6834f060592a11c256b08068b518d42;p=gnulib.git diff --git a/modules/iconv-h b/modules/iconv-h index df0e07086..e20b07387 100644 --- a/modules/iconv-h +++ b/modules/iconv-h @@ -7,9 +7,9 @@ m4/iconv_h.m4 Depends-on: include_next -c++defs -arg-nonnull -warn-on-use +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use configure.ac: gl_ICONV_H @@ -19,14 +19,16 @@ BUILT_SOURCES += $(ICONV_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +if GL_GENERATE_ICONV_H +iconv.h: iconv.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_ICONV_H''@|$(NEXT_ICONV_H)|g' \ - -e 's|@''GNULIB_ICONV''@|$(GNULIB_ICONV)|g' \ + -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ @@ -37,6 +39,10 @@ iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) < $(srcdir)/iconv.in.h; \ } > $@-t && \ mv $@-t $@ +else +iconv.h: $(top_builddir)/config.status + rm -f $@ +endif MOSTLYCLEANFILES += iconv.h iconv.h-t Include: