diff options
| author | Jani Taskinen <jani@php.net> | 2007-07-11 23:20:37 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-07-11 23:20:37 +0000 |
| commit | eb923bf6fc9cf71aaf45641784aeb3d23254bf45 (patch) | |
| tree | 8348f41d3874c54c18f8d5baf2007c76bcca45a1 /sapi/cli | |
| parent | 4ef905ae59202730d1d8a37d4babec76f98b6664 (diff) | |
| download | php-git-eb923bf6fc9cf71aaf45641784aeb3d23254bf45.tar.gz | |
MFH: - Changed AC_ARG_* options to PHP_ARG_* options.
MFH: - Some cleanups here and there
MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
MFH: options)
# Note to Marcus: ext/dba/config.m4 needs to be "converted" to use
# the PHP_ARG_* options. I did't touch it needs quite a lot of work to keep
# it's current behaviour regarding "enabled-by-default" parts of it.
#
# Hint: By using the PHP_ARG_* options you have the "default" option.. ;)
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/config.m4 | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index c31ddd1209..6017443044 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -2,18 +2,12 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for CLI build) - -AC_ARG_ENABLE(cli, +PHP_ARG_ENABLE(cli,, [ --disable-cli Disable building CLI version of PHP - (this forces --without-pear)], -[ - PHP_SAPI_CLI=$enableval -],[ - PHP_SAPI_CLI=yes -]) + (this forces --without-pear)], yes, no) -if test "$PHP_SAPI_CLI" != "no"; then +AC_MSG_CHECKING(for CLI build) +if test "$PHP_CLI" != "no"; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag,$abs_srcdir/sapi/cli,sapi/cli) SAPI_CLI_PATH=sapi/cli/php PHP_SUBST(SAPI_CLI_PATH) @@ -38,5 +32,4 @@ if test "$PHP_SAPI_CLI" != "no"; then PHP_SUBST(INSTALL_CLI) PHP_OUTPUT(sapi/cli/php.1) fi - -AC_MSG_RESULT($PHP_SAPI_CLI) +AC_MSG_RESULT($PHP_CLI) |