Move AM_GNU_GETTEXT below AC_AIX.

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index dcb302fa187cd2d5e3cf69397825098f08e5f8e4..0bb56d3b8bb96f8f1f27f39facefef92b313f817 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,12 +48,6 @@ dnl Automake setup
 dnl
 AM_INIT_AUTOMAKE(1.9)
 
-dnl
-dnl Gettext
-dnl
-AM_GNU_GETTEXT([external],[need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.16.1])
-
 dnl
 dnl Get cannonical host
 dnl
@@ -108,6 +102,13 @@ test -z "$CC" && cc_specified=yes
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_AIX
+
+dnl
+dnl Gettext
+dnl
+AM_GNU_GETTEXT([external],[need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 gl_EARLY
 md5_EARLY
 
@@ -497,7 +498,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 +509,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