api refactoring

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index 447ffe6f4b4e72b3c4c1c7be55803e66a89ec3f9..f9cf24d14bceb6527a05c2e3eb2106dec2bb6360 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -47,7 +47,7 @@ PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
 [  --enable-psi            Enable PHP System Interface support])
 
 PHP_ARG_ENABLE(psi-posix, whether to pre-define POSIX decls,
-[  --ebable-psi-posix      PSI: pre-define POSIX decls], [ ], [ ])
+[  --enable-psi-posix=...  PSI: pre-define POSIX decls], [ ], [ ])
 
 PHP_ARG_WITH(psi-libjit, where to find libjit,
 [  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
@@ -58,15 +58,13 @@ PHP_ARG_WITH(psi-libffi, where to find libffi,
 if test "$PHP_PSI" != no; then
        PHP_CONFIGURE_PART(Configuring PSI)
        
-       ifdef([AC_USE_SYSTEM_EXTENSIONS],AC_USE_SYSTEM_EXTENSIONS)
-
        PSI_LEMON
        PSI_CHECK_LIBJIT
        PSI_CHECK_LIBFFI
 
+       AC_PATH_PROG(NM, nm)
        AC_FUNC_FNMATCH
-       AC_HEADER_DIRENT
-
+       
        PSI_CONFIG_INIT
        PSI_CHECK_STD_TYPES
        PSI_CHECK_STDINT
@@ -115,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)