Fix build under mingw when OpenSSL is used.

diff --git a/ChangeLog b/ChangeLog
index fcc61070ce04b6a8519544dd2e5dc38cf2eeac26..f3e4e5662670b02e0d1c448f2d93fdf37a5982db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-25 Ray Satiro <raysatiro@yahoo.com>
+
+       * configure.ac: Fix build under mingw when OpenSSL is used.
+
 2012-03-20  Ángel González <keisial@gmail.com>
 
        * bootstrap.conf (gnulib_modules): Add modules `ftello',

diff --git a/configure.ac b/configure.ac
index 647e44e353f0e32afb7f384b5eb0b8d18bc71f4e..eb1b8b7d6d10ca1ea18a3a67232d787c95273f4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
           AC_CHECK_LIB(ssl32, SSL_connect, [
             ssl_found=yes
             AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
+            AC_LIBOBJ([openssl])
+            LIBS="${LIBS} -lssl32"
+            AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).])
           ],
           AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
           
@@ -289,6 +292,7 @@ AS_IF([test x$ssl_found != xyes],
     ], [SSL_library_init ()])
     if test x"$LIBSSL" != x
     then
+      ssl_found=yes
       AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
       AC_LIBOBJ([openssl])
       LIBS="$LIBSSL $LIBS"
@@ -296,9 +300,6 @@ AS_IF([test x$ssl_found != xyes],
     then
       AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
     fi
-
-    AC_LIBOBJ([openssl])
-
 ])
 
 ], [
@@ -316,6 +317,7 @@ AS_IF([test x$ssl_found != xyes],
   ], [gnutls_global_init()])
   if test x"$LIBGNUTLS" != x
   then
+    ssl_found=yes
     AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
     AC_LIBOBJ([gnutls])
     LIBS="$LIBGNUTLS $LIBS"
@@ -328,7 +330,7 @@ AS_IF([test x$ssl_found != xyes],
 ]) # endif: --with-ssl == openssl?
 
 dnl Enable NTLM if requested and if SSL is available.
-if test x"$LIBSSL" != x
+if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes
 then
   if test x"$ENABLE_NTLM" != xno
   then

diff --git a/src/ChangeLog b/src/ChangeLog
index 265fdc11ed6dd009929304a71be1d1f272d8a560..f52eae296696dcb85674767146d054d1485ed78f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-25 Ray Satiro <raysatiro@yahoo.com>
+
+       * build_info.c.in: Check that HAVE_LIBSSL32 is defined when OpenSSL
+       is used.
+
 2012-03-07  Steven Schubiger  <stsc@member.fsf.org>
 
        * init.c (wgetrc_user_file_name): Correct typo.

diff --git a/src/build_info.c.in b/src/build_info.c.in
index 892962a4207d67ac718206fa85d51d76481db18c..c0b1677f048cbf86b6a0d43a6ade8772adc8719d 100644 (file)
--- a/src/build_info.c.in
+++ b/src/build_info.c.in
@@ -9,5 +9,5 @@ ntlm            defined ENABLE_NTLM
 opie            defined ENABLE_OPIE
 
 ssl choice:
-    openssl     defined HAVE_LIBSSL
+    openssl     defined HAVE_LIBSSL || defined HAVE_LIBSSL32
     gnutls      defined HAVE_LIBGNUTLS