Skip to content

Commit 5a2b41a

Browse files
rlerdorfrlerdorf
committed
Someone strap down Jani and give him a sedative please.
This makes our toolchain work with the latest versions of autoconf and avoids a lot of end-user grief.
1 parent bb179ad commit 5a2b41a

File tree

13 files changed

+61
-61
lines changed

13 files changed

+61
-61
lines changed

‎acinclude.m4

+11-11
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ dnl PHP_BROKEN_GLIBC_FOPEN_APPEND
16881688
dnl
16891689
AC_DEFUN([PHP_BROKEN_GLIBC_FOPEN_APPEND], [
16901690
AC_MSG_CHECKING([for broken libc stdio])
1691-
AC_CACHE_VAL(have_broken_glibc_fopen_append,[
1691+
AC_CACHE_VAL(_cv_have_broken_glibc_fopen_append,[
16921692
AC_TRY_RUN([
16931693
#include <stdio.h>
16941694
int main(int argc, char *argv[])
@@ -1714,20 +1714,20 @@ int main(int argc, char *argv[])
17141714
return 0;
17151715
}
17161716
],
1717-
[have_broken_glibc_fopen_append=no],
1718-
[have_broken_glibc_fopen_append=yes ],
1717+
[_cv_have_broken_glibc_fopen_append=no],
1718+
[_cv_have_broken_glibc_fopen_append=yes ],
17191719
AC_TRY_COMPILE([
17201720
#include <features.h>
17211721
],[
17221722
#if !__GLIBC_PREREQ(2,2)
17231723
choke me
17241724
#endif
17251725
],
1726-
[have_broken_glibc_fopen_append=yes],
1727-
[have_broken_glibc_fopen_append=no ])
1726+
[_cv_have_broken_glibc_fopen_append=yes],
1727+
[_cv_have_broken_glibc_fopen_append=no ])
17281728
)])
17291729
1730-
if test "$have_broken_glibc_fopen_append" = "yes"; then
1730+
if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then
17311731
AC_MSG_RESULT(yes)
17321732
AC_DEFINE(HAVE_BROKEN_GLIBC_FOPEN_APPEND,1, [Define if your glibc borks on fopen with mode a+])
17331733
else
@@ -2736,17 +2736,17 @@ dnl
27362736
dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
27372737
dnl
27382738
AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
2739-
AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
2739+
AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [
27402740
AC_MSG_CHECKING([for PDO includes])
27412741
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
2742-
pdo_inc_path=$abs_srcdir/ext
2742+
pdo_cv_inc_path=$abs_srcdir/ext
27432743
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
2744-
pdo_inc_path=$abs_srcdir/ext
2744+
pdo_cv_inc_path=$abs_srcdir/ext
27452745
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
2746-
pdo_inc_path=$prefix/include/php/ext
2746+
pdo_cv_inc_path=$prefix/include/php/ext
27472747
fi
27482748
])
2749-
if test -n "$pdo_inc_path"; then
2749+
if test -n "$pdo_cv_inc_path"; then
27502750
ifelse([$1],[],:,[$1])
27512751
else
27522752
ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])

‎configure.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## $Id$ -*- autoconf -*-
22
dnl ## Process this file with autoconf to produce a configure script.
33

4-
divert(1)
4+
divert(1001)
55

66
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
77
dnl ## set the PHP version, deal with platform-specific compile
@@ -305,7 +305,7 @@ sinclude(TSRM/threads.m4)
305305
sinclude(TSRM/tsrm.m4)
306306

307307

308-
divert(2)
308+
divert(1002)
309309

310310
dnl ## Diversion 2 is where we set PHP-specific options and come up
311311
dnl ## with reasonable default values for them. We check for pthreads here
@@ -344,7 +344,7 @@ if test "$enable_maintainer_zts" = "yes"; then
344344
PTHREADS_FLAGS
345345
fi
346346

347-
divert(3)
347+
divert(1003)
348348

349349
dnl ## In diversion 3 we check for compile-time options to the PHP
350350
dnl ## core and how to deal with different system dependencies.
@@ -691,7 +691,7 @@ if test "x$php_crypt_r" = "x1"; then
691691
PHP_CRYPT_R_STYLE
692692
fi
693693

