- Fix the build issue with php_mysqlnd_config.h ending up in wrong build directory

diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 591865a80faeac4f46af33615ced76fbbd6f8d7a..59fd6c74cc8df65d07ff23abe1b94c43cc365dd9 100644 (file)
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -2,7 +2,6 @@ dnl
 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 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then
     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 @@ fi
 #include <stdint.h>
 #endif
   ])
+fi

diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h
index a4945a9da5e530016e6f6a76ac0c1468418521d2..43cb505861ffdc2ec967a279a4e38904be0c9fca 100644 (file)
--- a/ext/mysqlnd/mysqlnd_portability.h
+++ b/ext/mysqlnd/mysqlnd_portability.h
@@ -33,9 +33,9 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #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