mirror of
https://github.com/mirror/wget.git
synced 2025-03-14 11:50:18 +08:00
* configure.ac: Disable nettle if NTLM is explicitly disabled
This commit is contained in:
parent
485217d0ff
commit
c69030a904
41
configure.ac
41
configure.ac
@ -622,34 +622,31 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
]) # endif: --with-ssl == openssl?
|
||||
|
||||
dnl Enable NTLM if requested and if SSL is available.
|
||||
if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes
|
||||
if test x"$ENABLE_NTLM" != xno
|
||||
then
|
||||
if test x"$ENABLE_NTLM" != xno
|
||||
if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes
|
||||
then
|
||||
ENABLE_NTLM=yes
|
||||
AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.])
|
||||
fi
|
||||
else
|
||||
PKG_CHECK_MODULES([NETTLE], nettle, [
|
||||
HAVE_NETTLE=yes
|
||||
LIBS="$NETTLE_LIBS $LIBS"
|
||||
CFLAGS="$NETTLE_CFLAGS $CFLAGS"
|
||||
], [
|
||||
AC_CHECK_LIB(nettle, nettle_md4_init, [HAVE_NETTLE=yes], [HAVE_NETTLE=no; AC_MSG_WARN(*** libnettle was not found. You will not be able to use NTLM)])
|
||||
if test x"$HAVE_NETTLE" != xyes; then
|
||||
if test x"$ENABLE_NTLM" = xyes; then
|
||||
AC_MSG_ERROR([NTLM authorization requested and SSL not enabled; aborting])
|
||||
fi
|
||||
else
|
||||
AC_SUBST(NETTLE_LIBS, "-lnettle")
|
||||
else
|
||||
PKG_CHECK_MODULES([NETTLE], nettle, [
|
||||
HAVE_NETTLE=yes
|
||||
LIBS="$NETTLE_LIBS $LIBS"
|
||||
fi
|
||||
])
|
||||
CFLAGS="$NETTLE_CFLAGS $CFLAGS"
|
||||
], [
|
||||
AC_CHECK_LIB(nettle, nettle_md4_init, [HAVE_NETTLE=yes], [HAVE_NETTLE=no; AC_MSG_WARN(*** libnettle was not found. You will not be able to use NTLM)])
|
||||
if test x"$HAVE_NETTLE" != xyes; then
|
||||
if test x"$ENABLE_NTLM" = xyes; then
|
||||
AC_MSG_ERROR([NTLM authorization requested and SSL not enabled; aborting])
|
||||
fi
|
||||
else
|
||||
AC_SUBST(NETTLE_LIBS, "-lnettle")
|
||||
LIBS="$NETTLE_LIBS $LIBS"
|
||||
fi
|
||||
])
|
||||
|
||||
if test x"$HAVE_NETTLE" = xyes; then
|
||||
AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle])
|
||||
if test x"$ENABLE_NTLM" != xno
|
||||
then
|
||||
if test x"$HAVE_NETTLE" = xyes; then
|
||||
AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle])
|
||||
ENABLE_NTLM=yes
|
||||
AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.])
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user