From 4d953ef59f500028073112bcd8326d9d41ca8a7d Mon Sep 17 00:00:00 2001
From: Arnar Mar Sigurðsson <antab@valka.is>
Date: Sun, 1 Jun 2008 18:04:13 +0000
Subject: Dump php to version 5.2.6 and add SimpleXML extension to config menu

---
 package/php/Config.ext | 27 +++++++++++++++++----------
 package/php/php.mk     | 13 ++++++++-----
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 9a2a11ee1..eb8d48f5c 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -29,18 +29,25 @@ config BR2_PACKAGE_PHP_EXT_SESSION
 	  Session support
 
 config BR2_PACKAGE_PHP_EXT_OPENSSL
-        bool "openssl"
-        depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
-        default n
-        help
-          openssl support
+	bool "openssl"
+	depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
+	default n
+	help
+	  openssl support
 
 config BR2_PACKAGE_PHP_EXT_LIBXML2
-        bool "xml2"
-        depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
-        default y
-        help
-          xml support
+	bool "xml2"
+	depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
+	default y
+	help
+	  xml support
+
+config BR2_PACKAGE_PHP_EXT_SIMPLEXML
+	bool "simplexml"
+	depends on BR2_PACKAGE_PHP
+	select BR2_PACKAGE_PHP_EXIT_LIBXML2
+	help
+	  SimpleXML support
 
 config BR2_PACKAGE_PHP_EXT_ZLIB
         bool "zlib"
diff --git a/package/php/php.mk b/package/php/php.mk
index 195d4669e..9e824e5d9 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -3,7 +3,7 @@
 # php
 #
 #############################################################
-PHP_VER:=5.2.5
+PHP_VER:=5.2.6
 PHP_SOURCE:=php-$(PHP_VER).tar.bz2
 PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
 PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
@@ -58,6 +58,9 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
 		 --enable-xmlwriter
 	PHP_DEPS+=libxml2
 endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
+	PHP_CONFIGURE+=--enable-simplexml
+endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
 	PHP_CONFIGURE+=--with-zlib=$(STAGING_DIR)/usr
 	PHP_DEPS+=zlib
@@ -105,20 +108,20 @@ endif
 
 ### Database extensions
 ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
-	PHP_CONFIGURE+=--with-sql
+	PHP_CONFIGURE+=--with-sqlite
 ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
 	PHP_CONFIGURE+=--enable-sqlite-utf8
 endif
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
+	PHP_CONFIGURE+=--enable-pdo
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
 	PHP_CONFIGURE+=--with-pdo-sqlite
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
-	PHP_CONFIGURE+=--with-pdo-mysql
+	PHP_CONFIGURE+=--with-pdo-mysql=$(STAGING_DIR)/usr
+	PHP_DEPS+=mysql_client
 endif
-else
-	PHP_CONFIGURE+=--without-pdo-sqlite
 endif
 
 $(DL_DIR)/$(PHP_SOURCE):
-- 
cgit v1.2.3