From 6cb49c75ddb84d05cb57c13f3be4fe2bd2020d31 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 3 Sep 2009 00:50:23 +0000 Subject: [PATCH] php5: replace empty packages with simple config variables git-svn-id: svn://svn.openwrt.org/openwrt/packages@17495 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/php5/Makefile | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index ba7d7195c..8f662ee79 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -33,6 +33,7 @@ endef define Package/php5/config choice prompt "PHP5 SPL Options" + depends PACKAGE_php5 default PACKAGE_php5_without_spl config PACKAGE_php5_with_spl @@ -41,6 +42,12 @@ define Package/php5/config config PACKAGE_php5_without_spl bool "without SPL (pcre may be enabled)" endchoice + + config PHP5_APC + bool "PHP5 APC support" + + config PHP5_EXIF + bool "PHP5 EXIF support" endef define Package/php5 @@ -182,18 +189,6 @@ define Package/php5-mod-xml TITLE:=XML module endef -define Package/php5-mod-apc - $(call Package/php5/Default) - DEPENDS:=php5 - TITLE:=APC Extension -endef - -define Package/php5-mod-exif - $(call Package/php5/Default) - DEPENDS:=php5 - TITLE:=EXIF Extension -endef - PKG_CONFIGURE_LIBS:= -lcrypto -lssl PKG_CONFIGURE_OPTS:= \ --enable-shared \ @@ -320,13 +315,13 @@ ifneq ($(CONFIG_PACKAGE_php5-mod-xml),) else PKG_CONFIGURE_OPTS+= --disable-xml endif -ifneq ($(CONFIG_PACKAGE_php5-mod-apc),) +ifneq ($(CONFIG_PHP5_APC),) PKG_CONFIGURE_OPTS+= --enable-apc --disable-apc-mmap --disable-apc-pthreadmutex PKG_CONFIGURE_LIBS+= -lrt else PKG_CONFIGURE_OPTS+= --disable-apc endif -ifneq ($(CONFIG_PACKAGE_php5-mod-exif),) +ifneq ($(CONFIG_PHP5_EXIF),) PKG_CONFIGURE_OPTS+= --enable-exif else PKG_CONFIGURE_OPTS+= --disable-exif @@ -457,5 +452,3 @@ $(eval $(call BuildPlugin,php5-mod-sqlite,sqlite)) $(eval $(call BuildPlugin,php5-mod-pdo,pdo)) $(eval $(call BuildPlugin,php5-mod-pdo-sqlite,pdo_sqlite)) $(eval $(call BuildPlugin,php5-mod-xml,xml)) -$(eval $(call BuildPlugin,php5-mod-apc)) -$(eval $(call BuildPlugin,php5-mod-exif))