author | Craig Mohrman <craig.mohrman@oracle.com> |
Thu, 31 May 2012 14:36:45 -0700 | |
changeset 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/mysqli/config.m4_orig Fri Aug 20 05:25:17 2010 |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
+++ php-5.3.10/ext/mysqli/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 |
@@ -23,6 +23,7 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
MYSQL_CONFIG=$PHP_MYSQLI |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
fi |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
+ use_reentrant_mysqlclient="yes" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
MYSQL_LIB_NAME='mysqlclient' |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled]) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
@@ -29,7 +30,8 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
MYSQL_LIB_CFG='--libmysqld-libs' |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
dnl mysqlnd doesn't support embedded, so we have to add some extra stuff |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
mysqli_extra_sources="mysqli_embedded.c" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
- elif test "$enable_maintainer_zts" = "yes"; then |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
+ elif test "$enable_maintainer_zts" = "yes" -o \ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |
+ "$use_reentrant_mysqlclient" = "yes" ; then |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
18 |
MYSQL_LIB_CFG='--libs_r' |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
19 |
MYSQL_LIB_NAME='mysqlclient_r' |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
20 |
else |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
21 |
@@ -79,6 +81,7 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
22 |
mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
23 |
mysqli_exception.c $mysqli_extra_sources" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
24 |
PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
25 |
+ MYSQLI_SHARED_LIBADD="$MYSQLI_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
|
26 |
PHP_SUBST(MYSQLI_SHARED_LIBADD) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
27 |
PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h]) |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
28 |