From: Wez Furlong Date: Sat, 14 May 2005 20:06:54 +0000 (+0000) Subject: Allow it build with PHP 5.0.x and up again. X-Git-Tag: php-5.0.1b1~235 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8cd91adee70945a1200da4ba56d68b5dd403405;p=php Allow it build with PHP 5.0.x and up again. --- diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag new file mode 100644 index 0000000000..283a6e2433 --- /dev/null +++ b/ext/pdo/Makefile.frag @@ -0,0 +1,26 @@ +phpincludedir=$(prefix)/include/php + +PDO_HEADER_FILES= \ + php_pdo.h \ + php_pdo_driver.h + +install-pdo-headers: + @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo + @for f in $(PDO_HEADER_FILES); do \ + if test -f "$(top_srcdir)/$$f"; then \ + $(INSTALL_DATA) $(top_srcdir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ + elif test -f "$(top_builddir)/$$f"; then \ + $(INSTALL_DATA) $(top_builddir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ + elif test -f "$(top_srcdir)/ext/pdo/$$f"; then \ + $(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ + elif test -f "$(top_builddir)/ext/pdo/$$f"; then \ + $(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ + else \ + echo "hmmm"; \ + fi \ + done; + +# mini hack +install: $(all_targets) $(install_targets) install-pdo-headers + diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index 2441499a74..1fd123d6c9 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -51,5 +51,10 @@ for more detail on this issue. esac fi PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) - PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h]) + + dnl When we care only about PHP 5.1 and above, we'll do it this way + dnl PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h]) + + dnl But since that breaks everyone developing against a stable release, we'll do it this way + PHP_ADD_MAKEFILE_FRAGMENT fi