> date: 2006/12/09 22:18:42; author: wez; state: Exp; lines: +14 -6

> merge PHP 5 pdo into HEAD.  This source compiles on both PHP 5 and PHP 6.
> If you're poking around in here, please make sure that any changes you make
> compile on both PHP 5 and 6.  Thanks!

Same goes for Wez. :) (pecl build broken for pdo drivers)

diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag
index 283a6e24330f79a9c068238cf2263ec86eb95061..f505befbb514d1e35b0c92f03ac7274424c46a0e 100644 (file)
--- a/ext/pdo/Makefile.frag
+++ b/ext/pdo/Makefile.frag
@@ -2,7 +2,8 @@ phpincludedir=$(prefix)/include/php
 
 PDO_HEADER_FILES= \
        php_pdo.h \
-       php_pdo_driver.h
+       php_pdo_driver.h \
+       php_pdo_phpvers_compat.h
 
 install-pdo-headers:
        @echo "Installing PDO headers:          $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/"

diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index 8d5cc7253e7994db99021a4fc72e1c18d915244c..e61cbe428e746b6591d1c673dca7bdd5099ed2d8 100755 (executable)
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -56,7 +56,7 @@ for more detail on this issue.
   
   ifdef([PHP_INSTALL_HEADERS],
   [
-    PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h])
+    PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_phpvers_compat.h])
   ], [
     PHP_ADD_MAKEFILE_FRAGMENT
   ])