From df5308e502561688ef5763436882d57c276083b5 Mon Sep 17 00:00:00 2001
From: David Hedbor <neotron@php.net>
Date: Wed, 24 Nov 1999 07:17:17 +0000
Subject: [PATCH] Now actually correctly checks for Pike paths etc.

---
 sapi/roxen/config.m4 | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index e49fd6a32c..555d699cc2 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -8,15 +8,31 @@ AC_ARG_WITH(roxen,
 	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)
 
-- 
2.40.0