cvs: /php4 acinclude.m4 /php4/ext/gd gd.c /php4/ext/mysql php_mysql.c /php4/ext/xml xml.c

ssb Sat Dec 4 09:46:09 1999 EDT Modified files: /php4 acinclude.m4 /php4/ext/gd gd.c /php4/ext/mysql php_mysql.c /php4/ext/xml xml.c Log: Fix shared mode for gd/xml/mysql extensions. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.45 php4/acinclude.m4:1.46 --- php4/acinclude.m4:1.45 Wed Dec 1 18:46:17 1999 +++ php4/acinclude.m4 Sat Dec 4 09:45:36 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.45 1999/12/01 23:46:17 sas Exp $ +dnl $Id: acinclude.m4,v 1.46 1999/12/04 14:45:36 ssb Exp $ dnl dnl This file contains local autoconf functions. @@ -234,7 +234,7 @@ 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) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.25 php4/ext/gd/gd.c:1.26 --- php4/ext/gd/gd.c:1.25 Wed Dec 1 18:14:53 1999 +++ php4/ext/gd/gd.c Sat Dec 4 09:45:37 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.25 1999/12/01 23:14:53 ssb Exp $ */ +/* $Id: gd.c,v 1.26 1999/12/04 14:45:37 ssb Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -135,7 +135,7 @@ "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 Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.10 php4/ext/mysql/php_mysql.c:1.11 --- php4/ext/mysql/php_mysql.c:1.10 Thu Dec 2 14:09:01 1999 +++ php4/ext/mysql/php_mysql.c Sat Dec 4 09:45:38 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.10 1999/12/02 19:09:01 rasmus Exp $ */ +/* $Id: php_mysql.c,v 1.11 1999/12/04 14:45:38 ssb Exp $ */ /* TODO: @@ -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 @@ 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 Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.29 php4/ext/xml/xml.c:1.30 --- php4/ext/xml/xml.c:1.29 Fri Nov 19 09:11:15 1999 +++ php4/ext/xml/xml.c Sat Dec 4 09:45:38 1999 @@ -17,12 +17,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.29 1999/11/19 14:11:15 thies Exp $ */ +/* $Id: xml.c,v 1.30 1999/12/04 14:45:38 ssb Exp $ */ #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 @@ /* {{{ 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 */