generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make the given path to --with-libidn override any other installation

Browse Source
This commit is contained in:
Daniel Stenberg
2004-10-05 08:45:13 +00:00
parent 70c3f6a8dd
commit 19a568a983
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
configure.ac
View File

@@ -953,23 +953,28 @@ case "$LIBIDN" in
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
;; ;;
*) AC_MSG_RESULT(yes) *) AC_MSG_RESULT(yes)
AC_CHECK_LIB(idn, idna_to_ascii_lz, ,
[ idn=""
dnl if there was a given path, try it dnl if there is a given path, check that FIRST
nolibidn="true" if test "x$LIBIDN" != "xyes"; then
if test "x$LIBIDN" != "xyes"; then oldLDFLAGS=$LDFLAGS
nolibidn="" dnl reset to test again oldCPPFLAGS=$CPPFLAGS
oldLDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$LIBIDN/lib"
oldCPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$LIBIDN/include"
LDFLAGS="$LDFLAGS -L$LIBIDN/lib" idn="yes"
CPPFLAGS="$CPPFLAGS -I$LIBIDN/include" AC_CHECK_LIB(idn, idna_to_ascii_4i, ,
AC_CHECK_LIB(idn, idna_to_ascii_4i, , idn=""
nolibidn="true" LDFLAGS=$oldLDFLAGS
LDFLAGS=$oldLDFLAGS CPPFLAGS=$oldCPPFLAGS)
CPPFLAGS=$oldCPPFLAGS) fi
fi
]) if test "x$idn" != "xyes"; then
if test "x$nolibidn" != "xtrue"; then dnl check with default paths
AC_CHECK_LIB(idn, idna_to_ascii_lz, ,
idn="")
fi
if test "x$idn" = "xyes"; then
curl_idn_msg="enabled" curl_idn_msg="enabled"
dnl different versions of libidn have different setups of these: dnl different versions of libidn have different setups of these:
AC_CHECK_FUNCS( idn_free idna_strerror ) AC_CHECK_FUNCS( idn_free idna_strerror )