X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=modules%2Ficonv;h=5d81aa3db0bd18e89611d723d3f1ffbfc6352e46;hb=fba7fdb1432af9bf0abece1ec8078ed8ae3af886;hp=3664d316aa9580a03c9c04fc5640363101df43f2;hpb=1a162b06ee812ec53f6a4630a4050635624679ab;p=pspp

diff --git a/modules/iconv b/modules/iconv
index 3664d316aa..5d81aa3db0 100644
--- a/modules/iconv
+++ b/modules/iconv
@@ -3,7 +3,6 @@ Character set conversion.
 
 Files:
 m4/iconv.m4
-build-aux/config.rpath
 
 Depends-on:
 havelib
@@ -14,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