]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 28 Mar 2013 09:25:39 +0000 (10:25 +0100)
committerRemi Collet <remi@php.net>
Thu, 28 Mar 2013 09:25:39 +0000 (10:25 +0100)
* PHP-5.4:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars

1  2 
acinclude.m4

diff --cc acinclude.m4
Simple merge