From: Andrey Hristov <andrey@php.net>
Date: Tue, 22 Sep 2009 14:43:37 +0000 (+0000)
Subject: Check for the different types and create the
X-Git-Tag: php-5.4.0alpha1~191^2~2611
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26f5344ed00de440e58c6ca4b58723ea49aafddd;p=php

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.
---

diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 46b9699b54..591865a80f 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -18,8 +18,6 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then
 
   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 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then
     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 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then
 #include <stdint.h>
 #endif
   ])
-fi