cvs: php4 / acinclude.m4
| From: | Jani Taskinen | Date: | Wed, 03 Jan 2001 18:12:06 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3351@lists.php.net to get a copy of this message | ||
sniper Wed Jan 3 10:12:06 2001 EDT
Modified files:
/php4 acinclude.m4
Log:
Added better checking for OpenSSL's libraries. Now configure stops
if the libs aren't found.
# bug report #8365
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.118 php4/acinclude.m4:1.119
--- php4/acinclude.m4:1.118 Tue Jan 2 14:40:03 2001
+++ php4/acinclude.m4 Wed Jan 3 10:12:06 2001
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.118 2001/01/02 22:40:03 venaas Exp $
+dnl $Id: acinclude.m4,v 1.119 2001/01/03 18:12:06 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -34,10 +34,20 @@
AC_MSG_ERROR(OpenSSL version 0.9.6 or greater required.)
])
CPPFLAGS=$old_CPPFLAGS
-
+
AC_ADD_LIBPATH($OPENSSL_DIR/lib)
- AC_ADD_LIBRARY(crypto)
- AC_ADD_LIBRARY(ssl)
+
+ AC_CHECK_LIB(crypto, CRYPTO_free, [
+ AC_ADD_LIBRARY(crypto)
+ ],[
+ AC_MSG_ERROR(libcrypto not found!)
+ ])
+
+ AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [
+ AC_ADD_LIBRARY(ssl)
+ ],[
+ AC_MSG_ERROR(libssl not found!)
+ ])
AC_ADD_INCLUDE($OPENSSL_INC)
])