diff options
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/mysql/config.m4 | 2 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 4 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.h | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am index f035f76af9..0bf2a7ddeb 100644 --- a/ext/mysql/Makefile.am +++ b/ext/mysql/Makefile.am @@ -1,14 +1,12 @@ # $Id$ -phplibdir=$(libdir)/php - SRC=php_mysql.c INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=@MYSQL_STATIC@ -EXTRA_LIBRARIES=libphpext_mysql.a -libphpext_mysql_a_SOURCES=$(SRC) +noinst_LTLIBRARIES=@MYSQL_STATIC@ +EXTRA_LTLIBRARIES=libphpext_mysql.la mysql.la +libphpext_mysql_la_SOURCES=$(SRC) + phplib_LTLIBRARIES=@MYSQL_SHARED@ -EXTRA_LTLIBRARIES=mysql.la mysql_la_SOURCES=$(SRC) mysql_la_LIBADD=@MYSQL_LFLAGS@ -lmysqlclient mysql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index ceda6acf4b..e900835359 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -57,7 +57,7 @@ AC_ARG_WITH(mysql, AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) AC_ADD_INCLUDE($MYSQL_INCDIR) - MYSQL_STATIC="libphpext_mysql.a" + MYSQL_STATIC="libphpext_mysql.la" fi PHP_EXTENSION(mysql, $shared) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 0a686149d8..7302599067 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -24,10 +24,6 @@ * ? Safe mode implementation */ -#ifdef PIC -# define COMPILE_DL 1 -#endif - #if COMPILE_DL #include "dl/phpdl.h" #endif diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h index 0dc55a4076..80bd0d6793 100644 --- a/ext/mysql/php_mysql.h +++ b/ext/mysql/php_mysql.h @@ -38,7 +38,7 @@ #define DLEXPORT #endif -#ifdef ZTS +#ifdef __ZTS #include "TSRM.h" #endif |