com php-src: Look for PDO include files in the right folder: acinclude.m4 ext/pdo_dblib/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4
ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m 4
| From: | Xinchen Hui | Date: | Fri, 06 Feb 2015 11:06:29 +0000 |
| Subject: | com php-src: Look for PDO include files in the right folder: acinclude.m4 ext/pdo_dblib/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m 4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84684@lists.php.net to get a copy of this message | ||
Commit: f38497155226d2ee8d2d7fc32fc26b58b9c0057c
Author: Maxime BESSON <maxime.besson@smile.fr> Fri, 6 Feb 2015 12:06:29 +0100
Parents: ff2cccbfdde4c92bdd285b957237e5eac5099689
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f38497155226d2ee8d2d7fc32fc26b58b9c0057c
Log:
Look for PDO include files in the right folder
Configure scripts for extensions look for PDO include files in
$prefix/include/php. This change makes them look into $phpincludedir
instead, which may be different from $prefix/include/php.
Changed paths:
M acinclude.m4
M ext/pdo_dblib/config.m4
M ext/pdo_mysql/config.m4
M ext/pdo_oci/config.m4
M ext/pdo_odbc/config.m4
M ext/pdo_pgsql/config.m4
M ext/pdo_sqlite/config.m4
Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index a4d4d50..b2220c3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2771,8 +2771,8 @@ AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
fi
])
if test -n "$pdo_cv_inc_path"; then
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index ba8244c..407c3fe 100644
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -62,8 +62,8 @@ if test "$PHP_PDO_DBLIB" != "no"; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 95ae6ca..4b79a8b 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -130,8 +130,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index e3795db..34cfb13 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -217,8 +217,8 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index 74734c4..2301e87 100755
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -50,8 +50,8 @@ if test "$PHP_PDO_ODBC" != "no"; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index c61c5de..1b6dd0e 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -107,8 +107,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 0a7d0fe..fcbe0b5 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -22,8 +22,8 @@ if test "$PHP_PDO_SQLITE" != "no"; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi