[php5] cleanup configure options

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 34 insertions, 115 deletions

diff --git a/rules/php5.in b/rules/php5.in
index 5c2634317..8f77492f0 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -26,7 +26,8 @@ config PHP5_INI
 # SAPI Modules
 # ----------------------------------------------------------------------------
 
-menu "SAPI Modules                "
+choice
+	prompt "SAPI Module"
 
 config PHP5_SAPI_AOLSERVER
 	bool
@@ -35,16 +36,9 @@ config PHP5_SAPI_AOLSERVER
 	help
 	  Use AOLserver.
 
-config PHP5_SAPI_MOD_CHARSET
-	bool
-	prompt "mod_charset"
-	help
-	  Enable transfer tables for mod_charset (Rus Apache)
-
 config PHP5_SAPI_APXS2FILTER
 	bool
 	prompt "apxs2filter"
-	depends on !PHP5_SAPI_APXS2
 	help
 	  EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional
 	  pathname to the Apache apxs tool [apxs]
@@ -62,12 +56,6 @@ config PHP5_SAPI_CAUDIUM
 	help
 	  Build PHP as a Pike module for use with Caudium.
 
-config PHP5_SAPI_CLI
-	bool
-	prompt "cli"
-	help
-	  Build CLI (commandline interface) version of PHP
-
 config PHP5_SAPI_CONTINUITY
 	bool
 	prompt "continuity"
@@ -154,75 +142,21 @@ config PHP5_SAPI_WEBJAMES
 config PHP5_SAPI_CGI
 	bool
 	prompt "cgi"
-	depends on !PHP5_SAPI_APXS2
 	help
 	  Build CGI version of PHP.
 
-config PHP5_SAPI_FORCE_CGI_REDIRECT
-	bool
-	depends on PHP5_SAPI_CGI
-	prompt "force-cgi-redirect"
-	help
-	  Enable the security check for internal server
-	  redirects. You should use this if you are
-	  running the CGI version with Apache.
-
-config PHP5_SAPI_DISCARD_PATH
+config PHP5_SAPI_NONE
 	bool
-	depends on PHP5_SAPI_CGI
-	prompt "discard path"
-	help
-	  If this is enabled, the PHP CGI binary
-	  can safely be placed outside of the
-	  web tree and people will not be able
-	  to circumvent .htaccess security
+	prompt "none"
+	select PHP5_SAPI_CLI
 
-config PHP5_SAPI_FASTCGI
-	bool
-	depends on PHP5_SAPI_CGI
-	depends on !PHP5_SAPI_DISCARD_PATH
-	prompt "fastcgi"
-	help
-	  If this is enabled, the cgi module will
-	  be built with support for fastcgi also
+endchoice
 
-config PHP5_SAPI_PATH_INFO_CHECK
+config PHP5_SAPI_CLI
 	bool
-	depends on PHP5_SAPI_CGI
-	prompt "path info check"
+	prompt "cli"
 	help
-	  If this is disabled, paths such as
-	  /info.php/test?a=b will fail to work
-
-config PHP5_SAPI_FALLBACK
-	bool
-	default y
-	depends on \
-		!PHP5_SAPI_AOLSERVER && \
-		!PHP5_SAPI_MOD_CHARSET && \
-		!PHP5_SAPI_APXS2FILTER && \
-		!PHP5_SAPI_APXS2 && \
-		!PHP5_SAPI_CAUDIUM && \
-		!PHP5_SAPI_CONTINUITY && \
-		!PHP5_SAPI_EMBEDDED && \
-		!PHP5_SAPI_ISAPI && \
-		!PHP5_SAPI_MILTER && \
-		!PHP5_SAPI_NSAPI && \
-		!PHP5_SAPI_PHTTPD && \
-		!PHP5_SAPI_PI3WEB && \
-		!PHP5_SAPI_ROXEN && \
-		!PHP5_SAPI_ROXEN_ZTS && \
-		!PHP5_SAPI_THTTPD && \
-		!PHP5_SAPI_TUX && \
-		!PHP5_SAPI_WEBJAMES && \
-		!PHP5_SAPI_CGI && \
-		!PHP5_SAPI_FORCE_CGI_REDIRECT && \
-		!PHP5_SAPI_DISCARD_PATH && \
-		!PHP5_SAPI_FASTCGI && \
-		!PHP5_SAPI_PATH_INFO_CHECK
-	select PHP5_SAPI_CLI
-
-endmenu
+	  Build CLI (commandline interface) version of PHP
 
 # ----------------------------------------------------------------------------
 # General Settings
