summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-05-02 21:18:59 +0000
committerSascha Schumann <sas@php.net>2000-05-02 21:18:59 +0000
commit6bc1bf4c93bd450f9670d8267ec9e9d30573ab49 (patch)
tree2b1b53c88d6059a5ed17203fcef5bf3835e2445d
parentdf3d78cbac89146982e2dfb945eebb8628bd6bab (diff)
downloadphp-git-6bc1bf4c93bd450f9670d8267ec9e9d30573ab49.tar.gz
Make MySQL independent of build location
-rw-r--r--ext/mysql/config.m42
-rw-r--r--ext/mysql/libmysql/mysql.m42
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 538a9b47fc..17e527fa75 100644
--- 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 0df6fa500c..36bba66e50 100644
--- 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)
])