cvs: php4 / acinclude.m4 configure.in

sas Thu Dec 14 09:29:38 2000 EDT Modified files: /php4 acinclude.m4 configure.in Log: New m4 macros should go into acinclude.m4. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.115 php4/acinclude.m4:1.116 --- php4/acinclude.m4:1.115 Sun Dec 3 02:58:18 2000 +++ php4/acinclude.m4 Thu Dec 14 09:29:38 2000 @@ -1,8 +1,45 @@ -dnl $Id: acinclude.m4,v 1.115 2000/12/03 10:58:18 sas Exp $ +dnl $Id: acinclude.m4,v 1.116 2000/12/14 17:29:38 sas Exp $ dnl dnl This file contains local autoconf functions. sinclude(dynlib.m4) + +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 + fi + done + + if test -z "$OPENSSL_DIR"; then + 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) + AC_ADD_INCLUDE($OPENSSL_INC) +]) dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD) dnl Index: php4/configure.in diff -u php4/configure.in:1.200 php4/configure.in:1.201 --- php4/configure.in:1.200 Thu Dec 7 08:34:37 2000 +++ php4/configure.in Thu Dec 14 09:29:38 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.200 2000/12/07 16:34:37 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.201 2000/12/14 17:29:38 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -510,43 +510,6 @@ 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 - fi - done - - if test -z "$OPENSSL_DIR"; then - 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) - AC_ADD_INCLUDE($OPENSSL_INC) -]) if test "$PHP_OPENSSL" != "no"; then PHP_SETUP_OPENSSL