Fix shared mode for gd/xml/mysql extensions.

diff --git a/acinclude.m4 b/acinclude.m4
index a9c8faa0afd7d586e6dd489ea890006f728dd890..96b59161e120e29e81c40c7b46166c0fcc06cdc2 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -234,7 +234,7 @@ AC_DEFUN(PHP_EXTENSION,[
       EXT_LIBS="$EXT_LIBS $1/$_extlib"
       EXT_STATIC="$EXT_STATIC $1"
     else
-      AC_DEFINE_UNQUOTED("COMPILE_DL_`echo $1|tr a-z A-Z`", 1, Whether to build $1 as dynamic module)
+      AC_DEFINE_UNQUOTED(COMPILE_DL_`echo $1|tr a-z A-Z`, 1, Whether to build $1 as dynamic module)
       EXT_SHARED="$EXT_SHARED $1"
     fi
     PHP_OUTPUT(ext/$1/Makefile)

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index df74ab975494778692cc4090a61e207036afb023..bcf867cd33cfb0d5230c10e0c833ad85d4ff95af 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -135,7 +135,7 @@ php3_module_entry gd_module_entry = {
        "gd", gd_functions, PHP_MINIT(gd), PHP_MSHUTDOWN(gd), NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES
 };
 
-#if COMPILE_DL
+#ifdef COMPILE_DL_GD
 # include "dl/phpdl.h"
 DLEXPORT php3_module_entry *get_module(void) { return &gd_module_entry; }
 #endif

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 3d9b5e79820e88ba6657935ce1b9045a9ec93035..234f280767678983192f4d8dee1e7fa68c90d816 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -24,10 +24,6 @@
  * ? Safe mode implementation
  */
 
-#ifdef COMPILE_DL
-# include "dl/phpdl.h"
-#endif
-
 #include "php.h"
 #include "php_globals.h"
 #include "ext/standard/php3_standard.h"
@@ -157,7 +153,8 @@ int mysql_globals_id;
 PHP_MYSQL_API php_mysql_globals mysql_globals;
 #endif
 
-#ifdef COMPILE_DL
+#ifdef COMPILE_DL_MYSQL
+# include "dl/phpdl.h"
 DLEXPORT zend_module_entry *get_module(void) { return &mysql_module_entry; }
 #endif
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 4afbf30f3e58079e6d40b7bc6b4cbb75ad79a375..22ad953804119afd510221c846dfc65d61427224 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -20,9 +20,6 @@
 /* $Id$ */
 #define IS_EXT_MODULE
 
-#if COMPILE_DL
-# include "dl/phpdl.h"
-#endif
 #include "php.h"
 #include "php3_xml.h"
 #include "zend_variables.h"
@@ -59,9 +56,10 @@ PHP_XML_API php_xml_globals xml_globals;
 
 /* {{{ dynamically loadable module stuff */
 
-# if COMPILE_DL
+#ifdef COMPILE_DL_XML
+# include "dl/phpdl.h"
 DLEXPORT zend_module_entry *get_module(void) { return &xml_module_entry; }
-# endif /* COMPILE_DL */
+#endif /* COMPILE_DL_XML */
 
 /* }}} */
 /* {{{ function prototypes */