jani Thu, 24 Sep 2009 18:01:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288676
Log:
- Fix the build issue with php_mysqlnd_config.h ending up in wrong build
directory
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
U php/php-src/trunk/ext/mysqlnd/config9.m4
U php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-09-24 17:54:23 UTC
(rev 288675)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-09-24 18:01:17 UTC
(rev 288676)
@@ -2,7 +2,6 @@
dnl $Id$
dnl config.m4 for mysqlnd driver
-
PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd,
[ --enable-mysqlnd-threading
EXPERIMENTAL: Enable mysqlnd threaded fetch.
@@ -24,14 +23,14 @@
PHP_BUILD_THREAD_SAFE
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])
+if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
+ PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+
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
+ ext/mysqlnd/php_mysqlnd_config.h
],[
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -40,3 +39,4 @@
#include <stdint.h>
#endif
])
+fi
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2009-09-24 17:54:23 UTC (rev 288675)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2009-09-24 18:01:17 UTC (rev 288676)
@@ -33,9 +33,9 @@
#endif /* __CYGWIN__ */
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
-# include <ext/mysqlnd/config-win.h>
+# include "ext/mysqlnd/config-win.h"
#else
-# include "ext/mysqlnd/php_mysqlnd_config.h"
+# include <ext/mysqlnd/php_mysqlnd_config.h>
#endif /* _WIN32... */
#ifdef HAVE_SYS_TYPES_H
Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/trunk/ext/mysqlnd/config9.m4 2009-09-24 17:54:23 UTC (rev
288675)
+++ php/php-src/trunk/ext/mysqlnd/config9.m4 2009-09-24 18:01:17 UTC (rev
288676)
@@ -2,7 +2,6 @@
dnl $Id$
dnl config.m4 for mysqlnd driver
-
PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd,
[ --enable-mysqlnd-threading
EXPERIMENTAL: Enable mysqlnd threaded fetch.
@@ -24,14 +23,14 @@
PHP_BUILD_THREAD_SAFE
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])
+if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
+ PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+
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
+ ext/mysqlnd/php_mysqlnd_config.h
],[
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -40,3 +39,4 @@
#include <stdint.h>
#endif
])
+fi
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-09-24 17:54:23 UTC
(rev 288675)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-09-24 18:01:17 UTC
(rev 288676)
@@ -33,9 +33,9 @@
#endif /* __CYGWIN__ */
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
-# include <ext/mysqlnd/config-win.h>
+# include "ext/mysqlnd/config-win.h"
#else
-# include "ext/mysqlnd/php_mysqlnd_config.h"
+# include <ext/mysqlnd/php_mysqlnd_config.h>
#endif /* _WIN32... */
#ifdef HAVE_SYS_TYPES_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
