From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 28 Mar 2011 21:22:32 +0000 (+0000)
Subject: [package] php5: Fix build when simplexml is selected (#7758)
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dab3d9397c7e9cdae0c145ab84528d92118165b8;p=openwrt%2Fsvn-archive%2Farchive.git

[package] php5: Fix build when simplexml is selected (#7758)

The build fails since the php module is statically disabled. This patch
adds the required magic.

This should also finally close #7758.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

SVN-Revision: 26341
---

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 8022f63154..d568901413 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -114,7 +114,6 @@ PKG_CONFIGURE_OPTS:= \
 	--disable-short-tags \
 	\
 	--without-gettext \
-	--disable-simplexml \
 	--with-zlib="$(STAGING_DIR)/usr" \
 	  --with-zlib-dir="$(STAGING_DIR)/usr" \
 	--with-pcre-regex="$(STAGING_DIR)/usr" \
@@ -283,6 +282,12 @@ else
   PKG_CONFIGURE_OPTS+= --disable-session
 endif
 
+ifneq ($(CONFIG_PACKAGE_php5-mod-simplexml),)
+  PKG_CONFIGURE_OPTS+= --enable-simplexml=shared
+else
+  PKG_CONFIGURE_OPTS+= --disable-simplexml
+endif
+
 ifneq ($(CONFIG_PACKAGE_php5-mod-soap),)
   PKG_CONFIGURE_OPTS+= --enable-soap=shared
 else