X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=65ba1339d6fb9753de52fcda1479fad131275dce;hp=dcb302fa187cd2d5e3cf69397825098f08e5f8e4;hb=780d1e674b59b5585c0432c84a5dc2aaa96ac0fa;hpb=a9da78c6d8f9e2699107fcde81efeb607dde1cca

diff --git a/configure.ac b/configure.ac
index dcb302fa..65ba1339 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
@@ -30,8 +30,8 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT([wget], 
-	[1.12-devel],
+AC_INIT([wget],
+	[1.12],
 	[bug-wget@gnu.org])
 AC_PREREQ(2.61)
 
@@ -41,18 +41,12 @@ 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])
+AM_INIT_AUTOMAKE(dist-bzip2 dist-lzma 1.9)
 
 dnl
 dnl Get cannonical host
@@ -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
@@ -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,20 +509,35 @@ 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
     LDFLAGS="${LDFLAGS} -L$libidn/lib"
     CPPFLAGS="${CPPFLAGS} -I$libidn/include"
   fi
-  AC_CHECK_HEADER(idna.h,
+
+  # If idna.h can't be found, check to see if it was installed under
+  # /usr/include/idn (OpenSolaris, at least, places it there).
+  # Check for idn-int.h in that case, because idna.h won't find
+  # idn-int.h until we've decided to add -I/usr/include/idn.
+  AC_CHECK_HEADER(idna.h, ,
+    [AC_CHECK_HEADER(idn/idn-int.h,
+                    [CPPFLAGS="${CPPFLAGS} -I/usr/include/idn"],
+                    [iri=no])]
+  )
+
+  if test "X$iri" != "Xno"; then
     AC_CHECK_LIB(idn, stringprep_check_version,
-      [iri=yes LIBS="${LIBS} -lidn"], iri=no),
-    iri=no)
+      [iri=yes LIBS="${LIBS} -lidn"], iri=no)
+  fi
 
   if test "X$iri" != "Xno" ; then
-    AC_DEFINE(ENABLE_IRI, 1, [Define if IRI support is enabled.])
+    AC_DEFINE([ENABLE_IRI], 1, [Define if IRI support is enabled.])
     AC_MSG_NOTICE([Enabling support for IRI.])
   else
     AC_MSG_WARN([Libidn not found])