X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=fe5603f81ec54fd9aa92bfabfa91ddf8b6257219;hp=999f61c851d0c48eddac05b0fcd681cec1c898a6;hb=762750b4a3f4e0471993849c4bd12965f6b62356;hpb=f1a387482a9270a34ae684109ad8be7c104148d6

diff --git a/config.m4 b/config.m4
index 999f61c..fe5603f 100644
--- a/config.m4
+++ b/config.m4
@@ -1,4 +1,4 @@
-PHP_ARG_ENABLE(psi, whether to enable psi support,
+PHP_ARG_WITH(psi, whether to enable psi support,
 [  --with-psi[[=path to libjit]]
                           Enable PHP System Interface support])
 
@@ -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
@@ -21,6 +21,10 @@ if test "$PHP_PSI" != "no"; then
 		AC_MSG_ERROR([Could not find libjit, please provide the base install path])
 	fi
 
+	PHP_ADD_INCLUDE($PSI_cv_LIBJIT_DIR/include)
+	PHP_ADD_LIBRARY_WITH_PATH(jit, $PSI_cv_LIBJIT_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
+	PHP_SUBST(PSI_SHARED_LIBADD)
+
 	PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
 	PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
 
@@ -28,7 +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="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)