X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi.m4;h=0c2b16537cc58125c4c6b03092b243f3a2ce05e8;hp=b0e30f49eff63bbf66c687e0f4dfb8539c2736fd;hb=5ba86e0c3e64a38bd58c6ea2495b3f46cb7654f7;hpb=894e0ce93f9ce82109e904ae35c249bf6abe54f1

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index b0e30f4..0c2b165 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -15,6 +15,7 @@ AC_DEFUN(PSI_CONFIG_INIT, [
 		PHP_SUBST(PSI_DEPS)
 		
 		PSI_CONFIG_TMP=$(mktemp -d)
+		PSI_FUNC_LIBC_MAIN
 	else
 		PSI_FAST_CONFIG=false
 		PSI_DEPS=false
@@ -78,7 +79,7 @@ AC_DEFUN(PSI_CONFIG_POSIX_ENABLED, [
 		AS_TR_SH([psi_config_posix_]$1)=true
 		;;
 	*)
-		if expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null; then
+		if expr "$PHP_PSI_POSIX" : '.*\b$1\b' >/dev/null; then
 			AS_TR_SH([psi_config_posix_]$1)=true
 		fi
 		;;
@@ -100,14 +101,15 @@ AC_DEFUN(PSI_SH_TEST_POSIX_ENABLED, [
 	fi
 ])
 
-dnl PSI_CONFIG_POSIX(section, headers)
+dnl PSI_CONFIG_POSIX(section, headers, dependents)
 AC_DEFUN(PSI_CONFIG_POSIX, [
 	PSI_CONFIG_POSIX_ENABLED($1, [
 		if $PSI_FAST_CONFIG; then
-			PSI_CONFIG_POSIX_PARALLEL($1, $2)
+			PSI_CONFIG_POSIX_PARALLEL($1, $2, [$3])
 		else
 			ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
 			AS_TR_CPP([PSI_CHECK_$1])
+			$3
 		fi 
 	])
 ])
@@ -116,6 +118,7 @@ AC_DEFUN([PSI_CONFIG_POSIX_PARALLEL], [
 	(
 		dnl setup
 		mkdir $PSI_CONFIG_TMP/AS_TR_SH([$1])
+		printenv > $PSI_CONFIG_TMP/AS_TR_SH([$1])/start.env
 		ln -s $(pwd)/confdefs.h $PSI_CONFIG_TMP/AS_TR_SH([$1])/confdefs.h
 		
 		dnl restore stdio
@@ -139,6 +142,7 @@ AC_DEFUN([PSI_CONFIG_POSIX_PARALLEL], [
 		AS_TR_CPP([PSI_CHECK_$1])
 		
 		dnl save env
+		printenv > $PSI_CONFIG_TMP/AS_TR_SH([$1])/end.env
 		cat >$PSI_CONFIG_TMP/AS_TR_SH([$1])/conf.env <<EOF
 LIBS="$LIBS \$LIBS"
 EOF
@@ -152,8 +156,13 @@ EOF
 			fi
 		done
 		
+		_AC_CACHE_DUMP >>$PSI_CONFIG_TMP/AS_TR_SH([$1])/conf.env
+		
 		dnl done
 		printf "%s " "$1" >&66
+		
+		$3
+		wait
 	) &
 ])
 
@@ -275,7 +284,7 @@ AC_DEFUN(PSI_LEMON, [
 	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
 	if test -z "$LEMON"
 	then
-		AC_PATH_PROG(LEMON, lemon, ./lemon)
+		AC_PATH_PROG(LEMON, lemon, $PHP_PSI_BUILDDIR/lemon)
 	fi
 	PHP_SUBST(LEMON)
 ])