Skip to content

Commit d257aa4

Browse files
rlerdorfrlerdorf
committed
Oops, can't cache it here because it won't work
in autoconf2.13 and we still support that version in this branch
1 parent 78a1509 commit d257aa4

File tree

9 files changed

+41
-41
lines changed

9 files changed

+41
-41
lines changed

‎acinclude.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2745,17 +2745,17 @@ dnl
27452745
dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
27462746
dnl
27472747
AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
2748-
AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [
2748+
AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
27492749
AC_MSG_CHECKING([for PDO includes])
27502750
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
2751-
pdo_cv_inc_path=$abs_srcdir/ext
2751+
pdo_inc_path=$abs_srcdir/ext
27522752
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
2753-
pdo_cv_inc_path=$abs_srcdir/ext
2753+
pdo_inc_path=$abs_srcdir/ext
27542754
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
2755-
pdo_cv_inc_path=$prefix/include/php/ext
2755+
pdo_inc_path=$prefix/include/php/ext
27562756
fi
27572757
])
2758-
if test -n "$pdo_cv_inc_path"; then
2758+
if test -n "$pdo_inc_path"; then
27592759
ifelse([$1],[],:,[$1])
27602760
else
27612761
ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])

‎ext/pdo_dblib/config.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@ if test "$PHP_PDO_DBLIB" != "no"; then
5959
],[
6060
AC_MSG_CHECKING([for PDO includes])
6161
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
62-
pdo_cv_inc_path=$abs_srcdir/ext
62+
pdo_inc_path=$abs_srcdir/ext
6363
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
64-
pdo_cv_inc_path=$abs_srcdir/ext
64+
pdo_inc_path=$abs_srcdir/ext
6565
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
66-
pdo_cv_inc_path=$prefix/include/php/ext
66+
pdo_inc_path=$prefix/include/php/ext
6767
else
6868
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
6969
fi
70-
AC_MSG_RESULT($pdo_cv_inc_path)
70+
AC_MSG_RESULT($pdo_inc_path)
7171
])
7272

7373
PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
74-
PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_DBLIB_DEFS)
74+
PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS)
7575
AC_CHECK_LIB(dnet_stub, dnet_addr,
7676
[ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD)
7777
AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])

‎ext/pdo_firebird/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
5050
PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
5151
PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
5252
AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
53-
PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
53+
PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_inc_path)
5454
PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
5555
PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
5656
fi

‎ext/pdo_mysql/config.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ if test "$PHP_PDO_MYSQL" != "no"; then
141141
],[
142142
AC_MSG_CHECKING([for PDO includes])
143143
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
144-
pdo_cv_inc_path=$abs_srcdir/ext
144+
pdo_inc_path=$abs_srcdir/ext
145145
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
146-
pdo_cv_inc_path=$abs_srcdir/ext
146+
pdo_inc_path=$abs_srcdir/ext
147147
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
148-
pdo_cv_inc_path=$prefix/include/php/ext
148+
pdo_inc_path=$prefix/include/php/ext
149149
else
150150
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
151151
fi
152-
AC_MSG_RESULT($pdo_cv_inc_path)
152+
AC_MSG_RESULT($pdo_inc_path)
153153
])
154154

155155
if test -n "$PDO_MYSQL_CONFIG"; then
@@ -158,7 +158,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
158158
fi
159159

160160
dnl fix after renaming to pdo_mysql
161-
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path -I)
161+
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path -I)
162162
ifdef([PHP_ADD_EXTENSION_DEP],
163163
[
164164
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)

‎ext/pdo_oci/config.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
214214
],[
215215
AC_MSG_CHECKING([for PDO includes])
216216
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
217-
pdo_cv_inc_path=$abs_srcdir/ext
217+
pdo_inc_path=$abs_srcdir/ext
218218
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
219-
pdo_cv_inc_path=$abs_srcdir/ext
219+
pdo_inc_path=$abs_srcdir/ext
220220
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
221-
pdo_cv_inc_path=$prefix/include/php/ext
221+
pdo_inc_path=$prefix/include/php/ext
222222
else
223223
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
224224
fi
225-
AC_MSG_RESULT($pdo_cv_inc_path)
225+
AC_MSG_RESULT($pdo_inc_path)
226226
])
227227

228-
PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
228+
PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_inc_path)
229229

230230
PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
231231
PHP_SUBST_OLD(PDO_OCI_DIR)

