diff options
| author | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
| commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
| tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/php/Config.in | |
| parent | Kickoff 2012.08 cycle (diff) | |
| parent | nfs-utils: bump to version 1.2.6 (diff) | |
| download | buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.xz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip | |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/php/Config.in')
| -rw-r--r-- | package/php/Config.in | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/package/php/Config.in b/package/php/Config.in index 23d86e48e..c8c100cbd 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -9,6 +9,8 @@ config BR2_PACKAGE_PHP if BR2_PACKAGE_PHP +source "package/php/Config.ext" + config BR2_PACKAGE_PHP_CLI bool @@ -16,38 +18,30 @@ config BR2_PACKAGE_PHP_CGI bool choice - prompt "PHP interface" + prompt "Interface" default BR2_PACKAGE_PHP_SAPI_CGI help Select the PHP interface(s). +config BR2_PACKAGE_PHP_SAPI_CGI + bool "CGI" + select BR2_PACKAGE_PHP_CGI + help + Common Gateway Interface + config BR2_PACKAGE_PHP_SAPI_CLI - bool "cli interface" + bool "CLI" select BR2_PACKAGE_PHP_CLI help - Command line interface for PHP. - -config BR2_PACKAGE_PHP_SAPI_CGI - bool "cgi interface" - select BR2_PACKAGE_PHP_CGI - help - CGI interface for PHP. + Command Line Interface config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "cli and cgi interfaces" + bool "CGI and CLI" select BR2_PACKAGE_PHP_CLI select BR2_PACKAGE_PHP_CGI help - Command line and CGI interfaces for PHP. + Command line and Common gateway interfaces endchoice -config BR2_PACKAGE_PHP_FASTCGI - bool "fastcgi" - depends on BR2_PACKAGE_PHP_CGI - default y - help - fast cgi interface for php - -source "package/php/Config.ext" endif |