[BACK]Return to config.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / mysqli

Diff for /embedaddon/php/ext/mysqli/config.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:47:58 version 1.1.1.2, 2012/05/29 12:34:41
Line 4  dnl config.m4 for extension mysqli Line 4  dnl config.m4 for extension mysqli
   
 PHP_ARG_WITH(mysqli, for MySQLi support,  PHP_ARG_WITH(mysqli, for MySQLi support,
 [  --with-mysqli[=FILE]    Include MySQLi support.  FILE is the path  [  --with-mysqli[=FILE]    Include MySQLi support.  FILE is the path
                          to mysql_config.  If mysqlnd is passed as FILE,                          to mysql_config.  If no value or mysqlnd is passed 
                          the MySQL native driver will be used [mysql_config]])                          as FILE, the MySQL native driver will be used])
   
 PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,  PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
 [  --enable-embedded-mysqli  MYSQLi: Enable embedded support  [  --enable-embedded-mysqli  MYSQLi: Enable embedded support
                             Note: Does not work with MySQL native driver!], no, no)                              Note: Does not work with MySQL native driver!], no, no)
   
if test "$PHP_MYSQLI" = "mysqlnd"; thenif test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
   dnl This needs to be set in any extension which wishes to use mysqlnd    dnl This needs to be set in any extension which wishes to use mysqlnd
   PHP_MYSQLND_ENABLED=yes    PHP_MYSQLND_ENABLED=yes
   
 elif test "$PHP_MYSQLI" != "no"; then  elif test "$PHP_MYSQLI" != "no"; then
   
  if test "$PHP_MYSQLI" = "yes"; then  MYSQL_CONFIG=$PHP_MYSQLI
    MYSQL_CONFIG=`$php_shtool path mysql_config` 
  else 
    MYSQL_CONFIG=$PHP_MYSQLI 
  fi 
   
   MYSQL_LIB_NAME='mysqlclient'    MYSQL_LIB_NAME='mysqlclient'
   if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then    if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
Line 77  dnl Build extension Line 73  dnl Build extension
 if test "$PHP_MYSQLI" != "no"; then  if test "$PHP_MYSQLI" != "no"; then
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \    mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
                   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \                    mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
                  mysqli_exception.c $mysqli_extra_sources"                  mysqli_exception.c mysqli_result_iterator.c $mysqli_extra_sources"
   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)    PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
   PHP_SUBST(MYSQLI_SHARED_LIBADD)    PHP_SUBST(MYSQLI_SHARED_LIBADD)
   PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])    PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])
   
  if test "$PHP_MYSQLI" = "mysqlnd"; then  if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
     PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)      PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
     AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])      AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
   fi    fi
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>