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

[svn] Fix for bug #20321: --with-libssl-prefix=<path> ignores its argument

Browse Source
This commit is contained in:
micah 2007-08-07 13:00:45 -07:00
parent d464b84dba
commit 13117dc9a5
3 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-08-07 Micah Cowan <micah@cowan.name>
* configure.in: Fix --with-libssl-prefix failure by replacing
usage of sh "if" statement with "AS_IF" macros, to force
AC_REQUIRE'd macros to be expanded before the conditional
statement body.
* NEWS: Note that configure.in now requires autoconf >= 2.61,
to support AS_IF and its expansion of AC_REQUIREs.
2007-07-29 Micah Cowan <micah@cowan.name> 2007-07-29 Micah Cowan <micah@cowan.name>
* NEWS: No more auth before challenge. No more auth info in * NEWS: No more auth before challenge. No more auth info in

2
NEWS
View File

@ -7,6 +7,8 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
* Changes in Wget 1.11. * Changes in Wget 1.11.
** configure.in now requires autoconf >= 2.61, rather than 2.59.
** Authentication information is no longer sent as part of the Referer ** Authentication information is no longer sent as part of the Referer
header in recursive fetches. header in recursive fetches.

26
configure.in
View File

@ -29,7 +29,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl dnl
AC_INIT([src/version.c]) AC_INIT([src/version.c])
AC_PREREQ(2.59) AC_PREREQ(2.61)
dnl Include the M4 macros we use. dnl Include the M4 macros we use.
builtin(include, [m4/wget.m4])dnl builtin(include, [m4/wget.m4])dnl
@ -239,8 +239,7 @@ dnl
dnl Checks for libraries. dnl Checks for libraries.
dnl dnl
if test x"$with_ssl" = xgnutls AS_IF([test x"$with_ssl" = xgnutls], [
then
dnl Now actually check for -lssl dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [ AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
@ -252,7 +251,9 @@ then
else else
AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.]) AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
fi fi
elif test x"$with_ssl" != xno; then ], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [
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
@ -263,13 +264,13 @@ elif test x"$with_ssl" != xno; then
dnl Now actually check for -lssl dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [ AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/md4.h> #include <openssl/md4.h>
#include <openssl/md5.h> #include <openssl/md5.h>
], [SSL_library_init ()]) ], [SSL_library_init ()])
if test x"$LIBSSL" != x if test x"$LIBSSL" != x
then then
@ -279,7 +280,8 @@ elif test x"$with_ssl" != xno; then
then then
AC_MSG_ERROR([--with-ssl was given, but SSL is not available.]) AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
fi fi
fi ]) # endif: --with-ssl == no?
]) # endif: --with-ssl == gnutls?
AC_SUBST(SSL_OBJ) AC_SUBST(SSL_OBJ)