From: Popa Adrian Marius <mapopa@reea.net>
Date: Thu, 10 Apr 2014 14:43:09 +0000 (+0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a0b80fe90a7440d9aaa3139fae951cc49b162e6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Cleanup $ is not needed for git
---

1a0b80fe90a7440d9aaa3139fae951cc49b162e6
diff --cc ext/interbase/config.m4
index dfd850b00a,4bb0710bca..6aa1b368c0
--- 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 8f903a5ea5,7cde759e5b..11d0d80bc6
--- 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 a89ab2aea5,2ff3c29b7d..f9188a09b7
--- 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