X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=f9cf24d14bceb6527a05c2e3eb2106dec2bb6360;hp=b54c98ee9373af09a620a01aaa8fd6c2d763783c;hb=5359ad5c181e5772f350fe1cba060cbed3a05b91;hpb=06a0a00420a9efb8775ee7a21c66e007c0511b64

diff --git a/config.m4 b/config.m4
index b54c98e..f9cf24d 100644
--- a/config.m4
+++ b/config.m4
@@ -62,6 +62,7 @@ if test "$PHP_PSI" != no; then
 	PSI_CHECK_LIBJIT
 	PSI_CHECK_LIBFFI
 
+	AC_PATH_PROG(NM, nm)
 	AC_FUNC_FNMATCH
 	
 	PSI_CONFIG_INIT
@@ -112,12 +113,13 @@ if test "$PHP_PSI" != no; then
 	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
 	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
 
-	PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
-	PHP_PSI_SOURCES= # parser* should come first
-	PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/parser_proc.c src/parser.c"
-	PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/libjit.c src/libffi.c src/engine.c"
-	PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/marshal.c src/calc.c src/module.c"
-	PHP_PSI_SOURCES="$PHP_PSI_SOURCES `(cd $PHP_PSI_SRCDIR && echo src/context*.c)`"
+	PHP_PSI_HEADERS=`(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 | $EGREP -v '^src/parser')` \
+	"
 
 	PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
 	PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)