X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=2b3a68d07103c27c2cf6dc8a4c5b1e3ed9101e09;hp=58bb8ebc758604a2a70cd248fec92f0f1253598f;hb=e968919131ae6430beed9dbe01d3b67650270dae;hpb=d2946687150942bb7a13df1e47674720e6179412

diff --git a/configure.ac b/configure.ac
index 58bb8ebc..2b3a68d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -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.])