@@ -521,16 +455,23 @@ config PHP5_EXT_MYSQL
 config PHP5_EXT_SOAP
 	bool
 	prompt "soap"
+	select PHP5_XML
 	help
 	  Enable SOAP support for PHP.
 
 #  --enable-sockets        Enable sockets support
 
 config PHP5_EXT_SOCKETS
-  bool
-  prompt "sockets"
-  help
-    Enable sockets support for PHP.
+	bool
+	prompt "sockets"
+	help
+	  Enable sockets support for PHP.
+
+config PHP5_EXT_SQLITE3
+	bool
+	prompt "sqlite3"
+	help
+	  Enable sqlite3 support for PHP.
 
 #  --disable-spl           Disable Standard PHP Library
 #  --without-sqlite        Do not include sqlite support.
diff --git a/rules/php5.make b/rules/php5.make
index 750054da9..72aa65b21 100644
--- a/rules/php5.make
+++ b/rules/php5.make
@@ -39,9 +39,8 @@ $(PHP5_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-PHP5_PATH	:= PATH=$(CROSS_PATH)
-PHP5_ENV 	:= $(CROSS_ENV)
-PHP5_BINCONFIG_GLOB := ""
+PHP5_CONF_ENV		:= $(CROSS_ENV)
+PHP5_BINCONFIG_GLOB	:= ""
 
 #
 # autoconf
@@ -76,12 +75,6 @@ else
 PHP5_AUTOCONF += --without-aolserver
 endif
 
-ifdef PTXCONF_PHP5_SAPI_MOD_CHARSET
-PHP5_AUTOCONF += --with-mod_charset
-else
-PHP5_AUTOCONF += --without-mod_charset
-endif
-
 ifdef PTXCONF_PHP5_SAPI_APXS2FILTER
 PHP5_AUTOCONF += --with-apxs2filter
 else
@@ -113,9 +106,9 @@ else
 endif
 
 ifdef PTXCONF_PHP5_SAPI_EMBEDDED
-PHP5_AUTOCONF += --enable-embedded
+PHP5_AUTOCONF += --enable-embed
 else
-#PHP5_AUTOCONF += --disable-embedded
+#PHP5_AUTOCONF += --disable-embed
 endif
 
 ifdef PTXCONF_PHP5_SAPI_ISAPI
@@ -178,30 +171,6 @@ else
 PHP5_AUTOCONF += --disable-cgi
 endif
 
-ifdef PTXCONF_PHP5_SAPI_FORCE_CGI_REDIRECT
-PHP5_AUTOCONF += --enable-force-cgi-redirect
-else
-PHP5_AUTOCONF += --disable-force-cgi-redirect
-endif
-
-ifdef PTXCONF_PHP5_SAPI_DISCARD_PATH
-PHP5_AUTOCONF += --enable-discard-path
-else
-PHP5_AUTOCONF += --disable-discard-path
-endif
-
-ifdef PTXCONF_PHP5_SAPI_FASTCGI
-PHP5_AUTOCONF += --enable-fastcgi
-else
-#PHP5_AUTOCONF += --disable-fastcgi
-endif
-
-ifdef PTXCONF_PHP5_SAPI_PATH_INFO_CHECK
-PHP5_AUTOCONF += --enable-path-info-check
-else
-PHP5_AUTOCONF += --disable-path-info-check
-endif
-
 # ---------------
 # General Options
 # ---------------
@@ -215,7 +184,7 @@ endif
 ifdef PTXCONF_PHP5_XML_LIBXML2
 PHP5_AUTOCONF += \
 	--enable-libxml \
-	--with-libxml-dir=$(SYSROOT)/usr
+	--with-libxml-dir=$(PTXCONF_SYSROOT)/usr
 else
 PHP5_AUTOCONF += --disable-libxml
 endif
@@ -270,6 +239,15 @@ else
 PHP5_AUTOCONF += --disable-sockets
 endif
 
+ifdef PTXCONF_PHP5_EXT_SQLITE3
+PHP5_AUTOCONF += --with-sqlite3
+# broken config system: sqlite3 (local copy) uses it
+# but it is only linked to if used by external dependencies
+PHP5_CONF_ENV += PHP_LDFLAGS=-ldl
+else
+PHP5_AUTOCONF += --without-sqlite3
+endif
+
 ifdef PTXCONF_PHP5_EXT_PEAR
 PHP5_AUTOCONF += --with-pear=FIXME
 else