diff options
Diffstat (limited to 'sapi/roxen/config.m4')
| -rw-r--r-- | sapi/roxen/config.m4 | 93 |
1 files changed, 44 insertions, 49 deletions
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4 index 2ba1965cc..1e32d94b7 100644 --- a/sapi/roxen/config.m4 +++ b/sapi/roxen/config.m4 @@ -1,60 +1,55 @@ dnl -dnl $Id: config.m4,v 1.17.2.1 2005/11/29 18:26:02 tony2001 Exp $ +dnl $Id: config.m4,v 1.17.2.1.2.2 2007/07/11 23:20:37 jani Exp $ dnl -RESULT=no -AC_MSG_CHECKING(for Roxen/Pike support) -AC_ARG_WITH(roxen, +PHP_ARG_WITH(roxen,, [ --with-roxen=DIR Build PHP as a Pike module. DIR is the base Roxen - directory, normally /usr/local/roxen/server], -[ - if test ! -d $withval ; then - AC_MSG_ERROR(You did not specify a directory) - fi - if test -f $withval/bin/roxen; then - PIKE=$withval/bin/roxen - elif test -f $withval/bin/pike; then - PIKE=$withval/bin/pike - else - AC_MSG_ERROR(Couldn't find a pike in $withval/bin/) - fi - if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then - PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` - PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` - if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then - AC_MSG_ERROR(Failed to figure out Pike module and include directories) - fi - else - AC_MSG_ERROR(Roxen/PHP requires Pike 0.7.79 or newer) - fi - - PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) - AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen]) - PHP_SELECT_SAPI(roxen, shared, roxen.c) - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so" - RESULT="yes - Pike binary used: $PIKE - Pike include dir: $PIKE_INCLUDE_DIR - Pike module directory: $PIKE_MODULE_DIR" - PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR " -]) -AC_MSG_RESULT($RESULT) + directory, normally /usr/local/roxen/server], no, no) + +PHP_ARG_ENABLE(roxen-zts, whether Roxen module is build using ZTS, +[ --enable-roxen-zts ROXEN: Build the Roxen module using Zend Thread Safety], no, no) -if test "$RESULT" != "no" ; then - RESULT=no - AC_MSG_CHECKING(if Roxen should use ZTS) - AC_ARG_ENABLE(roxen-zts, - [ --enable-roxen-zts Build the Roxen module using Zend Thread Safety], - [ - PHP_BUILD_THREAD_SAFE - AC_DEFINE(ROXEN_USE_ZTS,1,[Whether to use Roxen in ZTS mode]) - RESULT=yes +RESULT= +AC_MSG_CHECKING([for Roxen/Pike support]) +if test "$PHP_ROXEN" != "no"; then + if test ! -d $PHP_ROXEN ; then + AC_MSG_ERROR([You did not specify a directory]) + fi + if test -f $PHP_ROXEN/bin/roxen; then + PIKE=$PHP_ROXEN/bin/roxen + elif test -f $PHP_ROXEN/bin/pike; then + PIKE=$PHP_ROXEN/bin/pike + else + AC_MSG_ERROR([Could not find a pike in $PHP_ROXEN/bin/]) + fi + + if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then + PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` + PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` + if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then + AC_MSG_ERROR([Failed to figure out Pike module and include directories]) + fi + else + AC_MSG_ERROR([Roxen/PHP requires Pike 0.7.79 or newer]) + fi + + PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) + AC_DEFINE(HAVE_ROXEN, 1, [Whether you use Roxen]) + PHP_SELECT_SAPI(roxen, shared, roxen.c) + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so" + RESULT="yes + Pike binary used: $PIKE + Pike include dir: $PIKE_INCLUDE_DIR + Pike module directory: $PIKE_MODULE_DIR" + PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR " - ]) - AC_MSG_RESULT($RESULT) + if test "$PHP_ROXEN_ZTS" != "no"; then + PHP_BUILD_THREAD_SAFE + AC_DEFINE(ROXEN_USE_ZTS, 1, [Whether to use Roxen in ZTS mode]) + fi fi +AC_MSG_RESULT([$RESULT]) dnl ## Local Variables: dnl ## tab-width: 4 dnl ## End: - |