[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_4/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/config9.m4

2012-01-12 Thread Christopher Jones 
sixd Thu, 12 Jan 2012 23:23:05 +

Revision: http://svn.php.net/viewvc?view=revision&revision=322156

Log:
Fix configuration message typo and alignment (5.4 merge approved by Stas)

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4
U   php/php-src/trunk/ext/mysqlnd/config9.m4

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2012-01-12 21:30:30 UTC 
(rev 322155)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2012-01-12 23:23:05 UTC 
(rev 322156)
@@ -3,8 +3,8 @@
 dnl config.m4 for mysqlnd driver

 PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
-  [  --enable-mysqlnd   Enable mysqlnd expliciely, will be done implicitly
- when required by other extensions], no, yes)
+  [  --enable-mysqlndEnable mysqlnd explicitly, will be done implicitly
+  when required by other extensions], no, yes)

 PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4 2012-01-12 21:30:30 UTC 
(rev 322155)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4 2012-01-12 23:23:05 UTC 
(rev 322156)
@@ -3,8 +3,8 @@
 dnl config.m4 for mysqlnd driver

 PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
-  [  --enable-mysqlnd   Enable mysqlnd expliciely, will be done implicitly
- when required by other extensions], no, yes)
+  [  --enable-mysqlndEnable mysqlnd explicitly, will be done implicitly
+  when required by other extensions], no, yes)

 PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42012-01-12 21:30:30 UTC (rev 
322155)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42012-01-12 23:23:05 UTC (rev 
322156)
@@ -3,8 +3,8 @@
 dnl config.m4 for mysqlnd driver

 PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
-  [  --enable-mysqlnd   Enable mysqlnd expliciely, will be done implicitly
- when required by other extensions], no, yes)
+  [  --enable-mysqlndEnable mysqlnd explicitly, will be done implicitly
+  when required by other extensions], no, yes)

 PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_4/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/config9.m4

2011-09-02 Thread Andrey Hristov 
andrey   Fri, 02 Sep 2011 12:59:32 +

Revision: http://svn.php.net/viewvc?view=revision&revision=316036

Log:
fix message

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4
U   php/php-src/trunk/ext/mysqlnd/config9.m4

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-09-02 11:22:41 UTC 
(rev 316035)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-09-02 12:59:32 UTC 
(rev 316036)
@@ -3,7 +3,7 @@
 dnl config.m4 for mysqlnd driver


-PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed 
protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
 Disable support for the MySQL compressed protocol 
in mysqlnd], yes, no)


Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4 2011-09-02 11:22:41 UTC 
(rev 316035)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4 2011-09-02 12:59:32 UTC 
(rev 316036)
@@ -3,7 +3,7 @@
 dnl config.m4 for mysqlnd driver


-PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed 
protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
 Disable support for the MySQL compressed protocol 
in mysqlnd], yes, no)


Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42011-09-02 11:22:41 UTC (rev 
316035)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42011-09-02 12:59:32 UTC (rev 
316036)
@@ -3,7 +3,7 @@
 dnl config.m4 for mysqlnd driver


-PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed 
protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
 Disable support for the MySQL compressed protocol 
in mysqlnd], yes, no)


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/mysqlnd.h

2011-03-23 Thread Andrey Hristov 
andrey   Wed, 23 Mar 2011 17:14:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309609

Log:
Fix compressed build, make it easier

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.h
U   php/php-src/trunk/ext/mysqlnd/config9.m4
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-23 16:37:19 UTC 
(rev 309608)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-23 17:14:28 UTC 
(rev 309609)
@@ -3,9 +3,9 @@
 dnl config.m4 for mysqlnd driver


-PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable 
compressed protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-Disable support for the MySQL compressed protocol 
in mysqlnd], yes)
+Disable support for the MySQL compressed protocol 
in mysqlnd], yes, no)

 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,
@@ -14,26 +14,22 @@

 dnl If some extension uses mysqlnd it will get compiled in PHP core
 if test "$PHP_MYSQLND_ENABLED" = "yes"; then
-  mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
-   mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_net.c \
-   mysqlnd_ps_codec.c mysqlnd_statistics.c \
+  mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
+  mysqlnd_base_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
+   mysqlnd_loaddata.c mysqlnd_net.c mysqlnd_statistics.c \
   mysqlnd_result.c mysqlnd_result_meta.c 
