flush

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index 5be9e351fe2ae89aca8d744eb2ba76a6c7934180..fe5603f81ec54fd9aa92bfabfa91ddf8b6257219 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -8,7 +8,7 @@ if test "$PHP_PSI" != "no"; then
        PHP_SUBST(LEMON)
 
        AC_CACHE_CHECK(for libjit install root, PSI_cv_LIBJIT_DIR, [
-       for PSI_cv_LIBJIT_DIR in {/usr{,/local},/opt}{,libjit}
+       for PSI_cv_LIBJIT_DIR in $PHP_PSI {/usr{,/local},/opt}{,libjit}
        do
                if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
                then
@@ -32,8 +32,8 @@ if test "$PHP_PSI" != "no"; then
        PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
 
        PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
-       PHP_PSI_SOURCES=`(cd $PHP_PSI_SRCDIR && echo src/*.c)`
-       PHP_PSI_SOURCES=`(echo $PHP_PSI_SOURCES src/parser.c src/parser_proc.c | xargs -n1 | sort | uniq)`
+       PHP_PSI_SOURCES="src/parser_proc.c src/parser.c src/validator.c src/module.c src/context.c"
+       PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/libjit.c"
 
        PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
        PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)