X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=58bb8ebc758604a2a70cd248fec92f0f1253598f;hp=fb0c65d10d10bef526dd59126868a463653e8c3e;hb=30391ad9b479dfb0538c85c86976ab7fa24bacc2;hpb=b30a0dd817886f77a64be9218c5e5399bcbc2e67

diff --git a/configure.ac b/configure.ac
index fb0c65d1..58bb8ebc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Template file for GNU Autoconf
-dnl Copyright (C) 1995, 1996, 1997, 2001, 2007,
-dnl 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009 Free Software
+dnl Foundation, Inc.
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -41,19 +41,13 @@ dnl
 AC_MSG_NOTICE([configuring for GNU Wget $PACKAGE_VERSION])
 
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
 
 dnl
 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,9 +102,16 @@ test -z "$CC" && cc_specified=yes
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_AIX
+
 gl_EARLY
 md5_EARLY
 
+dnl
+dnl Gettext
+dnl
+AM_GNU_GETTEXT([external],[need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 AC_PROG_RANLIB
 
 AC_PROG_LEX
@@ -163,6 +164,8 @@ AC_CHECK_HEADERS(unistd.h sys/time.h)
 AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
 AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
 
+AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
+
 dnl
 dnl Check sizes of integer types.  These are used to find n-bit
 dnl integral types on older systems that fail to provide intN_t and
@@ -495,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
@@ -506,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