From c77e4951c511983d6acd20aea389d03b61242d09 Mon Sep 17 00:00:00 2001 From: foobar Date: Sat, 29 Nov 2003 12:08:03 +0000 Subject: [PATCH] - Fixed bug #26447 (--with-openssl=shared causes compile errors).NEWS --- ext/openssl/config0.m4 | 8 +++++++- ext/openssl/php_openssl.h | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4 index 595c7f966b..306f4bed9b 100644 --- a/ext/openssl/config0.m4 +++ b/ext/openssl/config0.m4 @@ -10,7 +10,13 @@ if test "$PHP_OPENSSL" != "no"; then [ PHP_NEW_EXTENSION(openssl, openssl.c, $ext_shared) PHP_SUBST(OPENSSL_SHARED_LIBADD) - AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ]) + + if test "$ext_shared" = "yes"; then + AC_DEFINE(HAVE_OPENSSL_SHARED_EXT,1,[ ]) + else + AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ]) + fi + ], [ AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.]) ]) diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h index be3cf41166..e1c7bd0e51 100644 --- a/ext/openssl/php_openssl.h +++ b/ext/openssl/php_openssl.h @@ -34,11 +34,9 @@ # define PHP_OPENSSL_API /* nothing special */ #endif - - - /* HAVE_OPENSSL would include SSL MySQL stuff */ -#ifdef HAVE_OPENSSL_EXT +#if defined(HAVE_OPENSSL_EXT) || defined(HAVE_OPENSSL_SHARED_EXT) + extern zend_module_entry openssl_module_entry; #define phpext_openssl_ptr &openssl_module_entry -- 2.40.0