Check for libiconv needed for IRIs support

diff --git a/ChangeLog b/ChangeLog
index 8177dc97a6c1404b92913c58f20bf23a80e97e10..8989841447b3d37fd88b89114f348b6b9eeb1974 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-26  Xavier Saint  <wget@sxav.eu>
+
+       * configure.ac : IRIs support required libiconv, check it.
+
 2008-06-14  Xavier Saint  <wget@sxav.eu>
 
        * configure.ac: Add support for IRIs

diff --git a/configure.ac b/configure.ac
index 44f397b91b23054eaa98c2766bcfac3450c4243a..b29234360ac09c012099105edd718fbd11abcee4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -493,6 +493,19 @@ AC_ARG_ENABLE(iri,
 AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
                                    [Support IDN/IRIs (needs GNU Libidn)]),
                                    libidn=$withval, libidn="")
+if test "X$iri" != "Xno"; then
+  AM_ICONV
+
+  if test "X$am_cv_func_iconv" != "Xyes"; then
+    iri=no
+    if test "X$force_iri" = "Xyes"; then
+      AC_MSG_ERROR([Libiconv is required for IRIs support])
+    else
+      AC_MSG_NOTICE([disabling IRIs because libiconv wasn't found])
+    fi
+  fi
+fi
+
 if test "X$iri" != "Xno"; then
   if test "$libidn" != ""; then
     LDFLAGS="${LDFLAGS} -L$libidn/lib"