MFH: - Fixed bug #25348 ("make install" fails with --enable-short-tags).

diff --git a/NEWS b/NEWS
index f28dab52f32eaf9a122f42755e8a27f0c3ce12e6..fecae60bf4b830a996471f71409a029e005e0f90 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP 4                                                                      NEWS
 - Fixed disk_total_space() and disk_free_space() under FreeBSD. (Jon Parise)
 - Fixed crash bug when non-existing save/serializer handler was used. (Jani)
 - Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
+- Fixed bug #25348 ("make install" fails with --enable-short-tags). (Jani)
 - Fixed bug #25343 (is_dir() gives warning on FreeBSD). (Jani)
 - Fixed bug #25308 (php -m crashes when zend extensions are loaded). (Stas)
 - Fixed bug #25307 (Crash with WDDX serializer). (Sascha, Jani)

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index a74392b2d3719e4ea84976013a57b7ad7cff5356..743fa9dae8c86a50438571c126c67a6a01d2696f 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -3,7 +3,7 @@
 peardir=$(PEAR_INSTALLDIR)
 
 # Skip all php.ini files altogether
-PEAR_INSTALL_FLAGS = -n -dsafe_mode=0
+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
 
 install-pear-installer: $(top_builddir)/sapi/cli/php
        @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/package-*.xml