cvs: /php4/sapi/roxen config.m4

neotron Wed Nov 24 02:17:50 1999 EDT Modified files: /php4/sapi/roxen config.m4 Log: Now actually correctly checks for Pike paths etc. Index: php4/sapi/roxen/config.m4 diff -u php4/sapi/roxen/config.m4:1.1 php4/sapi/roxen/config.m4:1.2 --- php4/sapi/roxen/config.m4:1.1 Tue Nov 23 18:08:10 1999 +++ php4/sapi/roxen/config.m4 Wed Nov 24 02:17:17 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.1 1999/11/23 23:08:10 neotron Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.2 1999/11/24 07:17:17 neotron Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for Roxen/Pike support) @@ -8,15 +8,31 @@ if test ! -d $withval ; then AC_MSG_ERROR(You did not specify a directory) fi -/* enable_thread_safety=yes*/ -/* passthru="$passthru --enable-thread-safety"*/ - ROXEN_DIR=$withval - AC_ADD_INCLUDE($ROXEN_DIR/pike/0.7.79/include/pike/) + 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 = __VERSION__ + (__BUILD__/10000.0); if(v < 0.7079) exit(1); exit(0);'; then + PIKE_MODULE_DIR="$PIKE --show-paths 2>&1| grep lib/modules | 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" -o -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 + AC_ADD_INCLUDE($PIKE_INCLUDE_DIR) AC_DEFINE(HAVE_ROXEN) PHP_SAPI=roxen PHP_BUILD_SHARED - INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $ROXEN_DIR/pike/0.7.79/lib/modules/PHP4.so" - RESULT=yes + INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP4.so" + RESULT="yes + Pike binary user: $PIKE + Pike include dir: $PIKE_INCLUDE_DIR + Pike module directory: $PIKE_MODULE_DIR" ]) AC_MSG_RESULT($RESULT)