4 files changed, 16 insertions, 23 deletions
diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am
deleted file mode 100644
index 952963ea97..0000000000
--- a/ext/mysql/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id$
-
-SRC=php_mysql.c
-INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend
-noinst_LTLIBRARIES=@MYSQL_STATIC@
-EXTRA_LTLIBRARIES=libphpext_mysql.la mysql.la
-libphpext_mysql_la_SOURCES=$(SRC)
-
-phplib_LTLIBRARIES=@MYSQL_SHARED@
-mysql_la_SOURCES=$(SRC)
-mysql_la_LIBADD=@MYSQL_LFLAGS@ -lmysqlclient
-mysql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir)
-EXTRA_LIBS=
diff --git a/ext/mysql/Makefile.in b/ext/mysql/Makefile.in
new file mode 100644
index 0000000000..06c631acee
--- /dev/null
+++ b/ext/mysql/Makefile.in
@@ -0,0 +1,12 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libmysql.la
+LTLIBRARY_SOURCES = php_mysql.c
+LTLIBRARY_SHARED_NAME    = mysql.la
+LTLIBRARY_SHARED_LIBADD  = $(MYSQL_LFLAGS) -lmysqlclient
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/ext/mysql/config.h.stub b/ext/mysql/config.h.stub
deleted file mode 100644
index bc14e05beb..0000000000
--- a/ext/mysql/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef HAVE_MYSQL
-#define HAVE_MYSQL 0
-#endif
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index e900835359..71fa33d502 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -48,7 +48,7 @@ AC_ARG_WITH(mysql,
         fi
         MYSQL_INCLUDE=-I$MYSQL_INCDIR
 
-        AC_DEFINE(HAVE_MYSQL)
+        AC_DEFINE(HAVE_MYSQL,1,[Whether you want MySQL])
         if test "$shared" = "yes"; then
             AC_MSG_RESULT(yes (shared))
             MYSQL_LFLAGS="-L$MYSQL_LIBDIR"
@@ -56,9 +56,9 @@ AC_ARG_WITH(mysql,
         else
             AC_MSG_RESULT(yes (static))
             AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR)
-            AC_ADD_INCLUDE($MYSQL_INCDIR)
             MYSQL_STATIC="libphpext_mysql.la"
         fi
+        AC_ADD_INCLUDE($MYSQL_INCDIR)
         PHP_EXTENSION(mysql, $shared)
 
         dnl check for errmsg.h, which isn't installed by some versions of 3.21
@@ -68,12 +68,9 @@ AC_ARG_WITH(mysql,
         CPPFLAGS="$old_CPPFLAGS"
     else
         AC_MSG_RESULT(no)
-        AC_DEFINE(HAVE_MYSQL, 0)
+        AC_DEFINE(HAVE_MYSQL, 0,[Whether you want MySQL])
     fi
 ],[
     AC_MSG_RESULT(no)
 ])
-AC_SUBST(MYSQL_STATIC)
-AC_SUBST(MYSQL_SHARED)
-AC_SUBST(MYSQL_INCLUDE)
-AC_SUBST(MYSQL_LFLAGS)
+PHP_SUBST(MYSQL_LFLAGS)