X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=1a6fbeca7975ee41e43d355c973a9aaa85f44d83;hp=4bf96d40210c1457d46755b54bfe39ce272d4df3;hb=81a4197fb79ce651cb6f8cfe5adbef0422ef1bea;hpb=4174d499fe105c6d8bd76d265e28e07f0db08b55

diff --git a/config.m4 b/config.m4
index 4bf96d4..1a6fbec 100644
--- a/config.m4
+++ b/config.m4
@@ -27,9 +27,7 @@ if test "$PHP_PSI" != no; then
 	PHP_ARG_ENABLE(psi-maintainer-mode, whether to enable maintainer mode,
 	[  --enable-psi-maintainer-mode
                           PSI: enable maintainer mode
-                           . parallel configure
-                           . make dependencies
-                           . extra debug wrappers], [no], [no])
+                           . make dependencies], [no], [no])
 
 	PHP_ARG_WITH(psi-libjit, where to find libjit,
 	[  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
@@ -57,12 +55,13 @@ if test "$PHP_PSI" != no; then
 	AC_MSG_RESULT([$PHP_PSI_SRCDIR])
 	AC_MSG_CHECKING([psi build dir])
 	AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
-	
+
 	PSI_CHECK_LIBJIT
 	PSI_CHECK_LIBFFI
 
 	AC_FUNC_FNMATCH
 	AC_FUNC_MMAP
+	AC_CHECK_FUNCS([mknodat eaccess])
 
 	PSI_CONFIG_INIT
 	PSI_CHECK_STD_TYPES
@@ -85,15 +84,15 @@ if test "$PHP_PSI" != no; then
 		src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
 		`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
 	"
-	# parser* should come first
+	# parser_* should come first
 	PHP_PSI_SOURCES=" \
-		src/parser_proc.c src/parser.c \
+		src/parser_proc.c src/parser_scan.c \
 		`(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
-			| $EGREP -v '^src/parser' \
+			| $EGREP -v '^src/parser_' \
 		)` \
 	"
 	PHP_PSI_GENERATED=" \
-		src/parser_proc.c src/parser.c \
+		src/parser_proc.c src/parser_scan.c \
 		src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
 		src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
 	"