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

diff --git a/ChangeLog b/ChangeLog
index 20a8c222e1cc49b27df9f196f4fe2274174a4a91..075d7ca588dc94484212711b3c108cd2609600c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * NEWS: No more auth before challenge. No more auth info in
 2007-07-29  Micah Cowan  <micah@cowan.name>
 
        * NEWS: No more auth before challenge. No more auth info in

diff --git a/NEWS b/NEWS
index b31eae2e3fc1abdf5415f9a7c9c5ce717c1d5c6f..3b49ca884cbb08fc7fa284378911c51b32f4577d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 \f
 * Changes in Wget 1.11.
 
 \f
 * 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
 header in recursive fetches.
 
 ** Authentication information is no longer sent as part of the Referer
 header in recursive fetches.
 

diff --git a/configure.in b/configure.in
index ae07c6aa998cf3feef30e5a3e236783d48cba80a..a9a7a7abd5842e93731bf2dcf6163c1bbeaaf972 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_INIT([src/version.c])
 dnl
 
 AC_INIT([src/version.c])

-AC_PREREQ(2.59)
+AC_PREREQ(2.61)

 
 dnl Include the M4 macros we use.
 builtin(include, [m4/wget.m4])dnl
 
 dnl Include the M4 macros we use.
 builtin(include, [m4/wget.m4])dnl


@@ -239,8 +239,7 @@ dnl
 dnl Checks for libraries.
 dnl
 
 dnl Checks for libraries.
 dnl
 

-if test x"$with_ssl" = xgnutls
-then
+AS_IF([test x"$with_ssl" = xgnutls], [

   dnl Now actually check for -lssl
   AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
 #include <gnutls/gnutls.h>
   dnl Now actually check for -lssl
   AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
 #include <gnutls/gnutls.h>


@@ -252,34 +251,37 @@ then
   else
     AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
   fi
   else
     AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
   fi

-elif test x"$with_ssl" != xno; then
-  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 -ldl ends up in LIBS on systems that have it.  Most OSes use
-  dnl dlopen(), but HP-UX uses shl_load().
-  AC_CHECK_LIB(dl, dlopen, [], [
-    AC_CHECK_LIB(dl, shl_load)
-  ])
+], [
+  # --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 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 dlopen(), but HP-UX uses shl_load().
+    AC_CHECK_LIB(dl, dlopen, [], [
+      AC_CHECK_LIB(dl, shl_load)
+    ])

 
 

-  dnl Now actually check for -lssl
-  AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/des.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-  ], [SSL_library_init ()])
-  if test x"$LIBSSL" != x
-  then
-    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-    SSL_OBJ='openssl.o'
-  elif test x"$with_ssl" != x
-  then
-    AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
-  fi
-fi
+    dnl Now actually check for -lssl
+    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+  #include <openssl/ssl.h>
+  #include <openssl/x509.h>
+  #include <openssl/err.h>
+  #include <openssl/rand.h>
+  #include <openssl/des.h>
+  #include <openssl/md4.h>
+  #include <openssl/md5.h>
+    ], [SSL_library_init ()])
+    if test x"$LIBSSL" != x
+    then
+      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+      SSL_OBJ='openssl.o'
+    elif test x"$with_ssl" != x
+    then
+      AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
+    fi
+  ]) # endif: --with-ssl == no?
+]) # endif: --with-ssl == gnutls?

 
 AC_SUBST(SSL_OBJ)
 
 
 AC_SUBST(SSL_OBJ)