X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv;h=5d81aa3db0bd18e89611d723d3f1ffbfc6352e46;hb=116440ae18064c1495285a42767547b3ffa418d4;hp=9d946c2fe4e8f48b8881990912160318b5b087de;hpb=3a2b984dfe59448e66e95a2f9f1021956d6cb0fa;p=gnulib.git

diff --git a/modules/iconv b/modules/iconv
index 9d946c2fe..5d81aa3db 100644
--- a/modules/iconv
+++ b/modules/iconv
@@ -3,12 +3,9 @@ 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
@@ -16,10 +13,15 @@ AM_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