fix configure's SSL-detection for msys/mingw (from Andres Garcia)

This commit is contained in:
Daniel Stenberg 2005-03-30 20:55:44 +00:00
parent 32a446cf19
commit 93fcb94b62
3 changed files with 22 additions and 17 deletions

View File

@ -7,6 +7,10 @@
Changelog 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) Daniel (29 March 2005)
- Tom Moers identified a flaw when you sent a POST with Digest authentication, - 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 as in the first request when curl sends a POST with Content-Length: 0, it

View File

@ -18,6 +18,7 @@ This release includes the following changes:
This release includes the following bugfixes: 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 better connection keep-alive when POSTing with HTTP Digest
o FTP-SSL o FTP-SSL
o reading FTP server response in multiple reads 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: Other curl-related news since the previous public release:
o the cURL projected is now over 7 years old o the cURL project is now over 7 years old
o we now provide daily CVS windows-builds: o daily curl binary builds for Windows fresh from CVS:
http://cool.haxx.se/curl-daily/ http://cool.haxx.se/curl-daily/
o curl-tracker is a new mailinglist for "tracker" activities: o curl-tracker is a new mailinglist for "tracker" activities:
http://cool.haxx.se/mailman/listinfo/curl-tracker 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, Dan Fandrich, Ignacio Vazquez-Abrams, Randy McMurchy, Dominick Meglio,
Jean-Marc Ranger, Tor Arntsen, Nodak Sodak, David Houlder, Gisle Vanem, Jean-Marc Ranger, Tor Arntsen, Nodak Sodak, David Houlder, Gisle Vanem,
Christopher R. Palmer, Gwenole Beauchesne, Augustus Saunders, Jesper Jensen, Christopher R. Palmer, Gwenole Beauchesne, Augustus Saunders, Jesper Jensen,
Tom Moers Tom Moers, Andres Garcia
Thanks! (and sorry if I forgot to mention someone) Thanks! (and sorry if I forgot to mention someone)

View File

@ -810,6 +810,20 @@ else
fi fi
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,[ AC_CHECK_LIB(crypto, CRYPTO_lock,[
HAVECRYPTO="yes" HAVECRYPTO="yes"
LIBS="-lcrypto $LIBS" LIBS="-lcrypto $LIBS"
@ -833,20 +847,6 @@ else
dnl This is only reasonable to do if crypto actually is there: check for 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 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) AC_CHECK_LIB(ssl, SSL_connect)
if test "$ac_cv_lib_ssl_SSL_connect" != yes; then if test "$ac_cv_lib_ssl_SSL_connect" != yes; then