f16547aeb1
with OpenSSL 0.9.5a, instead of requiring only OpenSSL 0.9.6 These patches detect the revelant version and use the additional return values in 0.9.6 only if present. This also unbreaks the SNMP flavor on 2.8-stable, which requires SSL support, since our UCD-SNMP daemon has OpenSSL compiled into it (wierd, but thats how the PHP snmp-config.m4 works) - Add OpenSSL patches - Add note crypt.c patch that its now in 4.0.5-dev and can be removed soon - Add --with-openssl to the standard set of configure options
87 lines
2.5 KiB
Plaintext
87 lines
2.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2001/01/07 21:08:11 avsm Exp $
|
|
--- configure.orig Wed Dec 20 07:44:27 2000
|
|
+++ configure Sun Jan 7 18:38:39 2001
|
|
@@ -376,7 +376,7 @@ ac_help="$ac_help
|
|
--with-exec-dir[=DIR] Only allow executables in DIR when in safe mode
|
|
defaults to /usr/local/php/bin"
|
|
ac_help="$ac_help
|
|
- --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.6) "
|
|
+ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.5) "
|
|
ac_help="$ac_help
|
|
--enable-sigchild Enable PHP's own SIGCHLD handler."
|
|
ac_help="$ac_help
|
|
@@ -7578,7 +7578,7 @@ echo "configure:7576: checking for OpenS
|
|
#include "confdefs.h"
|
|
|
|
#include <openssl/opensslv.h>
|
|
- #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
|
|
+ #if OPENSSL_VERSION_NUMBER >= 0x0090500fL
|
|
yes
|
|
#endif
|
|
|
|
@@ -7587,12 +7587,12 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
|
|
egrep "yes" >/dev/null 2>&1; then
|
|
rm -rf conftest*
|
|
|
|
- echo "$ac_t"">= 0.9.6" 1>&6
|
|
+ echo "$ac_t"">= 0.9.5" 1>&6
|
|
|
|
else
|
|
rm -rf conftest*
|
|
|
|
- { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
|
|
+ { echo "configure: error: OpenSSL version 0.9.5 or greater required." 1>&2; exit 1; }
|
|
|
|
fi
|
|
rm -f conftest*
|
|
@@ -23084,12 +23084,7 @@ fi
|
|
|
|
LIBS=$old_LIBS
|
|
LDFLAGS="$old_LDFLAGS"
|
|
- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
|
|
- cat >> confdefs.h <<\EOF
|
|
-#define HAVE_LIBMCRYPT22 1
|
|
-EOF
|
|
-
|
|
- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
|
|
+ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
|
|
|
|
case "ltdl" in
|
|
c|c_r|pthread*) ;;
|
|
@@ -23106,6 +23101,11 @@ EOF
|
|
#define HAVE_LIBMCRYPT24 1
|
|
EOF
|
|
|
|
+ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
|
|
+ cat >> confdefs.h <<\EOF
|
|
+#define HAVE_LIBMCRYPT22 1
|
|
+EOF
|
|
+
|
|
else
|
|
{ echo "configure: error: Sorry" 1>&2; exit 1; }
|
|
fi
|
|
@@ -39359,7 +39359,7 @@ echo "configure:39357: checking for Open
|
|
#include "confdefs.h"
|
|
|
|
#include <openssl/opensslv.h>
|
|
- #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
|
|
+ #if OPENSSL_VERSION_NUMBER >= 0x0090500fL
|
|
yes
|
|
#endif
|
|
|
|
@@ -39368,12 +39368,12 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
|
|
egrep "yes" >/dev/null 2>&1; then
|
|
rm -rf conftest*
|
|
|
|
- echo "$ac_t"">= 0.9.6" 1>&6
|
|
+ echo "$ac_t"">= 0.9.5" 1>&6
|
|
|
|
else
|
|
rm -rf conftest*
|
|
|
|
- { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
|
|
+ { echo "configure: error: OpenSSL version 0.9.5 or greater required." 1>&2; exit 1; }
|
|
|
|
fi
|
|
rm -f conftest*
|