moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Fix libpsl<0.6.0 detection in configure.ac

Browse Source
This commit is contained in:
Tim Ruehsen 2014-11-20 21:08:21 +01:00
parent 3c51ad7f02
commit b19d8032c2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2014-11-20 Tim Ruehsen <tim.ruehsen@gmx.de>
* configure.ac: Fix libpsl<0.6.0 detection
2014-11-20 Tim Ruehsen <tim.ruehsen@gmx.de> 2014-11-20 Tim Ruehsen <tim.ruehsen@gmx.de>
* NEWS: remove form feeds * NEWS: remove form feeds

7
configure.ac
View File

@ -70,10 +70,7 @@ dnl
dnl Libpsl: Public Suffix List checking dnl Libpsl: Public Suffix List checking
AC_ARG_WITH([libpsl], AC_ARG_WITH([libpsl],
[AS_HELP_STRING([--without-libpsl], [disable support for libpsl cookie checking.])], [AS_HELP_STRING([--without-libpsl], [disable support for libpsl cookie checking.])])
[],
[with_libpsl=yes]
)
dnl SSL: Configure SSL backend to use dnl SSL: Configure SSL backend to use
AC_ARG_WITH([ssl], AC_ARG_WITH([ssl],
@ -308,6 +305,8 @@ PKG_PROG_PKG_CONFIG
AS_IF([test "x$with_libpsl" != xno], [ AS_IF([test "x$with_libpsl" != xno], [
PKG_CHECK_MODULES([LIBPSL], libpsl, [ PKG_CHECK_MODULES([LIBPSL], libpsl, [
with_libpsl=yes with_libpsl=yes
# correct $LIBPSL_LIBS (in libpsl <= 0.6.0)
AS_IF([test "x$LIBPSL_LIBS" = "x-llibpsl "], [LIBPSL_LIBS="-lpsl"])
LIBS="$LIBPSL_LIBS $LIBS" LIBS="$LIBPSL_LIBS $LIBS"
CFLAGS="$LIBPSL_CFLAGS $CFLAGS" CFLAGS="$LIBPSL_CFLAGS $CFLAGS"
AC_DEFINE([HAVE_LIBPSL], [1], [PSL support enabled]) AC_DEFINE([HAVE_LIBPSL], [1], [PSL support enabled])