From: Wez Furlong <wez@php.net>
Date: Sun, 11 Sep 2005 19:44:26 +0000 (+0000)
Subject: Fix PECL Bug #5010
X-Git-Tag: php-5.1.0RC2~274
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e9f413aebd645af32f26477c146b456faad48ae;p=php

Fix PECL Bug #5010
---

diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index d220a2d039..9751f6f439 100755
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -54,8 +54,11 @@ for more detail on this issue.
   
   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
+
diff --git a/ext/pdo/package.xml b/ext/pdo/package.xml
index 06074ae2c2..eb6441daf2 100755
--- a/ext/pdo/package.xml
+++ b/ext/pdo/package.xml
@@ -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 @@ http://snaps.php.net/win32/PECL_5_0/php_pdo.dll
 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.
 
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 5f81217240..fd38a56cc5 100755
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -112,7 +112,7 @@ zend_module_entry pdo_module_entry = {
 	PHP_RINIT(pdo),
 	PHP_RSHUTDOWN(pdo),
 	PHP_MINFO(pdo),
-	"1.0RC1",
+	"1.0RC2",
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */