PHP mysqlnd svn commit: r644 - in trunk: php4/ext/mysql php5/ext/mysqli php6/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-07-05 10:00:43 +0200 (Thu, 05 Jul 2007)
New Revision: 644

Modified:
   trunk/php4/ext/mysql/config.m4
   trunk/php5/ext/mysqli/config9.m4
   trunk/php6/ext/mysqli/config9.m4
Log:
Actually check for types only if the user wants mysqlnd


Modified: trunk/php4/ext/mysql/config.m4
===================================================================
--- trunk/php4/ext/mysql/config.m4	2007-07-05 06:39:56 UTC (rev 643)
+++ trunk/php4/ext/mysql/config.m4	2007-07-05 08:00:43 UTC (rev 644)
@@ -75,6 +75,14 @@
 fi
 
 if test "$PHP_MYSQL" = "mysqlnd"; then
+  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
+  #include <sys/types.h>
+  ])
+
+  AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t],[],[], [
+  #include <stdint.h>
+  ])
+
   MYSQL_MODULE_TYPE=builtin
   MYSQL_CHECKS
   sources="mysqlnd/mysqlnd.c mysqlnd/mysqlnd_charset.c mysqlnd/mysqlnd_wireprotocol.c \

Modified: trunk/php5/ext/mysqli/config9.m4
===================================================================
--- trunk/php5/ext/mysqli/config9.m4	2007-07-05 06:39:56 UTC (rev 643)
+++ trunk/php5/ext/mysqli/config9.m4	2007-07-05 08:00:43 UTC (rev 644)
@@ -2,6 +2,7 @@
 dnl $Id: config.m4,v 1.25 2006/10/09 04:46:03 georg Exp $
 dnl config.m4 for extension mysqli
 
+
 PHP_ARG_WITH(mysqli, for MySQLi support,
 [  --with-mysqli[=FILE]    Include MySQLi support. FILE is the optional pathname to
mysql_config.
                           If mysqlnd is passed as FILE, the MySQL native driver will be
used])
@@ -81,6 +82,14 @@
 dnl MySQLnd build
 dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi is enabled
or not.
 if test "$PHP_MYSQLND_ENABLED" = "yes"; then
+  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
+  #include <sys/types.h>
+  ])
+
+  AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t],[],[], [
+  #include <stdint.h>
+  ])
+
   mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
                    mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
                    mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\

Modified: trunk/php6/ext/mysqli/config9.m4
===================================================================
--- trunk/php6/ext/mysqli/config9.m4	2007-07-05 06:39:56 UTC (rev 643)
+++ trunk/php6/ext/mysqli/config9.m4	2007-07-05 08:00:43 UTC (rev 644)
@@ -2,14 +2,6 @@
 dnl $Id: config.m4,v 1.25 2006/10/09 04:46:03 georg Exp $
 dnl config.m4 for extension mysqli
 
-AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
-#include <sys/types.h>
-])
-
-AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t],[],[], [
-#include <stdint.h>
-])
-
 PHP_ARG_WITH(mysqli, for MySQLi support,
 [  --with-mysqli[=FILE]    Include MySQLi support. FILE is the optional pathname to
mysql_config.
                           If mysqlnd is passed as FILE, the MySQL native driver will be
used])
@@ -89,6 +81,14 @@
 dnl MySQLnd build
 dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi is enabled
or not.
 if test "$PHP_MYSQLND_ENABLED" = "yes"; then
+  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
+  #include <sys/types.h>
+  ])
+
+  AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t],[],[], [
+  #include <stdint.h>
+  ])
+
   mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
                    mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
                    mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\