From: Micah Cowan <micah@cowan.name>
Date: Fri, 3 Jul 2009 20:04:51 +0000 (-0700)
Subject: Make sure we link against libiconv when necessary.
X-Git-Tag: v1.13~325
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=9ef8e738a47e02c0a4826599591bceb8048be7bb

Make sure we link against libiconv when necessary.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d3e68f1a..be7f3e02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-03  Micah Cowan  <micah@cowan.name>
+
+	* Makefile.am (LIBS): Added @LIBICONV@.
+
 2009-07-02  Micah Cowan  <micah@cowan.name>
 
 	* recur.c (url_enqueue): Quote enqueue/dequeue debug messages.
diff --git a/src/Makefile.am b/src/Makefile.am
index a225e8f6..3bbae672 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ endif
 
 # The following line is losing on some versions of make!
 DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ @LIBS@
+LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @LIBS@
 
 bin_PROGRAMS = wget
 wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c    		  \