cvs: php4(php_4_0_4) / configure.in
| From: | Jani Taskinen | Date: | Thu, 07 Dec 2000 00:31:36 +0000 |
| Subject: | cvs: php4(php_4_0_4) / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2986@lists.php.net to get a copy of this message | ||
sniper Wed Dec 6 16:31:36 2000 EDT
Branch: php_4_0_4
Modified files:
/php4 configure.in
Log:
merge from HEAD.
Index: php4/configure.in
diff -u php4/configure.in:1.195.2.2 php4/configure.in:1.195.2.3
--- php4/configure.in:1.195.2.2 Sat Dec 2 05:46:04 2000
+++ php4/configure.in Wed Dec 6 16:31:36 2000
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.195.2.2 2000/12/02 13:46:04 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.195.2.3 2000/12/07 00:31:36 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -523,6 +523,21 @@
AC_MSG_ERROR(Cannot find OpenSSL's <evp.h>)
fi
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="-I$OPENSSL_INC"
+ AC_MSG_CHECKING(for OpenSSL version)
+ AC_EGREP_CPP(yes,[
+ #include <openssl/opensslv.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
+ yes
+ #endif
+ ],[
+ AC_MSG_RESULT(>= 0.9.6)
+ ],[
+ AC_MSG_ERROR(OpenSSL version 0.9.6 or greater required.)
+ ])
+ CPPFLAGS=$old_CPPFLAGS
+
AC_ADD_LIBPATH($OPENSSL_DIR/lib)
AC_ADD_LIBRARY(ssl)
AC_ADD_LIBRARY(crypto)