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

Use pkg-config for libpsl checking

Browse Source
This commit is contained in:
Darshit Shah 2014-11-20 15:33:32 +05:30
parent e4be5e3b9a
commit acc76b1e02
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-20 Darshit Shah <darnir@gmail.com>
* configure.ac: Use pkg-config for libpsl detection
config status for libpsl is reflected by $with_libpsl
2014-11-20 Darshit Shah <darnir@gmail.com> 2014-11-20 Darshit Shah <darnir@gmail.com>
* configure.ac: Use autoconf macros where available * configure.ac: Use autoconf macros where available

23
configure.ac
View File

@ -75,14 +75,6 @@ AC_ARG_WITH([libpsl],
[with_libpsl=yes] [with_libpsl=yes]
) )
AS_IF([test "x$with_libpsl" = xyes],
[AC_SEARCH_LIBS(psl_builtin, psl,
[ENABLE_PSL=yes; AC_DEFINE([HAVE_LIBPSL], [1], [PSL Support Enabled])],
[ENABLE_PSL=no; AC_MSG_WARN(*** libpsl not found. Falling back to Wget builtin cookie checking.)])],
[ENABLE_PSL=no]
)
dnl SSL: Configure SSL backend to use dnl SSL: Configure SSL backend to use
AC_ARG_WITH([ssl], AC_ARG_WITH([ssl],
[AS_HELP_STRING([--with-ssl={gnutls,openssl}], [specify SSL backend. GNU TLS is the default.])]) [AS_HELP_STRING([--with-ssl={gnutls,openssl}], [specify SSL backend. GNU TLS is the default.])])
@ -313,6 +305,19 @@ dnl
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AS_IF([test "x$with_libpsl" != xno], [
PKG_CHECK_MODULES([LIBPSL], libpsl, [
with_libpsl=yes
LIBS="$LIBPSL_LIBS $LIBS"
CFLAGS="$LIBPSL_CFLAGS $CFLAGS"
AC_DEFINE([HAVE_LIBPSL], [1], [PSL support enabled])
], [
AC_SEARCH_LIBS(psl_builtin, psl,
[with_libpsl=yes; AC_DEFINE([HAVE_LIBPSL], [1], [PSL support enabled])],
[with_libpsl=no; AC_MSG_WARN(*** libpsl was not found. Fallback to builtin cookie checking.)])
])
])
AS_IF([test x"$with_zlib" != xno], [ AS_IF([test x"$with_zlib" != xno], [
with_zlib=yes with_zlib=yes
PKG_CHECK_MODULES([ZLIB], zlib, [ PKG_CHECK_MODULES([ZLIB], zlib, [
@ -708,7 +713,7 @@ AC_MSG_NOTICE([Summary of build options:
Libs: $LIBS Libs: $LIBS
SSL: $with_ssl SSL: $with_ssl
Zlib: $with_zlib Zlib: $with_zlib
PSL: $ENABLE_PSL PSL: $with_libpsl
Digest: $ENABLE_DIGEST Digest: $ENABLE_DIGEST
NTLM: $ENABLE_NTLM NTLM: $ENABLE_NTLM
OPIE: $ENABLE_OPIE OPIE: $ENABLE_OPIE