X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv_open;h=c965b8ff7ad5e0580d81794e563e2a5399a6ec94;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=7b8190fe7437b4f0e32b6529dec7b855a60999fd;hpb=4013d14c4b1f18cb4b665a0a47ad80ce3224d25d;p=gnulib.git

diff --git a/modules/iconv_open b/modules/iconv_open
index 7b8190fe7..c965b8ff7 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -8,17 +8,29 @@ lib/iconv_open-hpux.gperf
 lib/iconv_open-irix.gperf
 lib/iconv_open-osf.gperf
 lib/iconv_open-solaris.gperf
+lib/iconv.c
+lib/iconv_close.c
 m4/iconv_open.m4
 
 Depends-on:
 gperf
 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_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:
 iconv_open-aix.h: iconv_open-aix.gperf