From 1589896b6d6a7263afb13599c1b57bc0ee967d15 Mon Sep 17 00:00:00 2001 From: mhei Date: Tue, 20 Dec 2011 20:00:45 +0000 Subject: [PATCH] [packages] php5: add mysqli module Oliver, thanks for the patch (#10646) git-svn-id: svn://svn.openwrt.org/openwrt/packages@29591 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/php5/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index cb877d134..b715185ee 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=5.3.8 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ @@ -30,7 +30,7 @@ PHP5_MODULES = \ iconv \ json \ ldap libevent \ - mbstring mcrypt mysql \ + mbstring mcrypt mysql mysqli \ openssl \ pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql \ session simplexml soap sockets sqlite sqlite3 sysvmsg sysvsem sysvshm \ @@ -286,6 +286,12 @@ else CONFIGURE_ARGS+= --without-mysql endif +ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysqli),) + CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config" +else + CONFIGURE_ARGS+= --without-mysqli +endif + ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),) CONFIGURE_ARGS+= \ --with-openssl=shared,"$(STAGING_DIR)/usr" \ @@ -528,6 +534,7 @@ $(eval $(call BuildModule,libevent,libevent,+PACKAGE_php5-mod-libevent:libevent) $(eval $(call BuildModule,mbstring,MBString)) $(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php5-mod-mcrypt:libmcrypt +PACKAGE_php5-mod-mcrypt:libltdl)) $(eval $(call BuildModule,mysql,MySQL,+PACKAGE_php5-mod-mysql:libmysqlclient)) +$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php5-mod-mysqli:libmysqlclient)) $(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php5-mod-openssl:libopenssl)) $(eval $(call BuildModule,pcntl,PCNTL)) $(eval $(call BuildModule,pdo,PHP Data Objects))