equal
deleted
inserted
replaced
1 --- php-5.3.10/ext/mysql/config.m4_orig Mon Nov 30 07:11:29 2009 |
|
2 +++ php-5.3.10/ext/mysql/config.m4 Wed Feb 8 11:25:25 2012 |
|
3 @@ -78,7 +78,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 @@ -132,7 +134,9 @@ |
|
15 MYSQL_MODULE_TYPE=external |
|
16 MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS" |
|
17 MYSQL_INCLUDE=-I$MYSQL_INC_DIR |
|
18 + MYSQL_SHARED_LIBADD="$MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql" |
|
19 |
|
20 + PHP_SUBST(MYSQL_SHARED_LIBADD) |
|
21 PHP_SUBST_OLD(MYSQL_MODULE_TYPE) |
|
22 PHP_SUBST_OLD(MYSQL_LIBS) |
|
23 PHP_SUBST_OLD(MYSQL_INCLUDE) |
|