|
0
|
1 |
--- php-5.2.9/ext/mysql/config.m4.ORIG Mon Mar 30 11:53:10 2009
|
|
|
2 |
+++ php-5.2.9/ext/mysql/config.m4 Mon Mar 30 11:51:28 2009
|
|
|
3 |
@@ -86,7 +86,9 @@
|
|
|
4 |
Note that the MySQL client library is not bundled anymore!])
|
|
|
5 |
fi
|
|
|
6 |
|
|
|
7 |
- if test "$enable_maintainer_zts" = "yes"; then
|
|
|
8 |
+ use_reentrant_mysqlclient="yes"
|
|
|
9 |
+ if test "$enable_maintainer_zts" = "yes" -o \
|
|
|
10 |
+ "$use_reentrant_mysqlclient" = "yes" ; then
|
|
|
11 |
MYSQL_LIBNAME=mysqlclient_r
|
|
|
12 |
else
|
|
|
13 |
MYSQL_LIBNAME=mysqlclient
|
|
|
14 |
@@ -143,6 +145,7 @@
|
|
|
15 |
MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
|
|
|
16 |
MYSQL_INCLUDE=-I$MYSQL_INC_DIR
|
|
|
17 |
|
|
|
18 |
+ MYSQL_SHARED_LIBADD="$MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
|
|
|
19 |
PHP_SUBST(MYSQL_SHARED_LIBADD)
|
|
|
20 |
PHP_SUBST_OLD(MYSQL_MODULE_TYPE)
|
|
|
21 |
PHP_SUBST_OLD(MYSQL_LIBS)
|
|
|
22 |
--- php-5.2.9/ext/pdo_mysql/config.m4.ORIG Mon Mar 30 11:53:50 2009
|
|
|
23 |
+++ php-5.2.9/ext/pdo_mysql/config.m4 Mon Mar 30 11:52:23 2009
|
|
|
24 |
@@ -58,7 +58,9 @@
|
|
|
25 |
if test "x$SED" = "x"; then
|
|
|
26 |
AC_PATH_PROG(SED, sed)
|
|
|
27 |
fi
|
|
|
28 |
- if test "$enable_maintainer_zts" = "yes"; then
|
|
|
29 |
+ use_reentrant_mysqlclient="yes"
|
|
|
30 |
+ if test "$enable_maintainer_zts" = "yes" -o \
|
|
|
31 |
+ "$use_reentrant_mysqlclient" = "yes" ; then
|
|
|
32 |
PDO_MYSQL_LIBNAME=mysqlclient_r
|
|
|
33 |
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
|
|
|
34 |
else
|
|
|
35 |
@@ -156,6 +158,7 @@
|
|
|
36 |
])
|
|
|
37 |
PDO_MYSQL_MODULE_TYPE=external
|
|
|
38 |
|
|
|
39 |
+ PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
|
|
|
40 |
PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
|
|
|
41 |
PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
|
|
|
42 |
fi
|
|
|
43 |
--- php-5.2.9/ext/mysqli/config.m4.ORIG Mon Mar 30 11:53:18 2009
|
|
|
44 |
+++ php-5.2.9/ext/mysqli/config.m4 Mon Mar 30 11:52:00 2009
|
|
|
45 |
@@ -22,11 +22,13 @@
|
|
|
46 |
MYSQL_CONFIG=$PHP_MYSQLI
|
|
|
47 |
fi
|
|
|
48 |
|
|
|
49 |
+ use_reentrant_mysqlclient="yes"
|
|
|
50 |
MYSQL_LIB_NAME='mysqlclient'
|
|
|
51 |
if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
|
|
|
52 |
AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
|
|
|
53 |
MYSQL_LIB_CFG='--libmysqld-libs'
|
|
|
54 |
- elif test "$enable_maintainer_zts" = "yes"; then
|
|
|
55 |
+ elif test "$enable_maintainer_zts" = "yes" -o \
|
|
|
56 |
+ "$use_reentrant_mysqlclient" = "yes" ; then
|
|
|
57 |
MYSQL_LIB_CFG='--libs_r'
|
|
|
58 |
MYSQL_LIB_NAME='mysqlclient_r'
|
|
|
59 |
else
|
|
|
60 |
@@ -60,5 +62,6 @@
|
|
|
61 |
])
|
|
|
62 |
|
|
|
63 |
PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c mysqli_fe.c mysqli_report.c mysqli_repl.c mysqli_driver.c mysqli_warning.c mysqli_exception.c mysqli_embedded.c, $ext_shared)
|
|
|
64 |
+ MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
|
|
|
65 |
PHP_SUBST(MYSQLI_SHARED_LIBADD)
|
|
|
66 |
fi
|
|
|
67 |
--- php-5.2.9/ext/pgsql/config.m4.ORIG Fri Mar 6 19:20:36 2009
|
|
|
68 |
+++ php-5.2.9/ext/pgsql/config.m4 Fri Mar 6 19:23:17 2009
|
|
|
69 |
@@ -96,6 +96,7 @@
|
|
|
70 |
LDFLAGS=$old_LDFLAGS
|
|
|
71 |
|
|
|
72 |
PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD)
|
|
|
73 |
+ PGSQL_SHARED_LIBADD="$PGSQL_SHARED_LIBADD -R/usr/postgres/8.3/lib"
|
|
|
74 |
PHP_SUBST(PGSQL_SHARED_LIBADD)
|
|
|
75 |
|
|
|
76 |
PHP_ADD_INCLUDE($PGSQL_INCLUDE)
|
|
|
77 |
--- php-5.2.9/ext/pdo_pgsql/config.m4.ORIG Fri Mar 6 19:20:41 2009
|
|
|
78 |
+++ php-5.2.9/ext/pdo_pgsql/config.m4 Fri Mar 6 19:23:11 2009
|
|
|
79 |
@@ -101,6 +101,7 @@
|
|
|
80 |
LDFLAGS=$old_LDFLAGS
|
|
|
81 |
|
|
|
82 |
PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PDO_PGSQL_SHARED_LIBADD)
|
|
|
83 |
+ PDO_PGSQL_SHARED_LIBADD="$PDO_PGSQL_SHARED_LIBADD -R/usr/postgres/8.3/lib"
|
|
|
84 |
PHP_SUBST(PDO_PGSQL_SHARED_LIBADD)
|
|
|
85 |
|
|
|
86 |
PHP_ADD_INCLUDE($PGSQL_INCLUDE)
|
|
|
87 |
--- php-5.2.9/sapi/apache/config.m4.ORIG Wed Mar 11 17:32:35 2009
|
|
|
88 |
+++ php-5.2.9/sapi/apache/config.m4 Wed Mar 11 17:35:20 2009
|
|
|
89 |
@@ -18,6 +18,23 @@
|
|
|
90 |
fi
|
|
|
91 |
])
|
|
|
92 |
|
|
|
93 |
+dnl PHP_AP2_EXTRACT_VERSION(/path/httpd)
|
|
|
94 |
+dnl
|
|
|
95 |
+dnl This macro is used to get a comparable
|
|
|
96 |
+dnl version for apache1/2.
|
|
|
97 |
+dnl
|
|
|
98 |
+AC_DEFUN([PHP_AP2_EXTRACT_VERSION],[
|
|
|
99 |
+ ac_output=`env LD_LIBRARY_PATH=$APXS_LIBDIR $1 -v 2>&1 | grep version`
|
|
|
100 |
+ ac_IFS=$IFS
|
|
|
101 |
+IFS="- /.
|
|
|
102 |
+"
|
|
|
103 |
+ set $ac_output
|
|
|
104 |
+ IFS=$ac_IFS
|
|
|
105 |
+
|
|
|
106 |
+ APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
|
|
|
107 |
+])
|
|
|
108 |
+
|
|
|
109 |
+dnl
|
|
|
110 |
dnl Apache 1.x shared module
|
|
|
111 |
PHP_ARG_WITH(apxs,,
|
|
|
112 |
[ --with-apxs[=FILE] Build shared Apache 1.x module. FILE is the optional
|
|
|
113 |
@@ -52,12 +69,13 @@
|
|
|
114 |
|
|
|
115 |
APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
|
|
|
116 |
APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
|
|
|
117 |
+ APXS_LIBDIR=`$APXS -q LIBDIR`
|
|
|
118 |
APXS_CFLAGS=`$APXS -q CFLAGS`
|
|
|
119 |
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
|
|
|
120 |
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
|
|
|
121 |
|
|
|
122 |
# Test that we're trying to configure with apache 1.x
|
|
|
123 |
- PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
|
|
|
124 |
+ PHP_AP2_EXTRACT_VERSION($APXS_HTTPD)
|
|
|
125 |
if test "$APACHE_VERSION" -ge 2000000; then
|
|
|
126 |
AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
|
|
|
127 |
fi
|
|
|
128 |
@@ -94,13 +112,13 @@
|
|
|
129 |
if test "$?" != "0"; then
|
|
|
130 |
APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
|
|
131 |
else
|
|
|
132 |
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
|
133 |
+ APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
|
|
|
134 |
if test -z `$APXS -q SYSCONFDIR`; then
|
|
|
135 |
APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
|
136 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
137 |
-i -n php5 $SAPI_SHARED"
|
|
|
138 |
else
|
|
|
139 |
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
|
|
140 |
+ APXS_SYSCONFDIR=`$APXS -q SYSCONFDIR`
|
|
|
141 |
APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
|
142 |
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
143 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
144 |
--- php-5.2.9/sapi/apache2handler/config.m4.ORIG Wed Mar 11 16:18:06 2009
|
|
|
145 |
+++ php-5.2.9/sapi/apache2handler/config.m4 Wed Mar 11 16:17:30 2009
|
|
|
146 |
@@ -6,6 +6,23 @@
|
|
|
147 |
[ --with-apxs2[=FILE] Build shared Apache 2.0 Handler module. FILE is the optional
|
|
|
148 |
pathname to the Apache apxs tool [apxs]], no, no)
|
|
|
149 |
|
|
|
150 |
+dnl PHP_AP2_EXTRACT_VERSION(/path/httpd)
|
|
|
151 |
+dnl
|
|
|
152 |
+dnl This macro is used to get a comparable
|
|
|
153 |
+dnl version for apache/2.
|
|
|
154 |
+dnl
|
|
|
155 |
+AC_DEFUN([PHP_AP2_EXTRACT_VERSION],[
|
|
|
156 |
+ ac_output=`env LD_LIBRARY_PATH=$APXS_LIBDIR $1 -v 2>&1 | grep version`
|
|
|
157 |
+ ac_IFS=$IFS
|
|
|
158 |
+IFS="- /.
|
|
|
159 |
+"
|
|
|
160 |
+ set $ac_output
|
|
|
161 |
+ IFS=$ac_IFS
|
|
|
162 |
+
|
|
|
163 |
+ APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
|
|
|
164 |
+])
|
|
|
165 |
+
|
|
|
166 |
+dnl
|
|
|
167 |
AC_MSG_CHECKING([for Apache 2.0 handler-module support via DSO through APXS])
|
|
|
168 |
|
|
|
169 |
if test "$PHP_APXS2" != "no"; then
|
|
|
170 |
@@ -36,6 +53,7 @@
|
|
|
171 |
|
|
|
172 |
APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
|
|
|
173 |
APXS_BINDIR=`$APXS -q BINDIR`
|
|
|
174 |
+ APXS_LIBDIR=`$APXS -q LIBDIR`
|
|
|
175 |
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
|
|
|
176 |
APXS_CFLAGS=`$APXS -q CFLAGS`
|
|
|
177 |
APXS_MPM=`$APXS -q MPM_NAME`
|
|
|
178 |
@@ -60,7 +78,7 @@
|
|
|
179 |
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
|
|
|
180 |
|
|
|
181 |
# Test that we're trying to configure with apache 2.x
|
|
|
182 |
- PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
|
|
|
183 |
+ PHP_AP2_EXTRACT_VERSION($APXS_HTTPD)
|
|
|
184 |
if test "$APACHE_VERSION" -le 2000000; then
|
|
|
185 |
AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
|
|
|
186 |
elif test "$APACHE_VERSION" -lt 2000044; then
|
|
|
187 |
@@ -67,13 +85,14 @@
|
|
|
188 |
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
|
|
|
189 |
fi
|
|
|
190 |
|
|
|
191 |
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
|
192 |
+ # Proto area "apxs" already prefixes $(INSTALL_ROOT) to paths
|
|
|
193 |
+ APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
|
|
|
194 |
if test -z `$APXS -q SYSCONFDIR`; then
|
|
|
195 |
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
|
196 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
197 |
-i -n php5"
|
|
|
198 |
else
|
|
|
199 |
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
|
|
200 |
+ APXS_SYSCONFDIR=`$APXS -q SYSCONFDIR`
|
|
|
201 |
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
|
202 |
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
203 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
204 |
--- php-5.2.9/sapi/apache2filter/config.m4.ORIG Wed Mar 11 16:30:32 2009
|
|
|
205 |
+++ php-5.2.9/sapi/apache2filter/config.m4 Wed Mar 11 16:33:27 2009
|
|
|
206 |
@@ -9,6 +9,23 @@
|
|
|
207 |
|
|
|
208 |
AC_MSG_CHECKING([for Apache 2.0 filter-module support via DSO through APXS])
|
|
|
209 |
|
|
|
210 |
+dnl PHP_AP2_EXTRACT_VERSION(/path/httpd)
|
|
|
211 |
+dnl
|
|
|
212 |
+dnl This macro is used to get a comparable
|
|
|
213 |
+dnl version for apache2.
|
|
|
214 |
+dnl
|
|
|
215 |
+AC_DEFUN([PHP_AP2_EXTRACT_VERSION],[
|
|
|
216 |
+ ac_output=`env LD_LIBRARY_PATH=$APXS_LIBDIR $1 -v 2>&1 | grep version`
|
|
|
217 |
+ ac_IFS=$IFS
|
|
|
218 |
+IFS="- /.
|
|
|
219 |
+"
|
|
|
220 |
+ set $ac_output
|
|
|
221 |
+ IFS=$ac_IFS
|
|
|
222 |
+
|
|
|
223 |
+ APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
|
|
|
224 |
+])
|
|
|
225 |
+
|
|
|
226 |
+dnl
|
|
|
227 |
if test "$PHP_APXS2FILTER" != "no"; then
|
|
|
228 |
if test "$PHP_APXS2FILTER" = "yes"; then
|
|
|
229 |
APXS=apxs
|
|
|
230 |
@@ -37,6 +54,7 @@
|
|
|
231 |
|
|
|
232 |
APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
|
|
|
233 |
APXS_BINDIR=`$APXS -q BINDIR`
|
|
|
234 |
+ APXS_LIBDIR=`$APXS -q LIBDIR`
|
|
|
235 |
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
|
|
|
236 |
APXS_CFLAGS=`$APXS -q CFLAGS`
|
|
|
237 |
APXS_MPM=`$APXS -q MPM_NAME`
|
|
|
238 |
@@ -61,7 +79,7 @@
|
|
|
239 |
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
|
|
|
240 |
|
|
|
241 |
# Test that we're trying to configure with apache 2.x
|
|
|
242 |
- PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
|
|
|
243 |
+ PHP_AP2_EXTRACT_VERSION($APXS_HTTPD)
|
|
|
244 |
if test "$APACHE_VERSION" -le 2000000; then
|
|
|
245 |
AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
|
|
|
246 |
elif test "$APACHE_VERSION" -lt 2000040; then
|
|
|
247 |
@@ -68,13 +86,13 @@
|
|
|
248 |
AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required])
|
|
|
249 |
fi
|
|
|
250 |
|
|
|
251 |
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
|
252 |
+ APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
|
|
|
253 |
if test -z `$APXS -q SYSCONFDIR`; then
|
|
|
254 |
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
|
255 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
256 |
-i -n php5"
|
|
|
257 |
else
|
|
|
258 |
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
|
|
259 |
+ APXS_SYSCONFDIR=`$APXS -q SYSCONFDIR`
|
|
|
260 |
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
|
261 |
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
262 |
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|