andrey Tue, 22 Sep 2009 14:43:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288574
Log:
Check for the different types and create the
corresponding configuration file, so it can be used
by mysqli, even if mysqlnd is not enabled at all.
Changed paths:
U php/php-src/trunk/ext/mysqlnd/config9.m4
Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/trunk/ext/mysqlnd/config9.m4 2009-09-22 14:43:16 UTC (rev
288573)
+++ php/php-src/trunk/ext/mysqlnd/config9.m4 2009-09-22 14:43:37 UTC (rev
288574)
@@ -18,8 +18,6 @@
PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- PHP_INSTALL_HEADERS([ext/mysqlnd])
- PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h])
dnl Windows uses config.w32 thus this code is safe for now
if test "$PHP_MYSQLND_THREADING" = "yes"; then
@@ -27,6 +25,10 @@
AC_DEFINE([MYSQLND_THREADED], 1, [Use mysqlnd internal threading])
fi
+fi
+ PHP_INSTALL_HEADERS([ext/mysqlnd])
+ PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h])
+
dnl This creates a file so it has to be after above macros
PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t
uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [
$ext_builddir/php_mysqlnd_config.h
@@ -38,4 +40,3 @@
#include <stdint.h>
#endif
])
-fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
