php: update to 5.4.33

One patch was a backport and can be dropped, add Upstream-status to the others.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Koen Kooi
2014-10-06 11:55:01 +02:00
committed by Martin Jansa
parent 26043cbe2d
commit 4deb828fff
10 changed files with 93 additions and 106 deletions

View File

@@ -1,6 +1,10 @@
--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
@@ -2359,12 +2359,9 @@
Upstream-status: Unknown
diff --git a/acinclude.m4 b/acinclude.m4
index 4fd452e..206fcbf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2532,12 +2532,9 @@ dnl
AC_DEFUN([PHP_SETUP_LIBXML], [
AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
[
@@ -14,5 +18,8 @@
+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
+
])
if test -x "$ac_cv_php_xml2_config_path"; then
--
1.9.3