walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix pkg-config support for libidn and libidn2

This commit is contained in:
Tim Rühsen 2017-07-15 12:31:01 +02:00
parent 0a48980efc
commit 4306c0cfc0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -211,7 +211,7 @@ fi
if test "$enable_runtime" = "libidn2" -o "$enable_builtin" = "libidn2"; then if test "$enable_runtime" = "libidn2" -o "$enable_builtin" = "libidn2"; then
# Check for libidn2 # Check for libidn2
PKG_CHECK_MODULES([LIBIDN2], [idn2], [ PKG_CHECK_MODULES([LIBIDN2], [libidn2], [
HAVE_LIBIDN2=yes HAVE_LIBIDN2=yes
if test "$enable_runtime" = "libidn2"; then if test "$enable_runtime" = "libidn2"; then
CFLAGS="$LIBIDN2_CFLAGS $CFLAGS" CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
@ -225,9 +225,16 @@ fi
if test "$enable_runtime" = "libidn" -o "$enable_builtin" = "libidn"; then if test "$enable_runtime" = "libidn" -o "$enable_builtin" = "libidn"; then
# Check for libidn # Check for libidn
PKG_CHECK_MODULES([LIBIDN], [libidn], [
HAVE_LIBIDN2=yes
if test "$enable_runtime" = "libidn"; then
CFLAGS="$LIBIDN_CFLAGS $CFLAGS"
fi
], [
OLDLIBS=$LIBS OLDLIBS=$LIBS
AC_SEARCH_LIBS(idna_to_ascii_8z, idn, HAVE_LIBIDN=yes, AC_MSG_ERROR(You requested libidn but it is not installed.)) AC_SEARCH_LIBS(idna_to_ascii_8z, idn, HAVE_LIBIDN=yes, AC_MSG_ERROR(You requested libidn but it is not installed.))
LIBS=$OLDLIBS LIBS=$OLDLIBS
])
fi fi
if test "x$HAVE_LIBIDN2" = "xyes" -o "x$HAVE_LIBIDN" = "xyes"; then if test "x$HAVE_LIBIDN2" = "xyes" -o "x$HAVE_LIBIDN" = "xyes"; then