1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

Check for idna.h in /usr/include/idn.

This commit is contained in:
Micah Cowan 2009-09-05 13:33:52 -07:00
parent f3e634a8b2
commit cb555a94fa
2 changed files with 20 additions and 3 deletions

View File

@ -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> 2009-09-04 Steven Schubiger <stsc@member.fsf.org>
* configure.ac: Place gl_EARLY and md5_EARLY before the gettext * configure.ac: Place gl_EARLY and md5_EARLY before the gettext

View File

@ -520,10 +520,21 @@ if test "X$iri" != "Xno"; then
LDFLAGS="${LDFLAGS} -L$libidn/lib" LDFLAGS="${LDFLAGS} -L$libidn/lib"
CPPFLAGS="${CPPFLAGS} -I$libidn/include" CPPFLAGS="${CPPFLAGS} -I$libidn/include"
fi 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, AC_CHECK_LIB(idn, stringprep_check_version,
[iri=yes LIBS="${LIBS} -lidn"], iri=no), [iri=yes LIBS="${LIBS} -lidn"], iri=no)
iri=no) fi
if test "X$iri" != "Xno" ; then 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.])