diff options
| -rw-r--r-- | sapi/nsapi/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/pi3web/config.m4 | 20 |
2 files changed, 9 insertions, 13 deletions
diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4 index 140f0767ee..bf3c3007d1 100644 --- a/sapi/nsapi/config.m4 +++ b/sapi/nsapi/config.m4 @@ -2,7 +2,7 @@ dnl ## $Id$ -*- sh -*- AC_MSG_CHECKING(for NSAPI support) AC_ARG_WITH(nsapi, -[ --with-nsapi=DIR Specify path to the installed Netscape],[ +[ --with-nsapi=DIR Specify path to the installed Netscape],[ PHP_NSAPI=$withval ],[ PHP_NSAPI=no diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4 index 7aaf71513a..8203fbaa44 100644 --- a/sapi/pi3web/config.m4 +++ b/sapi/pi3web/config.m4 @@ -1,17 +1,15 @@ -RESULT=no -AC_MSG_CHECKING(for Pi3Web Support) -AC_ARG_WITH(pi3web, -[ --with-pi3web=DIR Build PHP as an module for use with Pi3Web.], -[ - if test "$withval" = "yes"; then +PHP_ARG_WITH(pi3web,for Pi3Web Support, +[ --with-pi3web=DIR Build PHP as a module for use with Pi3Web.]) + +if test "$PHP_PI3WEB" != "no"; then + if test "$PHP_PI3WEB" = "yes"; then PI3PATH=../.. # the default else - PI3PATH=$withval + PI3PATH=$PHP_PI3WEB fi - pwd 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,[ ]) + AC_DEFINE(WITH_PI3WEB,1,[whether you want Pi3Web support]) AC_ADD_INCLUDE($PI3PATH/PiAPI) AC_ADD_INCLUDE($PI3PATH/Pi2API) AC_ADD_INCLUDE($PI3PATH/Pi3API) @@ -19,9 +17,7 @@ AC_ARG_WITH(pi3web, PHP_SAPI=pi3web PHP_BUILD_SHARED INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PI3PATH/bin/" - RESULT=yes -]) -AC_MSG_RESULT($RESULT) +fi dnl ## Local Variables: dnl ## tab-width: 4 |