mysqlnd_debug.c\
   mysqlnd_block_alloc.c php_mysqlnd.c"

-  PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
-  PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
-  PHP_INSTALL_HEADERS([ext/mysqlnd/])

-  dnl Windows uses config.w32 thus this code is safe for now
-
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
-if test -z "$PHP_ZLIB_DIR"; then
-  AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
-  PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
-  MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
-fi
+AC_DEFINE([MYSQLND_COMPRESSION_WANTED], 1, [Enable compressed protocol 
support])
   fi
   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
+
+  mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
+  PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
+  PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+  PHP_INSTALL_HEADERS([ext/mysqlnd/])
 fi

 if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-03-23 16:37:19 UTC 
(rev 309608)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-03-23 17:14:28 UTC 
(rev 309609)
@@ -50,6 +50,10 @@
 #define MYSQLND_DBG_ENABLED 0
 #endif

+#if defined(MYSQLND_COMPRESSION_WANTED) && defined(HAVE_ZLIB)
+#define MYSQLND_COMPRESSION_ENABLED 1
+#endif
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42011-03-23 16:37:19 UTC (rev 
309608)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42011-03-23 17:14:28 UTC (rev 
309609)
@@ -3,9 +3,9 @@
 dnl config.m4 for mysqlnd driver


-PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable 
compressed protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed 
protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-Disable support for the MySQL compressed protocol 
in mysqlnd], yes)
+Disable support for the MySQL compressed protocol 
in mysqlnd], yes, no)

 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,
@@ -14,26 +14,23 @@

 dnl If some extension uses mysqlnd it will get compiled in PHP core
 if test "$PHP_MYSQLND_ENABLED" = "yes"; then
-  mysqlnd_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c mysqlnd_charset.c 
mysqlnd_wireprotocol.c \
-   mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_net.c \
-   mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_auth.c \
+  mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
+  mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c 
mysqlnd_charset.c mysqlnd_wireprotocol.c \
+   my

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/config9.m4

2011-03-22 Thread Andrey Hristov 
andrey   Tue, 22 Mar 2011 14:39:36 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309561

Log:
Fix message

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U   php/php-src/trunk/ext/mysqlnd/config9.m4

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-22 14:10:35 UTC 
(rev 309560)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-22 14:39:36 UTC 
(rev 309561)
@@ -5,7 +5,7 @@

 PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable 
compressed protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-Enable support for the MySQL compressed protocol 
in mysqlnd], yes)
+Disable support for the MySQL compressed protocol 
in mysqlnd], yes)

 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42011-03-22 14:10:35 UTC (rev 
309560)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42011-03-22 14:39:36 UTC (rev 
309561)
@@ -5,7 +5,7 @@

 PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable 
compressed protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-Enable support for the MySQL compressed protocol 
in mysqlnd], yes)
+Disable support for the MySQL compressed protocol 
in mysqlnd], yes)

 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h trunk/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/mysqlnd_debug.h

2010-10-28 Thread Andrey Hristov 
andrey   Thu, 28 Oct 2010 13:46:54 +

Revision: http://svn.php.net/viewvc?view=revision&revision=304973

Log:
fix windows debug build
better zlib detection

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_debug.h
U   php/php-src/trunk/ext/mysqlnd/config9.m4
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2010-10-28 13:09:07 UTC 
(rev 304972)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2010-10-28 13:46:54 UTC 
(rev 304973)
@@ -27,13 +27,10 @@
   dnl Windows uses config.w32 thus this code is safe for now

   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
-AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
-if test "$PHP_ZLIB_DIR" != "no"; then
+if test -z "$PHP_ZLIB_DIR"; then
+  AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
   PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
   MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
-else
-  PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD)
-  MYSQLND_LIBS="$MYSQLND_LIBS -lz"
 fi
   fi
   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-28 
13:09:07 UTC (rev 304972)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-28 
13:46:54 UTC (rev 304973)
@@ -66,16 +66,21 @@

 #if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 1400))
 #define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)  ((tp.tv_sec * 100LL)+ 
