com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/interbase/config.m4 ext/interbase/tests/skipif.inc ext/pdo_firebird/config.m4

Commit: 1a0b80fe90a7440d9aaa3139fae951cc49b162e6 Author: Popa Adrian Marius <mapopa@reea.net> Thu, 10 Apr 2014 17:43:09 +0300 Parents: b78d1b901ce9ea63e496a8c237367e16f1b97a6e 1c3ed86211c25eb8f11330b5214d4e03672115ab Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a0b80fe90a7440d9aaa3139fae951cc49b162e6 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Cleanup $ is not needed for git Changed paths: MM ext/interbase/config.m4 MM ext/interbase/tests/skipif.inc MM ext/pdo_firebird/config.m4 Diff: diff --cc ext/interbase/config.m4 index dfd850b,4bb0710..6aa1b36 --- a/ext/interbase/config.m4 +++ b/ext/interbase/config.m4 @@@ -1,9 -1,5 +1,5 @@@ - dnl - dnl $Id$ - dnl - PHP_ARG_WITH(interbase,for InterBase support, -[ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base +[ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base install directory [/usr/interbase]]) if test "$PHP_INTERBASE" != "no"; then diff --cc ext/interbase/tests/skipif.inc index 8f903a5,7cde759..11d0d80 --- a/ext/interbase/tests/skipif.inc +++ b/ext/interbase/tests/skipif.inc @@@ -1,6 -1,6 +1,6 @@@ - <?php /* $Id$ */ + <?php -if (!extension_loaded("interbase")) print "skip interbase extension not available"; +if (!extension_loaded("interbase")) print "skip interbase extension not available"; require("interbase.inc"); if(!@ibase_connect($test_base)){ die("skip cannot connnect"); diff --cc ext/pdo_firebird/config.m4 index a89ab2a,2ff3c29..f9188a0 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@@ -1,10 -1,6 +1,6 @@@ - dnl - dnl $Id$ - dnl - PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, [ --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base - install directory [/opt/firebird]]) + install directory [/opt/firebird]]) if test "$PHP_PDO_FIREBIRD" != "no"; then