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

configure.ac: Skip pkg-config for opensl and gnutls when prefix is given

Browse Source 
Make --with-libssl-prefix and --with-libgnutls-prefix do the right thing,
no matter if pkg-config is installed or not.

Reported-by: Charles Diza <chdiza@gmail.com>
This commit is contained in:
Tim Ruehsen 2014-12-25 15:21:44 +01:00
parent f6b28575cc
commit 6f62bc5cd8
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -334,6 +334,7 @@ AS_IF([test x"$with_zlib" != xno], [
]) ])
AS_IF([test x"$with_ssl" = xopenssl], [ AS_IF([test x"$with_ssl" = xopenssl], [
if [test x"$with_libssl_prefix" = x]; then
PKG_CHECK_MODULES([OPENSSL], [openssl], [ PKG_CHECK_MODULES([OPENSSL], [openssl], [
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL]) AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
AC_LIBOBJ([openssl]) AC_LIBOBJ([openssl])
@ -342,7 +343,10 @@ AS_IF([test x"$with_ssl" = xopenssl], [
LIBSSL=" " # ntlm check below wants this LIBSSL=" " # ntlm check below wants this
AC_CHECK_FUNCS([RAND_egd]) AC_CHECK_FUNCS([RAND_egd])
AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.]) AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
], [ ssl_found=yes
])
fi
if [test x"$ssl_found" != xyes]; then
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
dnl doesn't record its dependency on libdl, so we need to make sure dnl doesn't record its dependency on libdl, so we need to make sure
dnl -ldl ends up in LIBS on systems that have it. Most OSes use dnl -ldl ends up in LIBS on systems that have it. Most OSes use
@ -399,7 +403,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.]) AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
fi fi
]) ])
]) fi
], [ ], [
# --with-ssl is not openssl: check if it's no # --with-ssl is not openssl: check if it's no
AS_IF([test x"$with_ssl" != xno], [ AS_IF([test x"$with_ssl" != xno], [
@ -407,13 +411,17 @@ AS_IF([test x"$with_ssl" = xopenssl], [
with_ssl=gnutls with_ssl=gnutls
dnl Now actually check for -lgnutls dnl Now actually check for -lgnutls
if [test x"$with_libgnutls_prefix" = x]; then
PKG_CHECK_MODULES([GNUTLS], [gnutls], [ PKG_CHECK_MODULES([GNUTLS], [gnutls], [
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS]) AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
AC_LIBOBJ([gnutls]) AC_LIBOBJ([gnutls])
LIBS="$GNUTLS_LIBS $LIBS" LIBS="$GNUTLS_LIBS $LIBS"
CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS" CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.]) AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
], [ ssl_found=yes
])
fi
if [test x"$ssl_found" != xyes]; then
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [ AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
], [gnutls_global_init()]) ], [gnutls_global_init()])
@ -426,7 +434,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
else else
AC_MSG_ERROR([GnuTLS has not been found. Use --with-ssl=openssl if you explicitly want OpenSSL.]) AC_MSG_ERROR([GnuTLS has not been found. Use --with-ssl=openssl if you explicitly want OpenSSL.])
fi fi
]) fi
AC_CHECK_FUNCS(gnutls_priority_set_direct) AC_CHECK_FUNCS(gnutls_priority_set_direct)
]) # endif: --with-ssl != no? ]) # endif: --with-ssl != no?