X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=a8c95b0155cde19bf5d2ee0e905d7198e87cfbc5;hp=76c1066a4ff278283446beb05a9e7128dd2e87c9;hb=02e801eabbe26a129ea05e6723c94e10bb653dab;hpb=6d8fda8d1cd382e6d6626df5353d285176bd9bf2

diff --git a/config.m4 b/config.m4
index 76c1066..a8c95b0 100644
--- a/config.m4
+++ b/config.m4
@@ -25,6 +25,7 @@ m4_foreach(incfile, [
 	[posix/stdio.m4],
 	[posix/stdint.m4],
 	[posix/stdlib.m4],
+	[posix/stdarg.m4],
 	[posix/sys_select.m4],
 	[posix/sys_socket.m4],
 	[posix/sys_stat.m4],
@@ -86,7 +87,11 @@ if test "$PHP_PSI" != no; then
 		AC_MSG_RESULT([already defined])
 	])
 
-	PSI_LEMON
+	AC_MSG_CHECKING([psi source dir])
+	AC_MSG_RESULT([$PHP_PSI_SRCDIR])
+	AC_MSG_CHECKING([psi build dir])
+	AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
+	
 	PSI_CHECK_LIBJIT
 	PSI_CHECK_LIBFFI
 
@@ -106,42 +111,7 @@ if test "$PHP_PSI" != no; then
 	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(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)
@@ -158,7 +128,7 @@ if test "$PHP_PSI" != no; then
 
 	PHP_PSI_HEADERS=" \
 		src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
-		src/calc/cmp.h src/calc/oper.h \
+		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
@@ -169,9 +139,9 @@ if test "$PHP_PSI" != no; then
 		)` \
 	"
 	PHP_PSI_GENERATED=" \
-		src/parser_proc.y src/parser_proc.c src/parser.c \
+		src/parser_proc.c src/parser.c \
 		src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
-		src/calc/cmp.h src/calc/oper.h \
+		src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
 	"
 
 	PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)