Make MySQL independent of build location

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 538a9b47fc3220dc0edcc964aa0cc86d8ce4cd80..17e527fa754cbadd5bd01121e30673dc11eb53f3 100644 (file)
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -2,6 +2,8 @@ dnl $Id$
 
 sinclude(ext/mysql/libmysql/acinclude.m4)
 sinclude(ext/mysql/libmysql/mysql.m4)
+sinclude(libmysql/acinclude.m4)
+sinclude(libmysql/mysql.m4)
 
 AC_DEFUN(PHP_MYSQL_SOCK,[
   AC_MSG_CHECKING(for MySQL UNIX socket)

diff --git a/ext/mysql/libmysql/mysql.m4 b/ext/mysql/libmysql/mysql.m4
index 0df6fa500ce36b719ebe579b1e04344d5f9bdd1e..36bba66e5081dd43c19c2a3db8435818c523a4a0 100644 (file)
--- a/ext/mysql/libmysql/mysql.m4
+++ b/ext/mysql/libmysql/mysql.m4
@@ -14,5 +14,5 @@ MYSQL_CHECK_PTHREAD_MUTEX_INIT
 MYSQL_CHECK_READDIR_R_ARGS
 MYSQL_CHECK_SIGWAIT_STYLE
 
-PHP_FAST_OUTPUT(ext/mysql/libmysql/Makefile)
+PHP_FAST_OUTPUT($ext_builddir/libmysql/Makefile)
 ])