3 files changed, 16 insertions, 8 deletions
diff --git a/ext/mysql/Makefile.in b/ext/mysql/Makefile.in
index 0ae2db88c4..110388f9f5 100644
--- a/ext/mysql/Makefile.in
+++ b/ext/mysql/Makefile.in
@@ -3,8 +3,8 @@ LTLIBRARY_NAME    = libmysql.la
 LTLIBRARY_SOURCES = php_mysql.c
 LTLIBRARY_LIBADD  = $(MYSQL_LIBADD)
 LTLIBRARY_SHARED_NAME    = mysql.la
-LTLIBRARY_SHARED_LIBADD  = $(MYSQL_LFLAGS) -lmysqlclient
+LTLIBRARY_SHARED_LIBADD  = $(MYSQL_SHARED_LIBADD)
 
 SUBDIRS = $(MYSQL_SUBDIRS)
 
-include $(top_srcdir)/build/ltlib.mk
+include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 77c242d9b0..8772e922f2 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -26,18 +26,19 @@ PHP_ARG_WITH(mysql, for MySQL support,
 
 if test "$PHP_MYSQL" != "no"; then
   AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
-  PHP_EXTENSION(mysql)
+  PHP_EXTENSION(mysql,$ext_shared)
 fi
 
 if test "$PHP_MYSQL" = "yes"; then
   PHP_MYSQL_SOCK
   MYSQL_CHECKS
   MYSQL_LIBADD=libmysql/libmysql_client.la
+  MYSQL_SHARED_LIBADD=libmysql/libmysql_client.la
   MYSQL_SUBDIRS=libmysql
   PHP_SUBST(MYSQL_LIBADD)
   PHP_SUBST(MYSQL_SUBDIRS)
-
-  AC_ADD_INCLUDE(${ext_src_base}libmysql)
+  LIB_BUILD($ext_builddir/libmysql,$ext_shared,yes)
+  AC_ADD_INCLUDE($ext_srcdir/libmysql)
 elif test "$PHP_MYSQL" != "no"; then
   for i in $PHP_MYSQL; do
     if test -r $i/include/mysql/mysql.h; then
@@ -53,7 +54,14 @@ elif test "$PHP_MYSQL" != "no"; then
     AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL)
   fi
 
-  AC_ADD_LIBPATH($MYSQL_DIR/lib/mysql) 
-  AC_ADD_LIBRARY(mysqlclient)
+
+  if test "$ext_shared" = "yes"; then
+    MYSQL_SHARED_LIBADD="-R$MYSQL_DIR/lib/mysql -L$MYSQL_DIR/lib/mysql -lmysqlclient"
+  else
+    AC_ADD_LIBPATH($MYSQL_DIR/lib/mysql) 
+    AC_ADD_LIBRARY(mysqlclient)
+  fi
+
   AC_ADD_INCLUDE($MYSQL_INC_DIR)
 fi
+PHP_SUBST(MYSQL_SHARED_LIBADD)
diff --git a/ext/mysql/libmysql/Makefile.in b/ext/mysql/libmysql/Makefile.in
index 43f25bd976..aaf98db2bc 100644
--- a/ext/mysql/libmysql/Makefile.in
+++ b/ext/mysql/libmysql/Makefile.in
@@ -13,4 +13,4 @@ LTLIBRARY_SOURCES = libmysql.c errmsg.c net.c violite.c password.c \
 	strcont.c strcend.c bchange.c bmove.c bmove_upp.c \
 	longlong2str.c strtoull.c strtoll.c ctype-latin1.c
 
-include $(top_srcdir)/build/ltlib.mk
+include $(top_srcdir)/build/dynlib.mk