Index: popt-1.13/Makefile.am
===================================================================
--- popt-1.13.orig/Makefile.am	2007-11-14 20:42:27.000000000 +0000
+++ popt-1.13/Makefile.am	2008-03-26 22:14:05.000000000 +0000
@@ -39,7 +39,7 @@
 usrlib_LTLIBRARIES = libpopt.la
 
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
 
 if HAVE_LD_VERSION_SCRIPT
 libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
Index: popt-1.13/configure.ac
===================================================================
--- popt-1.13.orig/configure.ac	2007-11-14 20:42:27.000000000 +0000
+++ popt-1.13/configure.ac	2008-03-26 22:20:16.000000000 +0000
@@ -95,6 +95,7 @@
 AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv)
 
 AM_GNU_GETTEXT([external])
+AM_ICONV_LINK
 
 popt_sysconfdir="${sysconfdir}"
 eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}