author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
Wed, 27 Nov 2013 01:24:30 -0800 | |
branch | s11u1-sru |
changeset 2835 | 30703b11b244 |
parent 846 | fe258446a1ae |
permissions | -rw-r--r-- |
846
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
--- php-5.3.10/ext/pdo_mysql/config.m4_orig Sat May 14 22:49:34 2011 |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
+++ php-5.3.10/ext/pdo_mysql/config.m4 Wed Feb 8 11:25:25 2012 |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -64,7 +64,9 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
if test "x$SED" = "x"; then |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
AC_PATH_PROG(SED, sed) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
fi |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
- if test "$enable_maintainer_zts" = "yes"; then |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
+ use_reentrant_mysqlclient="yes" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
+ if test "$enable_maintainer_zts" = "yes" -o \ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
+ "$use_reentrant_mysqlclient" = "yes" ; then |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
PDO_MYSQL_LIBNAME=mysqlclient_r |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"` |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
else |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
@@ -167,6 +169,7 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
fi |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
]) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |
PDO_MYSQL_MODULE_TYPE=external |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
18 |
+ PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
19 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
20 |
PHP_SUBST(PDO_MYSQL_SHARED_LIBADD) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
21 |
PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) |