Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / modules / iconv_open

diff --git a/modules/iconv_open b/modules/iconv_open
index ab92f0c..c965b8f 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -2,49 +2,37 @@ Description:
 Character set conversion.
 
 Files:
-lib/iconv.in.h
 lib/iconv_open.c
 lib/iconv_open-aix.gperf
 lib/iconv_open-hpux.gperf
 lib/iconv_open-irix.gperf
 lib/iconv_open-osf.gperf
 lib/iconv_open-solaris.gperf
-m4/iconv_h.m4
+lib/iconv.c
+lib/iconv_close.c
 m4/iconv_open.m4
 
 Depends-on:
 gperf
-include_next
-arg-nonnull
+iconv-h
 iconv
-c-ctype
-c-strcase
+c-ctype           [test $REPLACE_ICONV_OPEN = 1]
+c-strcase         [test $REPLACE_ICONV_OPEN = 1]
+stdint            [test $REPLACE_ICONV_UTF = 1]
+unistr/u8-mbtoucr [test $REPLACE_ICONV_UTF = 1]
+unistr/u8-uctomb  [test $REPLACE_ICONV_UTF = 1]
 
 configure.ac:
-gl_ICONV_H
 gl_FUNC_ICONV_OPEN
+if test $REPLACE_ICONV_OPEN = 1; then
+  AC_LIBOBJ([iconv_open])
+fi
+if test $REPLACE_ICONV = 1; then
+  AC_LIBOBJ([iconv])
+  AC_LIBOBJ([iconv_close])
+fi
 
 Makefile.am:
-BUILT_SOURCES += $(ICONV_H)
-
-# We need the following in order to create <iconv.h> when the system
-# doesn't have one that works with the given compiler.
-iconv.h: iconv.in.h $(ARG_NONNULL_H)
-       $(AM_V_GEN)rm -f $@-t $@ && \
-       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-             -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-             -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-             -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-             -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             < $(srcdir)/iconv.in.h; \
-       } > $@-t && \
-       mv $@-t $@
-MOSTLYCLEANFILES += iconv.h iconv.h-t
-
 iconv_open-aix.h: iconv_open-aix.gperf
        $(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
        mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h