X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=98d0926f991eae668c9a88d8583149784881959f;hp=dcb302fa187cd2d5e3cf69397825098f08e5f8e4;hb=d6065c927eb23cd674b00ccf88b171c70f1962d0;hpb=4f3dd6817348433eafde04a3c2946f43364de7ef

diff --git a/configure.ac b/configure.ac
index dcb302fa..98d0926f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,7 +497,7 @@ 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
+AS_IF([test "X$iri" != "Xno"],[
   AM_ICONV
 
   if test "X$am_cv_func_iconv" != "Xyes"; then
@@ -508,7 +508,11 @@ if test "X$iri" != "Xno"; then
       AC_MSG_NOTICE([disabling IRIs because libiconv wasn't found])
     fi
   fi
-fi
+],[  # else
+  # For some reason, this seems to be set even when we don't check.
+  # Explicitly unset.
+  LIBICONV=
+])
 
 if test "X$iri" != "Xno"; then
   if test "$libidn" != ""; then