‎ext/pdo_odbc/config.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ if test "$PHP_PDO_ODBC" != "no"; then
4747
],[
4848
AC_MSG_CHECKING([for PDO includes])
4949
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
50-
pdo_cv_inc_path=$abs_srcdir/ext
50+
pdo_inc_path=$abs_srcdir/ext
5151
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
52-
pdo_cv_inc_path=$abs_srcdir/ext
52+
pdo_inc_path=$abs_srcdir/ext
5353
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
54-
pdo_cv_inc_path=$prefix/include/php/ext
54+
pdo_inc_path=$prefix/include/php/ext
5555
else
5656
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
5757
fi
58-
AC_MSG_RESULT($pdo_cv_inc_path)
58+
AC_MSG_RESULT($pdo_inc_path)
5959
])
6060

6161
AC_MSG_CHECKING([for selected PDO ODBC flavour])
@@ -165,7 +165,7 @@ functions required for PDO support.
165165
AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information])
166166
], $PDO_ODBC_LDFLAGS)
167167

168-
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE)
168+
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
169169
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
170170
ifdef([PHP_ADD_EXTENSION_DEP],
171171
[

‎ext/pdo_pgsql/config.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,18 @@ if test "$PHP_PDO_PGSQL" != "no"; then
110110
],[
111111
AC_MSG_CHECKING([for PDO includes])
112112
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
113-
pdo_cv_inc_path=$abs_srcdir/ext
113+
pdo_inc_path=$abs_srcdir/ext
114114
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
115-
pdo_cv_inc_path=$abs_srcdir/ext
115+
pdo_inc_path=$abs_srcdir/ext
116116
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
117-
pdo_cv_inc_path=$prefix/include/php/ext
117+
pdo_inc_path=$prefix/include/php/ext
118118
else
119119
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
120120
fi
121-
AC_MSG_RESULT($pdo_cv_inc_path)
121+
AC_MSG_RESULT($pdo_inc_path)
122122
])
123123

124-
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS)
124+
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
125125
ifdef([PHP_ADD_EXTENSION_DEP],
126126
[
127127
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)

‎ext/pdo_sqlite/config.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ if test "$PHP_PDO_SQLITE" != "no"; then
1919
],[
2020
AC_MSG_CHECKING([for PDO includes])
2121
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
22-
pdo_cv_inc_path=$abs_srcdir/ext
22+
pdo_inc_path=$abs_srcdir/ext
2323
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
24-
pdo_cv_inc_path=$abs_srcdir/ext
24+
pdo_inc_path=$abs_srcdir/ext
2525
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
26-
pdo_cv_inc_path=$prefix/include/php/ext
26+
pdo_inc_path=$prefix/include/php/ext
2727
else
2828
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
2929
fi
30-
AC_MSG_RESULT($pdo_cv_inc_path)
30+
AC_MSG_RESULT($pdo_inc_path)
3131
])
3232

3333
php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
@@ -70,7 +70,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
7070
])
7171

7272
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
73-
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_cv_inc_path)
73+
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path)
7474
else
7575
# use bundled libs
7676
if test "$enable_maintainer_zts" = "yes"; then
@@ -92,7 +92,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
9292

9393
PHP_NEW_EXTENSION(pdo_sqlite,
9494
$php_pdo_sqlite_sources_core,
95-
$ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_cv_inc_path)
95+
$ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path)
9696

9797
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
9898
PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3)

‎ext/sqlite/config.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ AC_DEFUN([PHP_PROG_LEMON],[
4848
if test "$PHP_SQLITE" != "no"; then
4949
if test "$PHP_PDO" != "no"; then
5050
PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])])
51-
if test -n "$pdo_cv_inc_path"; then
51+
if test -n "$pdo_inc_path"; then
5252
AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
53-
pdo_cv_inc_path="-I$pdo_cv_inc_path"
53+
pdo_inc_path="-I$pdo_inc_path"
5454
fi
5555
fi
5656

@@ -83,13 +83,13 @@ if test "$PHP_SQLITE" != "no"; then
8383
-L$SQLITE_DIR/$PHP_LIBDIR -lm
8484
])
8585
SQLITE_MODULE_TYPE=external
86-
PHP_SQLITE_CFLAGS=$pdo_cv_inc_path
86+
PHP_SQLITE_CFLAGS=$pdo_inc_path
8787
sqlite_extra_sources="libsqlite/src/encode.c"
8888
else
8989
# use bundled library
9090
PHP_PROG_LEMON
9191
SQLITE_MODULE_TYPE=builtin
92-
PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_cv_inc_path"
92+
PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
9393
sqlite_extra_sources="libsqlite/src/opcodes.c \
9494
libsqlite/src/parse.c libsqlite/src/encode.c \
9595
libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \

0 commit comments

Comments
 (0)