From: David Hedbor <neotron@php.net>
Date: Sun, 19 Nov 2000 09:10:16 +0000 (+0000)
Subject: Patch to find module dir
X-Git-Tag: php-4.0.4RC3~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49014ed560547698b7fb18f549b888c375359d42;p=php

Patch to find module dir
---

diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index e6ecefdc06..5c6fcb7fd4 100644
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -18,7 +18,7 @@ AC_ARG_WITH(caudium,
 		AC_MSG_ERROR(Couldn't find a pike in $withval/bin/)
 	fi
     if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0) exit(1); exit(0);'; then
-		PIKE_MODULE_DIR="`$PIKE --show-paths 2>&1| grep lib/modules | sed -e 's/.*: //'`"
+		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" -o -z "$PIKE_MODULE_DIR"; then
 			AC_MSG_ERROR(Failed to figure out Pike module and include directories)
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index cf4e5e7093..2347c005e2 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -17,7 +17,7 @@ AC_ARG_WITH(roxen,
 		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 lib/modules | sed -e 's/.*: //'`"
+		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" -o -z "$PIKE_MODULE_DIR"; then
 			AC_MSG_ERROR(Failed to figure out Pike module and include directories)