X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=modules%2Ficonv;h=105b16641373ee97698b6dad18e0ad7d829e3c13;hb=86e2d81da06878e9aace64867dd3f09d63e9f39e;hp=a7cbf154655bebed1407f73f8f276ab2cb8b2af9;hpb=72a09f7cd6c30624a5805f088e99e0e6b9a654cf;p=pspp

diff --git a/modules/iconv b/modules/iconv
index a7cbf15465..105b166413 100644
--- a/modules/iconv
+++ b/modules/iconv
@@ -9,14 +9,21 @@ 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