Merge commit 'origin/confgen'

finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos

Conflicts:

	.gitignore
	Makefile
	mk/build.mk
	package/eglibc/Config.in
	package/glibc/Config.in
	package/uclibc++/Config.in
	package/uclibc/Config.in
	rules.mk

2 files changed, 28 insertions, 115 deletions

diff --git a/package/php/Config.in b/package/php/Config.in
deleted file mode 100644
index badb9f685..000000000
--- a/package/php/Config.in
+++ /dev/null
@@ -1,115 +0,0 @@
-menu "php............................... PHP Hypertext preprocessor"
-
-config ADK_COMPILE_PHP
-	prompt "php.............................. PHP Hypertext preprocessor"
-	bool
-	default n
-	 
-choice
-prompt "PHP Mode"
-default ADK_PACKAGE_PHP_FASTCGI
-depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_FASTCGI
-	prompt "PHP built for FastCGI"
-	bool 
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	 PHP is a widely-used general-purpose scripting language that is especially 
-	 suited for Web development and can be embedded into HTML.
-	 
-	 http://www.php.net/
-
-endchoice
-
-config ADK_PACKAGE_PHP_MOD_CURL
-	prompt "php-mod-curl..................... cURL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBCURL
-
-config ADK_PACKAGE_PHP_MOD_FTP
-	prompt "php-mod-ftp...................... FTP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_GD
-	prompt "php-mod-gd....................... GD graphics library module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBGD
-	select ADK_PACKAGE_LIBPNG
-
-config ADK_PACKAGE_PHP_MOD_GMP
-	prompt "php-mod-gmp...................... GMP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBGMP
-
-config ADK_PACKAGE_PHP_MOD_LDAP
-	prompt "php-mod-ldap..................... LDAP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBOPENLDAP
-
-config ADK_PACKAGE_PHP_MOD_MYSQL
-	prompt "php-mod-mysql.................... MySQL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-
-config ADK_PACKAGE_PHP_MOD_OPENSSL
-	prompt "php-mod-openssl.................. OpenSSL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_PHP_MOD_PCRE
-	prompt "php-mod-pcre..................... PCRE module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBPCRE
-
-config ADK_PACKAGE_PHP_MOD_PGSQL
-	prompt "php-mod-pgsql.................... PostgreSQL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_PHP_MOD_SESSION
-	prompt "php-mod-session.................. Sessions module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_SQLITE
-	prompt "php-mod-sqlite................... SQLite module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBSQLITE
-
-config ADK_PACKAGE_PHP_MOD_SOCKETS
-	prompt "php-mod-sockets.................. Sockets module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_XML
-	prompt "php-mod-xml...................... XML module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBEXPAT
-
-endmenu
diff --git a/package/php/Makefile b/package/php/Makefile
index 9a479fb5d..d5b00c054 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -6,6 +6,34 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		php
 PKG_VERSION:=		5.3.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl zlib
+ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
+PKG_BUILDDEP+=		curl
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
+PKG_BUILDDEP+=		libgd libpng
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),)
+PKG_BUILDDEP+=		gmp
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
+PKG_BUILDDEP+=		openldap
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),)
+PKG_BUILDDEP+=		mysql
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),)
+PKG_BUILDDEP+=		pcre
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),)
+PKG_BUILDDEP+=		sqlite
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
+PKG_BUILDDEP+=		expat
+endif
 PKG_MD5SUM:=		41fbb368d86acb13fc3519657d277681
 PKG_DESCR:=		PHP CLI
 PKG_SECTION:=		net