1 --- php-5.3.10/ext/mysqli/config.m4_orig	Fri Aug 20 05:25:17 2010

     2 +++ php-5.3.10/ext/mysqli/config.m4	Wed Feb  8 11:25:25 2012

     3 @@ -23,6 +23,7 @@

     4      MYSQL_CONFIG=$PHP_MYSQLI

     5    fi

     6  

     7 +  use_reentrant_mysqlclient="yes"

     8    MYSQL_LIB_NAME='mysqlclient'

     9    if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then

    10      AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])

    11 @@ -29,7 +30,8 @@

    12      MYSQL_LIB_CFG='--libmysqld-libs'

    13      dnl mysqlnd doesn't support embedded, so we have to add some extra stuff

    14      mysqli_extra_sources="mysqli_embedded.c"

    15 -  elif test "$enable_maintainer_zts" = "yes"; then

    16 +  elif test "$enable_maintainer_zts" = "yes" -o \

    17 +    "$use_reentrant_mysqlclient" = "yes" ; then

    18      MYSQL_LIB_CFG='--libs_r'

    19      MYSQL_LIB_NAME='mysqlclient_r'

    20    else

    21 @@ -79,6 +81,7 @@

    22                    mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \

    23                    mysqli_exception.c $mysqli_extra_sources"

    24    PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)

    25 +  MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"

    26    PHP_SUBST(MYSQLI_SHARED_LIBADD)

    27    PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])

    28