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

diff --git a/configure.ac b/configure.ac
index 067c3cb8..65ba1339 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 
@@ -46,7 +46,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 dnl
 dnl Automake setup
 dnl
-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE(dist-bzip2 dist-lzma 1.9)
 
 dnl
 dnl Get cannonical host
@@ -103,15 +103,15 @@ 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])
 
-gl_EARLY
-md5_EARLY
-
 AC_PROG_RANLIB
 
 AC_PROG_LEX
@@ -520,13 +520,24 @@ if test "X$iri" != "Xno"; 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])