From b19d8032c207f82e8b8740bea21afbf586099d02 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Thu, 20 Nov 2014 21:08:21 +0100 Subject: [PATCH] Fix libpsl<0.6.0 detection in configure.ac --- ChangeLog | 4 ++++ configure.ac | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5690d6f9..9fb175e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-20 Tim Ruehsen + + * configure.ac: Fix libpsl<0.6.0 detection + 2014-11-20 Tim Ruehsen * NEWS: remove form feeds diff --git a/configure.ac b/configure.ac index e22bb09f..3ad8703b 100644 --- a/configure.ac +++ b/configure.ac @@ -70,10 +70,7 @@ dnl dnl Libpsl: Public Suffix List checking AC_ARG_WITH([libpsl], - [AS_HELP_STRING([--without-libpsl], [disable support for libpsl cookie checking.])], - [], - [with_libpsl=yes] -) + [AS_HELP_STRING([--without-libpsl], [disable support for libpsl cookie checking.])]) dnl SSL: Configure SSL backend to use AC_ARG_WITH([ssl], @@ -308,6 +305,8 @@ PKG_PROG_PKG_CONFIG AS_IF([test "x$with_libpsl" != xno], [ PKG_CHECK_MODULES([LIBPSL], libpsl, [ 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" CFLAGS="$LIBPSL_CFLAGS $CFLAGS" AC_DEFINE([HAVE_LIBPSL], [1], [PSL support enabled])