X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=1a6fbeca7975ee41e43d355c973a9aaa85f44d83;hp=01a82a2b7f978eaf9b2b85966958f71f5d1f04e5;hb=b52dfcdc26059b167eca9baa1e92b3ba9611c3c7;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e

diff --git a/config.m4 b/config.m4
index 01a82a2..1a6fbec 100644
--- a/config.m4
+++ b/config.m4
@@ -11,40 +11,8 @@ m4_foreach(incfile, [
 	[ax/ax_check_sign.m4],
 	[ax/ax_pthread.m4],
 	[psi/psi.m4],
-	[psi/psi_type.m4],
 	[psi/psi_const.m4],
-	[psi/psi_decl.m4],
-	[psi/psi_macro.m4],
-	[psi/psi_composite.m4],
-	[posix/arpa_inet.m4],
-	[posix/errno.m4],
-	[posix/fcntl.m4],
-	[posix/glob.m4],
-	[posix/locale.m4],
-	[posix/stddef.m4],
-	[posix/stdio.m4],
-	[posix/stdint.m4],
-	[posix/stdlib.m4],
-	[posix/stdarg.m4],
-	[posix/sys_select.m4],
-	[posix/sys_socket.m4],
-	[posix/sys_stat.m4],
-	[posix/sys_time.m4],
-	[posix/sys_times.m4],
-	[posix/sys_types.m4],
-	[posix/sys_uio.m4],
-	[posix/sys_utsname.m4],
-	[posix/ndbm.m4],
-	[posix/netdb.m4],
-	[posix/netinet_in.m4],
-	[posix/netinet_tcp.m4],
-	[posix/poll.m4],
-	[posix/signal.m4],
-	[posix/syslog.m4],
-	[posix/time.m4],
-	[posix/unistd.m4],
-	[posix/wchar.m4],
-	[posix/wctype.m4]], [
+	[psi/psi_type.m4]], [
 	dnl pecl build
 	sinclude([m4/]incfile)
 	dnl php-src build
@@ -55,15 +23,11 @@ PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
 [  --enable-psi            Enable PSI (PHP System Interface) support])
 
 if test "$PHP_PSI" != no; then
-	PHP_ARG_ENABLE(psi-posix, whether to pre-define POSIX decls,
-	[  --enable-psi-posix=...  PSI: pre-define POSIX decls], [all], [no])
-	
+
 	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], [ ], [ ])
@@ -91,63 +55,16 @@ 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
-
-	dnl basics, one-by-one
 	PSI_CHECK_STD_TYPES
-	PSI_CHECK_STDINT
-	PSI_CHECK_SYS_TYPES
-	PSI_CHECK_STDDEF
-	
-	dnl parallel
-	AC_MSG_CHECKING([for POSIX modules])
-	if ! $PSI_FAST_CONFIG; then
-		AC_MSG_RESULT([$PHP_PSI_POSIX])
-	fi
-	
-	PSI_CONFIG_POSIX(signal, signal.h, [
-		PSI_CONFIG_POSIX(time, time.h, [
-			PSI_CONFIG_POSIX(sys/stat, sys/stat.h)
-			PSI_CONFIG_POSIX(wchar, wchar.h, [
-				PSI_CONFIG_POSIX(wctype, wctype.h)
-			])
-		])
-		PSI_CONFIG_POSIX(sys/select, sys/select.h)
-	])
-	PSI_CONFIG_POSIX(poll, poll.h)
-	PSI_CONFIG_POSIX(syslog, syslog.h)
-	PSI_CONFIG_POSIX(errno, errno.h)
-	PSI_CONFIG_POSIX(fcntl, fcntl.h)
-	PSI_CONFIG_POSIX(glob, glob.h)
-	PSI_CONFIG_POSIX(locale, locale.h xlocale.h)
-	PSI_CONFIG_POSIX(stdio, stdio.h)
-	PSI_CONFIG_POSIX(stdlib, stdlib.h)
-	PSI_CONFIG_POSIX(unistd, unistd.h)
-	PSI_CONFIG_POSIX(stdarg, stdarg.h)
-	PSI_CONFIG_POSIX(sys/socket, sys/socket.h, [
-		PSI_CONFIG_POSIX(netinet/in, netinet/in.h, [
-			PSI_CONFIG_POSIX(arpa/inet, arpa/inet.h)
-		])
-		PSI_CONFIG_POSIX(netdb, netdb.h)
-	])
-	PSI_CONFIG_POSIX(netinet/tcp, netinet/tcp.h)
-	PSI_CONFIG_POSIX(sys/time, sys/time.h)
-	PSI_CONFIG_POSIX(sys/times, sys/times.h)
-	PSI_CONFIG_POSIX(sys/uio, sys/uio.h)
-	PSI_CONFIG_POSIX(sys/utsname, sys/utsname.h)
-	PSI_CONFIG_POSIX(ndbm, dnl
-		ndbm.h dnl posix
-		relic.h dnl qdbm
-		gdbm-ndbm.h dnl gdbm
-	)
-	
 	PSI_CONFIG_DONE
 
 	PHP_SUBST(PSI_SHARED_LIBADD)
@@ -167,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 \
 	"