X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv;h=105b16641373ee97698b6dad18e0ad7d829e3c13;hb=be6418e5cb639583826a55437ddb67e273ffabf4;hp=6278b2e34f458f2aef718d5b726e9877e47b953e;hpb=6f99528a90dc8e6beb07ac5ced73770ed82a0830;p=gnulib.git

diff --git a/modules/iconv b/modules/iconv
index 6278b2e34..105b16641 100644
--- a/modules/iconv
+++ b/modules/iconv
@@ -3,20 +3,27 @@ Character set conversion.
 
 Files:
 m4/iconv.m4
-m4/lib-ld.m4
-m4/lib-link.m4
-m4/lib-prefix.m4
-config/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:
+LGPLv2+
 
 Maintainer:
 Bruno Haible