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

diff --git a/config.m4 b/config.m4
index 3ced949..01a82a2 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,11 +87,14 @@ 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
 
-	AC_PATH_PROG(NM, nm)
 	AC_FUNC_FNMATCH
 	AC_FUNC_MMAP
 
@@ -126,6 +130,7 @@ if test "$PHP_PSI" != no; then
 	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)
@@ -151,18 +156,29 @@ if test "$PHP_PSI" != no; then
 
 	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR)
 	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
+	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/calc)
 	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/types)
 	PHP_ADD_INCLUDE($PHP_PSI_BUILDDIR)
 	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
 	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src/types)
 
-	PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)`
+	PHP_PSI_HEADERS=" \
+		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 \
+		`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
+	"
 	# parser* should come first
 	PHP_PSI_SOURCES=" \
-		src/parser_proc.c src/parser.c
-		`(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c | $EGREP -v '^src/parser')` \
+		src/parser_proc.c src/parser.c \
+		`(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
+			| $EGREP -v '^src/parser' \
+		)` \
+	"
+	PHP_PSI_GENERATED=" \
+		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/unary.h src/calc/cmp.h src/calc/oper.h \
 	"
-	PHP_PSI_GENERATED="src/parser_proc.y src/parser_proc.c src/parser.c"
 
 	PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
 	PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)