c6d45a041e
- Add some more patches from Debian - Rename existing ones (our own patches starts with prefix 1000+) Signed-off-by: Michael Heimpold <mhei@heimpold.de>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
|
|
Date: Sat, 2 May 2015 10:26:53 +0200
|
|
Subject: force_libmysqlclient_r
|
|
|
|
---
|
|
ext/mysqli/config.m4 | 2 +-
|
|
ext/pdo_mysql/config.m4 | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
|
|
index c700dac..8932005 100644
|
|
--- a/ext/mysqli/config.m4
|
|
+++ b/ext/mysqli/config.m4
|
|
@@ -59,7 +59,7 @@ elif test "$PHP_MYSQLI" != "no"; then
|
|
MYSQL_LIB_CFG='--libmysqld-libs'
|
|
dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
|
|
mysqli_extra_sources="mysqli_embedded.c"
|
|
- elif test "$enable_maintainer_zts" = "yes"; then
|
|
+ elif true || test "$enable_maintainer_zts" = "yes"; then
|
|
MYSQL_LIB_CFG='--libs_r'
|
|
MYSQL_LIB_NAME='mysqlclient_r'
|
|
else
|
|
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
|
|
index c165fb6..2e391eb 100755
|
|
--- a/ext/pdo_mysql/config.m4
|
|
+++ b/ext/pdo_mysql/config.m4
|
|
@@ -67,7 +67,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
|
|
if test "x$SED" = "x"; then
|
|
AC_PATH_PROG(SED, sed)
|
|
fi
|
|
- if test "$enable_maintainer_zts" = "yes"; then
|
|
+ if true || test "$enable_maintainer_zts" = "yes"; then
|
|
PDO_MYSQL_LIBNAME=mysqlclient_r
|
|
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
|
|
else
|