X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=fd8f8397459a594bb76a59101cc115ced0e1c7db;hp=7f6260bb451ffba630c9acb2bc00609e6c6e1140;hb=1e5a791a224db14719e19e33ffa007ab8d8e8adf;hpb=b9e9ad65ccf6c1fbf989852c5adbb0f840f9c58b

diff --git a/configure.ac b/configure.ac
index 7f6260bb..fd8f8397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ 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
@@ -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,10 +520,21 @@ 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.])