- Fixed bug #26447 (--with-openssl=shared causes compile errors).NEWS

diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index 595c7f966b257d53dcd2cebb9f437697a9835e43..306f4bed9b208e3ae2b6f7aaa323c886e3149502 100644 (file)
--- 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 be3cf411661f67255d332993cf623967c50d942f..e1c7bd0e51aa8fda04a350ed73c36bb422dfe3f1 100644 (file)
--- 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