From cb555a94fa5188122569ed3803c463f27ccd0261 Mon Sep 17 00:00:00 2001
From: Micah Cowan <micah@cowan.name>
Date: Sat, 5 Sep 2009 13:33:52 -0700
Subject: [PATCH] Check for idna.h in /usr/include/idn.

---
 ChangeLog    |  6 ++++++
 configure.ac | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eded1a8d..0ee1e0bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-05  Micah Cowan  <micah@cowan.name>
+
+	* configure.ac: If we can't find idna.h, check to see if it's
+	because we need to add /usr/include/idn to the inclusion
+	path (for OpenSolaris).
+
 2009-09-04  Steven Schubiger  <stsc@member.fsf.org>
 
 	* configure.ac: Place gl_EARLY and md5_EARLY before the gettext
diff --git a/configure.ac b/configure.ac
index 58bb8ebc..fd8f8397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.])
-- 
2.39.2