694-
divert(4)
694+
divert(1004)
695695

696696
dnl ## In diversion 4 we check user-configurable general settings.
697697

@@ -932,7 +932,7 @@ else
932932
AC_MSG_RESULT([using system default])
933933
fi
934934

935-
divert(5)
935+
divert(1005)
936936

937937
dnl ## In diversion 5 we check which extensions should be compiled.
938938
dnl ## All of these are normally in the extension directories.

‎ext/mbstring/config.m4

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
7474
AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack])
7575
fi
7676
77-
AC_CACHE_CHECK(for variable length prototypes and stdarg.h, cv_php_mbstring_stdarg, [
77+
AC_CACHE_CHECK(for variable length prototypes and stdarg.h, php_cv_mbstring_stdarg, [
7878
AC_TRY_RUN([
7979
#include <stdarg.h>
8080
int foo(int x, ...) {
@@ -86,14 +86,14 @@ int foo(int x, ...) {
8686
return 0;
8787
}
8888
int main() { return foo(10, "", 3.14); }
89-
], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], [
89+
], [php_cv_mbstring_stdarg=yes], [php_cv_mbstring_stdarg=no], [
9090
dnl cross-compile needs something here
9191
case $host_alias in
9292
*netware*)
93-
cv_php_mbstring_stdarg=yes
93+
php_cv_mbstring_stdarg=yes
9494
;;
9595
*)
96-
cv_php_mbstring_stdarg=no
96+
php_cv_mbstring_stdarg=no
9797
;;
9898
esac
9999
])

‎ext/pdo_dblib/config.m4

+5-5
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_inc_path=$abs_srcdir/ext
62+
pdo_cv_inc_path=$abs_srcdir/ext
6363
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
64-
pdo_inc_path=$abs_srcdir/ext
64+
pdo_cv_inc_path=$abs_srcdir/ext
6565
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
66-
pdo_inc_path=$prefix/include/php/ext
66+
pdo_cv_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_inc_path)
70+
AC_MSG_RESULT($pdo_cv_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_inc_path $PDO_DBLIB_DEFS)
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)
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

+1-1
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_inc_path)
53+
PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
5454
PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
5555
PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
5656
fi

‎ext/pdo_mysql/config.m4

+5-5
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,20 @@ if test "$PHP_PDO_MYSQL" != "no"; then
148148
],[
149149
AC_MSG_CHECKING([for PDO includes])
150150
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
151-
pdo_inc_path=$abs_srcdir/ext
151+
pdo_cv_inc_path=$abs_srcdir/ext
152152
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
153-
pdo_inc_path=$abs_srcdir/ext
153+
pdo_cv_inc_path=$abs_srcdir/ext
154154
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
155-
pdo_inc_path=$prefix/include/php/ext
155+
pdo_cv_inc_path=$prefix/include/php/ext
156156
else
157157
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
158158
fi
159-
AC_MSG_RESULT($pdo_inc_path)
159+
AC_MSG_RESULT($pdo_cv_inc_path)
160160
])
161161

162162

163163
dnl fix after renaming to pdo_mysql
164-
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path -I)
164+
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path -I)
165165
ifdef([PHP_ADD_EXTENSION_DEP],
166166
[
167167
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)

‎ext/pdo_oci/config.m4

+5-5
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,18 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
199199
],[
200200
AC_MSG_CHECKING([for PDO includes])
201201
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
202-
pdo_inc_path=$abs_srcdir/ext
202+
pdo_cv_inc_path=$abs_srcdir/ext
203203
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
204-
pdo_inc_path=$abs_srcdir/ext
204+
pdo_cv_inc_path=$abs_srcdir/ext
205205
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
206-
pdo_inc_path=$prefix/include/php/ext
206+
pdo_cv_inc_path=$prefix/include/php/ext
207207
else
208208
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
209209
fi
210-
AC_MSG_RESULT($pdo_inc_path)
210+
AC_MSG_RESULT($pdo_cv_inc_path)
211211
])
212212

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

