Make sure we link against libiconv when necessary.

diff --git a/src/ChangeLog b/src/ChangeLog
index d3e68f1a04d2f79efc65a9d8cb9d501069cd050a..be7f3e023d06ae7b8629c2c1e2b929237633107f 100644 (file)
--- 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.
 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 a225e8f692051ab597cd8001a82a643eee1e6afc..3bbae6724c1fa80824d94ba6f16c020a4c3ec78f 100644 (file)
--- 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)\"
 
 # 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                \
 
 bin_PROGRAMS = wget
 wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c                \