From: foobar Date: Wed, 25 Apr 2007 07:47:15 +0000 (+0000) Subject: > date: 2006/12/09 22:18:42; author: wez; state: Exp; lines: +14 -6 X-Git-Tag: RELEASE_1_2_0~224 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af103577be070672a96230cb622178584445df49;p=php > 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 283a6e2433..f505befbb5 100644 --- 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 8d5cc7253e..e61cbe428e 100755 --- 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 ])