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/pi3web | |
| 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/pi3web')
| -rw-r--r-- | sapi/pi3web/config.m4 | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4 index 83c212af46..7859481508 100644 --- a/sapi/pi3web/config.m4 +++ b/sapi/pi3web/config.m4 @@ -2,35 +2,25 @@ dnl dnl $Id$ dnl -RESULT=no -AC_MSG_CHECKING(for Pi3Web support) -AC_ARG_WITH(pi3web, -[ --with-pi3web[=DIR] Build PHP as Pi3Web module],[ - PHP_PI3WEB=$withval -], [ - PHP_PI3WEB=no -]) +PHP_ARG_WITH(pi3web, for Pi3Web support, +[ --with-pi3web[=DIR] Build PHP as Pi3Web module], no, no) if test "$PHP_PI3WEB" != "no"; then - if test "$PHP_PI3WEB" = "yes"; then - PI3PATH=../.. # the default - else - PI3PATH=$PHP_PI3WEB - fi - test -f "$PI3PATH/PiAPI/PiAPI.h" || AC_MSG_ERROR(Unable to find PiAPI.h in $PI3PATH/PiAPI) - PHP_BUILD_THREAD_SAFE - AC_DEFINE(WITH_PI3WEB,1,[whether you want Pi3Web support]) - PHP_ADD_INCLUDE($PI3PATH/PiAPI) - PHP_ADD_INCLUDE($PI3PATH/Pi2API) - PHP_ADD_INCLUDE($PI3PATH/Pi3API) - PHP_ADD_INCLUDE($PI3PATH/PHP5) - PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c) - INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/" - RESULT=yes -else - RESULT=no + if test "$PHP_PI3WEB" = "yes"; then + PI3PATH=../.. # the default + else + PI3PATH=$PHP_PI3WEB + fi + test -f "$PI3PATH/PiAPI/PiAPI.h" || AC_MSG_ERROR([Unable to find PiAPI.h in $PI3PATH/PiAPI]) + PHP_BUILD_THREAD_SAFE + AC_DEFINE(WITH_PI3WEB, 1, [whether you want Pi3Web support]) + PHP_ADD_INCLUDE($PI3PATH/PiAPI) + PHP_ADD_INCLUDE($PI3PATH/Pi2API) + PHP_ADD_INCLUDE($PI3PATH/Pi3API) + PHP_ADD_INCLUDE($PI3PATH/PHP5) + PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c) + INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/" fi -AC_MSG_RESULT($RESULT) dnl ## Local Variables: dnl ## tab-width: 4 |