cvs: php4 / configure.in
| From: | Stig Venaas | Date: | Sat, 28 Oct 2000 18:23:47 +0000 |
| Subject: | cvs: php4 / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2327@lists.php.net to get a copy of this message | ||
venaas Sat Oct 28 11:23:47 2000 EDT
Modified files:
/php4 configure.in
Log:
Moving --with-openssl to global configure, want OpenSSL for not just snmp
Index: php4/configure.in
diff -u php4/configure.in:1.191 php4/configure.in:1.192
--- php4/configure.in:1.191 Thu Oct 26 13:39:57 2000
+++ php4/configure.in Sat Oct 28 11:23:47 2000
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.191 2000/10/26 20:39:57 venaas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.192 2000/10/28 18:23:47 venaas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -500,6 +500,41 @@
AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
AC_MSG_RESULT(/usr/local/php/bin)
])
+
+PHP_ARG_WITH(openssl,for OpenSSL support,
+[ --with-openssl[=DIR] Include OpenSSL support])
+if test "$PHP_OPENSSL" = "yes"; then
+ PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+fi
+
+AC_DEFUN(PHP_SETUP_OPENSSL,[
+ if test "$PHP_OPENSSL" = "no"; then
+ PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ fi
+
+ for i in $PHP_OPENSSL; do
+ if test -r $i/include/openssl/evp.h; then
+ OPENSSL_DIR=$i
+ OPENSSL_INC=$i/include/openssl
+ elif test -r $i/include/evp.h; then
+ OPENSSL_DIR=$i
+ OPENSSL_INC=$i/include
+ fi
+ done
+
+ if test -z "$OPENSSL_DIR"; then
+ AC_MSG_ERROR(Cannot find OpenSSL's <evp.h>)
+ fi
+
+ AC_ADD_LIBPATH($OPENSSL_DIR/lib)
+ AC_ADD_LIBRARY(ssl)
+ AC_ADD_LIBRARY(crypto)
+ AC_ADD_INCLUDE($OPENSSL_INC)
+])
+
+if test "$PHP_OPENSSL" != "no"; then
+ PHP_SETUP_OPENSSL
+fi
PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler,
[ --enable-sigchild Enable PHP's own SIGCHLD handler.],no)