From 93fcb94b625550be22fc69282997004817b9b6d0 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 30 Mar 2005 20:55:44 +0000
Subject: [PATCH] fix configure's SSL-detection for msys/mingw (from Andres
 Garcia)

---
 CHANGES       |  4 ++++
 RELEASE-NOTES |  7 ++++---
 configure.ac  | 28 ++++++++++++++--------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CHANGES b/CHANGES
index f189d18ff..719230dba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Daniel (30 March 2005)
+- Andres Garcia modified the configure script to check for libgdi32 before
+  libcrypto, to make the SSL check work fine on msys/mingw.
+
 Daniel (29 March 2005)
 - Tom Moers identified a flaw when you sent a POST with Digest authentication,
   as in the first request when curl sends a POST with Content-Length: 0, it
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b658d2202..b92024b9e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o configure's SSL-detection for msys/mingw
  o better connection keep-alive when POSTing with HTTP Digest
  o FTP-SSL
  o reading FTP server response in multiple reads
@@ -32,8 +33,8 @@ This release includes the following bugfixes:
 
 Other curl-related news since the previous public release:
 
- o the cURL projected is now over 7 years old
- o we now provide daily CVS windows-builds:
+ o the cURL project is now over 7 years old
+ o daily curl binary builds for Windows fresh from CVS:
    http://cool.haxx.se/curl-daily/
  o curl-tracker is a new mailinglist for "tracker" activities:
    http://cool.haxx.se/mailman/listinfo/curl-tracker
@@ -48,6 +49,6 @@ advice from friends like these:
  Dan Fandrich, Ignacio Vazquez-Abrams, Randy McMurchy, Dominick Meglio,
  Jean-Marc Ranger, Tor Arntsen, Nodak Sodak, David Houlder, Gisle Vanem,
  Christopher R. Palmer, Gwenole Beauchesne, Augustus Saunders, Jesper Jensen,
- Tom Moers
+ Tom Moers, Andres Garcia
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/configure.ac b/configure.ac
index 5edbb6ca6..f87ef3a60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -810,6 +810,20 @@ else
     fi
   fi
 
+  dnl This is for Msys/Mingw
+  AC_MSG_CHECKING([for gdi32])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lgdi32 $LIBS"
+  AC_TRY_LINK([#include <windef.h>
+               #include <wingdi.h>],
+               [GdiFlush();],
+               [ dnl worked!
+               AC_MSG_RESULT([yes])],
+               [ dnl failed, restore LIBS
+               LIBS=$my_ac_save_LIBS
+               AC_MSG_RESULT(no)]
+              )
+
   AC_CHECK_LIB(crypto, CRYPTO_lock,[
      HAVECRYPTO="yes"
      LIBS="-lcrypto $LIBS"
@@ -833,20 +847,6 @@ else
     dnl This is only reasonable to do if crypto actually is there: check for
     dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
 
-    dnl This is for Msys/Mingw
-    AC_MSG_CHECKING([for gdi32])
-    my_ac_save_LIBS=$LIBS
-    LIBS="-lgdi32 $LIBS"
-    AC_TRY_LINK([#include <windef.h>
-                 #include <wingdi.h>],
-               [GdiFlush();],
-               [ dnl worked!
-               AC_MSG_RESULT([yes])],
-               [ dnl failed, restore LIBS
-               LIBS=$my_ac_save_LIBS
-               AC_MSG_RESULT(no)]
-              )
-
     AC_CHECK_LIB(ssl, SSL_connect)
 
     if test "$ac_cv_lib_ssl_SSL_connect" != yes; then