tp.tv_usec)
-#define DBG_PROFILE_DECLARE_TIMEVARS   struct timeval __dbg_prof_tp = {0}; 
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#ifndef _MSC_VER
 #define DBG_PROFILE_START_TIME()   gettimeofday(&__dbg_prof_tp, 
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
 #define DBG_PROFILE_END_TIME(duration) gettimeofday(&__dbg_prof_tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
+#else
+#define DBG_PROFILE_START_TIME()   __dbg_prof_start = 0; /* no 
gettimeofday on Windows */
+#define DBG_PROFILE_END_TIME(duration) (duration) = 0; /* no gettimeofday on 
Windows */
+#endif

+
 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg)); 
} while (0)
 #define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ", 
__VA_ARGS__); } while (0)
 #define DBG_ERR_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "error: ", 
__VA_ARGS__); } while (0)

-#define DBG_ENTER_EX(dbg_obj, func_name) DBG_PROFILE_DECLARE_TIMEVARS; 
zend_bool dbg_skip_trace = TRUE; \
+#define DBG_ENTER_EX(dbg_obj, func_name) struct timeval __dbg_prof_tp = {0}; 
uint64_t __dbg_prof_start = 0; /* initialization is needed */zend_bool 
dbg_skip_trace = TRUE; \
if ((dbg_obj)) dbg_skip_trace = 
!(dbg_obj)->m->func_enter((dbg_obj), __LINE__, __FILE__, func_name, 
strlen(func_name)); \
do { DBG_PROFILE_START_TIME(); } while 
(0);
 #define DBG_RETURN_EX(dbg_obj, value)  \

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42010-10-28 13:09:07 UTC (rev 
304972)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42010-10-28 13:46:54 UTC (rev 
304973)
@@ -27,13 +27,10 @@
   dnl Windows uses config.w32 thus this code is safe for now

   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
-AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
-if test "$PHP_ZLIB_DIR" != "no"; then
+if test -z "$PHP_ZLIB_DIR"; then
+  AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
   PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
   MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
-else
-  PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD)
-  MYSQLND_LIBS="$MYSQLND_LIBS -lz"
 fi
   fi
   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/config9.m4

2009-12-22 Thread Johannes Schlüter 
johannes Tue, 22 Dec 2009 19:30:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=292495

Log:
install mysqlnd headers to allow shared build of extensions

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U   php/php-src/trunk/ext/mysqlnd/config9.m4

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-12-22 18:46:54 UTC 
(rev 292494)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-12-22 19:30:09 UTC 
(rev 292495)
@@ -22,6 +22,7 @@

   PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+  PHP_INSTALL_HEADERS([ext/mysqlnd/])

   dnl Windows uses config.w32 thus this code is safe for now


Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42009-12-22 18:46:54 UTC (rev 
292494)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42009-12-22 19:30:09 UTC (rev 
292495)
@@ -22,6 +22,7 @@

   PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+  PHP_INSTALL_HEADERS([ext/mysqlnd/])

   dnl Windows uses config.w32 thus this code is safe for now


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h trunk/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/mysqlnd_portability.h

2009-09-24 Thread Jani Taskinen 
jani Thu, 24 Sep 2009 18:01:17 +

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 
@@ -40,3 +39,4 @@
 #include 
 #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 
+#  include "ext/mysqlnd/config-win.h"
 #else
-#  include "ext/mysqlnd/php_mysqlnd_config.h"
+#  include 
 #endif /* _WIN32... */

 #ifdef HAVE_SYS_TYPES_H

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42009-09-24 17:54:23 UTC (rev 
288675)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42009-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 
@@ -40,3 +39,4 @@
 #include 
 #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 
+#  include "ext/mysqlnd/config-win.h"
 #else
-#  include "ext/mysqlnd/php_mysqlnd_config.h"
+#  include 
 #endif /* _WIN32... */

 #ifdef HAVE_SYS_TYPES_H

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ config9.m4

2009-09-22 Thread Andrey Hristov 
andrey   Tue, 22 Sep 2009 14:44:11 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288575

Log:
MFH: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/branches/PHP_5_3/ext/mysqlnd/config9.m4

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-22 14:43:37 UTC 
(rev 288574)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-09-22 14:44:11 UTC 
(rev 288575)
@@ -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 
 #endif
   ])
-fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php