From 6abbbaad1b0338b064b133ac0aa5ad9c75ad52ad Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 20 Sep 2008 12:44:44 +0000
Subject: fix regression in configure script which affected OpenSSL builds on
 MSYS

---
 CHANGES       |  3 +++
 RELEASE-NOTES |  3 ++-
 configure.ac  | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 4eb7cd8c3..efc64d9da 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Yang Tse (20 Sep 2008)
+- Fix regression in configure script which affected OpenSSL builds on MSYS.
+
 Yang Tse (19 Sep 2008)
 - configure script now checks availability of the alarm() function.
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d0131f057..2901dd2a6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ This release includes the following bugfixes:
  o curl_easy_pause() could behave wrongly on unpause
  o cookie with invalid expire dates are now considered expired
  o HTTP pipelining over proxy
+ o fix regression in configure script which affected OpenSSL builds on MSYS
 
 This release includes the following known bugs:
 
@@ -35,6 +36,6 @@ advice from friends like these:
 
  Keith Mok, Yang Tse, Daniel Fandrich, Guenter Knauf, Dmitriy Sergeyev,
  Linus Nielsen Feltzing, Martin Drasar, Stefan Krause, Dmitry Kurochkin,
- Mike Revi
+ Mike Revi, Andres Garcia
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/configure.ac b/configure.ac
index 2a1bce95d..ddde3b7a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1275,6 +1275,24 @@ if test X"$OPT_SSL" != Xno; then
     fi
   fi
 
+  dnl This is for Msys/Mingw
+  case $host in
+    *-*-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)]
+                  )
+      ;;
+  esac
+
   AC_CHECK_LIB(crypto, CRYPTO_lock,[
      HAVECRYPTO="yes"
      LIBS="-lcrypto $LIBS"
-- 
cgit v1.2.3