215215
PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
216216
PHP_SUBST_OLD(PDO_OCI_DIR)

‎ext/pdo_odbc/config.m4

+5-5
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_inc_path=$abs_srcdir/ext
50+
pdo_cv_inc_path=$abs_srcdir/ext
5151
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
52-
pdo_inc_path=$abs_srcdir/ext
52+
pdo_cv_inc_path=$abs_srcdir/ext
5353
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
54-
pdo_inc_path=$prefix/include/php/ext
54+
pdo_cv_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_inc_path)
58+
AC_MSG_RESULT($pdo_cv_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_inc_path $PDO_ODBC_INCLUDE)
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)
169169
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
170170
ifdef([PHP_ADD_EXTENSION_DEP],
171171
[

‎ext/pdo_pgsql/config.m4

+5-5
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@ if test "$PHP_PDO_PGSQL" != "no"; then
109109
],[
110110
AC_MSG_CHECKING([for PDO includes])
111111
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
112-
pdo_inc_path=$abs_srcdir/ext
112+
pdo_cv_inc_path=$abs_srcdir/ext
113113
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
114-
pdo_inc_path=$abs_srcdir/ext
114+
pdo_cv_inc_path=$abs_srcdir/ext
115115
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
116-
pdo_inc_path=$prefix/include/php/ext
116+
pdo_cv_inc_path=$prefix/include/php/ext
117117
else
118118
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
119119
fi
120-
AC_MSG_RESULT($pdo_inc_path)
120+
AC_MSG_RESULT($pdo_cv_inc_path)
121121
])
122122

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

‎ext/pdo_sqlite/config.m4

+6-6
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_inc_path=$abs_srcdir/ext
22+
pdo_cv_inc_path=$abs_srcdir/ext
2323
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
24-
pdo_inc_path=$abs_srcdir/ext
24+
pdo_cv_inc_path=$abs_srcdir/ext
2525
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
26-
pdo_inc_path=$prefix/include/php/ext
26+
pdo_cv_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_inc_path)
30+
AC_MSG_RESULT($pdo_cv_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_inc_path)
73+
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_cv_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_inc_path)
95+
$ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_cv_inc_path)
9696

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

‎ext/sqlite/config.m4

+4-4
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_inc_path"; then
51+
if test -n "$pdo_cv_inc_path"; then
5252
AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
53-
pdo_inc_path="-I$pdo_inc_path"
53+
pdo_cv_inc_path="-I$pdo_cv_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_inc_path
86+
PHP_SQLITE_CFLAGS=$pdo_cv_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_inc_path"
92+
PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_cv_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 \

‎ext/standard/config.m4

+4-4
Original file line numberDiff line numberDiff line change
@@ -226,15 +226,15 @@ dnl
226226
dnl Check if there is a support means of creating a new process
227227
dnl and defining which handles it receives
228228
dnl
229-
AC_CACHE_VAL(php_can_support_proc_open,[
229+
AC_CACHE_VAL(php_cv_can_support_proc_open,[
230230
AC_CHECK_FUNCS(fork CreateProcess, [
231-
php_can_support_proc_open=yes
231+
php_cv_can_support_proc_open=yes
232232
break
233233
],[
234-
php_can_support_proc_open=no
234+
php_cv_can_support_proc_open=no
235235
])])
236236
AC_MSG_CHECKING([if your OS can spawn processes with inherited handles])
237-
if test "$php_can_support_proc_open" = "yes"; then
237+
if test "$php_cv_can_support_proc_open" = "yes"; then
238238
AC_MSG_RESULT(yes)
239239
AC_DEFINE(PHP_CAN_SUPPORT_PROC_OPEN,1, [Define if your system has fork/vfork/CreateProcess])
240240
else

‎ext/standard/var_unserializer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Wed Apr 8 09:34:35 2009 */
1+
/* Generated by re2c 0.13.5 on Mon Nov 23 09:26:17 2009 */
22
#line 1 "ext/standard/var_unserializer.re"
33
/*
44
+----------------------------------------------------------------------+

0 commit comments

Comments
 (0)