X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv;h=105b16641373ee97698b6dad18e0ad7d829e3c13;hb=76d82d2d7f5ba1a69da6aaa71ff170f5a90a6c94;hp=3664d316aa9580a03c9c04fc5640363101df43f2;hpb=1a162b06ee812ec53f6a4630a4050635624679ab;p=gnulib.git

diff --git a/modules/iconv b/modules/iconv
index 3664d316a..105b16641 100644
--- a/modules/iconv
+++ b/modules/iconv
@@ -3,21 +3,27 @@ Character set conversion.
 
 Files:
 m4/iconv.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