X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Ficonv;h=105b16641373ee97698b6dad18e0ad7d829e3c13;hb=b9d1fbeaa2ac943998d21abd9b973dd8a2d62eed;hp=9d946c2fe4e8f48b8881990912160318b5b087de;hpb=3a2b984dfe59448e66e95a2f9f1021956d6cb0fa;p=gnulib.git

diff --git a/modules/iconv b/modules/iconv
index 9d946c2fe..105b16641 100644
--- a/modules/iconv
+++ b/modules/iconv
@@ -3,23 +3,27 @@ Character set conversion.
 
 Files:
 m4/iconv.m4
-m4/lib-ld.m4
-m4/lib-link.m4
-m4/lib-prefix.m4
-build-aux/config.rpath
 
 Depends-on:
+havelib
 
 configure.ac:
 AM_ICONV
+m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+  [gl_ICONV_MODULE_INDICATOR([iconv])])
 
 Makefile.am:
 
 Include:
-<iconv.h>
+#if HAVE_ICONV
+# include <iconv.h>
+#endif
+
+Link:
+$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible