summaryrefslogtreecommitdiff
path: root/ext/pdo_oci
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2009-11-29 06:13:22 (GMT)
committerRasmus Lerdorf <rasmus@php.net>2009-11-29 06:13:22 (GMT)
commit937358ebc7a6e0eaaf2bc252015b3c1544eb48e6 (patch)
tree3d0f41c0204403270439809ca9716c196f6add5e /ext/pdo_oci
parent20ee37900762d9fa19af8c83d9a9444e1c7c3466 (diff)
downloadphp-937358ebc7a6e0eaaf2bc252015b3c1544eb48e6.tar.gz
Revert attempt at supporting both autoconf 2.13 and
modern versions in the same build chain. There are simply too many broken things in 2.13 to make it work. Cache handling is broken as well which is why I need to revert the pdo_inc_path cache fix as well. trunk is now 2.60+ only and I'll work on cleaning out all the legacy cruft from there.
Diffstat (limited to 'ext/pdo_oci')
-rwxr-xr-xext/pdo_oci/config.m410
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index b96a1b7..9ae270e 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -199,18 +199,18 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_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
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
- PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_inc_path)
PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
PHP_SUBST_OLD(PDO_OCI_DIR)