wez             Sun Sep 11 15:44:28 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo    config.m4 package.xml pdo.c 
  Log:
  Fix PECL Bug #5010
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.15&r2=1.15.2.1&ty=u
Index: php-src/ext/pdo/config.m4
diff -u php-src/ext/pdo/config.m4:1.15 php-src/ext/pdo/config.m4:1.15.2.1
--- php-src/ext/pdo/config.m4:1.15      Tue Jun 14 09:09:23 2005
+++ php-src/ext/pdo/config.m4   Sun Sep 11 15:44:26 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.15 2005/06/14 13:09:23 sniper Exp $
+dnl $Id: config.m4,v 1.15.2.1 2005/09/11 19:44:26 wez Exp $
 dnl config.m4 for extension pdo
 dnl vim:se ts=2 sw=2 et:
 
@@ -54,8 +54,11 @@
   
   ifdef([PHP_INSTALL_HEADERS],
   [
+    dnl Sadly, this is a complete NOP for pecl extensions
     PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h])
-  ], [
-    PHP_ADD_MAKEFILE_FRAGMENT
   ])
+
+  dnl so we always include the known-good working hack.
+  PHP_ADD_MAKEFILE_FRAGMENT
 fi
+
http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.2&r2=1.19.2.3&ty=u
Index: php-src/ext/pdo/package.xml
diff -u php-src/ext/pdo/package.xml:1.19.2.2 
php-src/ext/pdo/package.xml:1.19.2.3
--- php-src/ext/pdo/package.xml:1.19.2.2        Sun Sep 11 01:27:29 2005
+++ php-src/ext/pdo/package.xml Sun Sep 11 15:44:26 2005
@@ -41,7 +41,7 @@
  <license>PHP</license>
  <release>
   <state>beta</state>
-  <version>1.0RC1</version>
+  <version>1.0RC2</version>
   <date>2005-09-11</date>
 
   <notes>
@@ -60,6 +60,8 @@
 You can find additional PDO drivers at:
 http://snaps.php.net/win32/PECL_5_0/
 
+- Fixed an issue with the installation of the pdo headers
+
 - Consult the PHP 5.1b3 release notes and http://netevil.org/node.php?nid=325
   for more recent changes.
 
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.3&r2=1.57.2.4&ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.3 php-src/ext/pdo/pdo.c:1.57.2.4
--- php-src/ext/pdo/pdo.c:1.57.2.3      Sun Sep 11 01:27:29 2005
+++ php-src/ext/pdo/pdo.c       Sun Sep 11 15:44:26 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo.c,v 1.57.2.3 2005/09/11 05:27:29 wez Exp $ */
+/* $Id: pdo.c,v 1.57.2.4 2005/09/11 19:44:26 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -112,7 +112,7 @@
        PHP_RINIT(pdo),
        PHP_RSHUTDOWN(pdo),
        PHP_MINFO(pdo),
-       "1.0RC1",
+       "1.0RC2",
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

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

Reply via email to