link with libiconv when needed.

diff --git a/configure.ac b/configure.ac
index 1de4474fd69619ae26937237d6b052d3ed6f44bc..613e32ed6bfa275c8c2ba4dca40fa0542163a5e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,11 @@ fi
 
 if test "$ac_cv_func_iconv" != "yes";then
   AC_LIB_HAVE_LINKFLAGS(iconv,, [#include <iconv.h>], [iconv (0, 0, 0, 0, 0);])
+  if test "$HAVE_LIBICONV" = "yes";then
+    ac_have_unicode=yes
+  fi
+else
+  ac_have_unicode=yes
 fi
 
 AC_MSG_CHECKING([whether to build libdane])
@@ -671,6 +676,7 @@ if features are disabled)
   Anon auth support:    $ac_enable_anon
   Heartbeat support:    $ac_enable_heartbeat
   RSA-EXPORT compat:    $ac_enable_rsa_export
+  Unicode support:      $ac_have_unicode
 ])
 
 AC_MSG_NOTICE([Optional applications:

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d6f36f4b2c872b5d884b848b6fc7daca131b0883..9bfb68033db64cc0b4cda40a03e04939671d3de7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -120,7 +120,8 @@ libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
        auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
        extras/libgnutls_extras.la
 thirdparty_libadd = $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LIBRT) \
-       $(LTLIBPTHREAD) $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS)
+       $(LTLIBPTHREAD) $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS) \
+       $(LTLIBICONV)
 
 if ENABLE_OPENPGP
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la

diff --git a/lib/system.c b/lib/system.c
index 42eb156c929b6dfd7e379e5bba014a4de7aa7e8f..6dc604e4040f351dd924cbdf015712f248ea6603 100644 (file)
--- a/lib/system.c
+++ b/lib/system.c
@@ -577,7 +577,7 @@ gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list,
   return add_system_trust(list, tl_flags, tl_vflags);
 }
 
-#if defined(HAVE_ICONV)
+#if defined(HAVE_ICONV) || defined(HAVE_LIBICONV)
 
 # include <iconv.h>