components/php-5_3/php-sapi/patches/012_php_ext_pdo_mysql_config.m4.patch
changeset 1831 2175d25787f8
parent 1830 93243cb310c5
child 1832 30ac428a2aaf
equal deleted inserted replaced
1830:93243cb310c5 1831:2175d25787f8
     1 --- php-5.3.10/ext/pdo_mysql/config.m4_orig	Sat May 14 22:49:34 2011
       
     2 +++ php-5.3.10/ext/pdo_mysql/config.m4	Wed Feb  8 11:25:25 2012
       
     3 @@ -64,7 +64,9 @@
       
     4        if test "x$SED" = "x"; then
       
     5          AC_PATH_PROG(SED, sed)
       
     6        fi
       
     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          PDO_MYSQL_LIBNAME=mysqlclient_r
       
    12          PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
       
    13        else
       
    14 @@ -167,6 +169,7 @@
       
    15      fi
       
    16    ])
       
    17    PDO_MYSQL_MODULE_TYPE=external
       
    18 +  PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
       
    19  
       
    20    PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
       
    21    PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)