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

diff --git a/config.m4 b/config.m4
index 999f61c..a185764 100644
--- a/config.m4
+++ b/config.m4
@@ -1,14 +1,70 @@
-PHP_ARG_ENABLE(psi, whether to enable psi support,
-[  --with-psi[[=path to libjit]]
-                          Enable PHP System Interface support])
+PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
+[  --enable-psi            Enable PHP System Interface support])
+PHP_ARG_WITH(psi-libjit, where to find libjit,
+[  --with-psi-libjit=DIR   PSI: path to libjit], [], no)
+PHP_ARG_WITH(psi-libffi, where to find libjit,
+[  --with-psi-libffi=DIR   PSI: path to libffi], [], no)
 
 if test "$PHP_PSI" != "no"; then
 	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
 	AC_PATH_PROG(LEMON, lemon, ./lemon)
 	PHP_SUBST(LEMON)
 
-	AC_CACHE_CHECK(for libjit install root, PSI_cv_LIBJIT_DIR, [
-	for PSI_cv_LIBJIT_DIR in {/usr{,/local},/opt}{,libjit}
+	if test -z "$PKG_CONFIG"
+	then
+		AC_PATH_PROG(PKG_CONFIG, pkg-config, false)
+	fi
+
+	export PKG_CONFIG_PATH="$PHP_PSI_LIBFFI/lib/pkgconfig:$PHP_PSI_LIBJIT/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+	AC_CACHE_CHECK(for libffi through pkg-config, PSI_cv_LIBFFI, [
+	if $PKG_CONFIG --exists libffi
+	then
+		PSI_cv_LIBFFI=true
+	else
+		PSI_cv_LIBFFI=false
+	fi])
+	if $PSI_cv_LIBFFI
+	then
+		AC_MSG_CHECKING(for libffi)
+		PSI_cv_LIBFFI_DIR=`$PKG_CONFIG --variable=prefix libffi`
+		AC_MSG_RESULT($PSI_cv_LIBFFI_DIR)
+		PHP_EVAL_INCLINE(`$PKG_CONFIG --cflags libffi`)
+		PHP_EVAL_LIBLINE(`$PKG_CONFIG --libs libffi`, PSI_SHARED_LIBADD)
+	else
+		AC_CACHE_CHECK(for libffi, PSI_cv_LIBFFI_DIR, [
+		for PSI_cv_LIBFFI_DIR in $PHP_PSI_LIBFFI {/usr{,/local},/opt}{,/libffi}
+		do
+			if test -e $PSI_cv_LIBFFI_DIR/include/ffi/ffi.h
+			then
+				break
+			fi
+			PSI_cv_LIBFFI_DIR=
+		done])
+		if test -n "$PSI_cv_LIBFFI_DIR"
+		then
+			PHP_ADD_INCLUDE($PSI_cv_LIBFFI_DIR/include/ffi)
+			PHP_ADD_LIBRARY_WITH_PATH(ffi, $PSI_cv_LIBFFI_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
+		else
+			AC_MSG_WARN([Could not find libffi, please provide the base install path])
+		fi
+	fi
+	PHP_CHECK_LIBRARY(ffi, ffi_closure_alloc, [
+		PHP_CHECK_LIBRARY(ffi, ffi_prep_closure_loc, [
+			AC_DEFINE(PSI_HAVE_FFI_PREP_CLOSURE_LOC, 1, [ ])
+		], [], -L$PSI_cv_LIBFFI_DIR/$PHP_LIBDIR)
+		AC_DEFINE(PSI_HAVE_FFI_CLOSURE_ALLOC, 1, [ ])
+	], [
+		PHP_CHECK_LIBRARY(ffi, ffi_prep_closure, [
+			AC_CHECK_HEADERS(sys/mman.h)
+			PHP_CHECK_FUNC(mmap)
+			AC_DEFINE(PSI_HAVE_FFI_PREP_CLOSURE, 1, [ ])
+		], [
+		], -L$PSI_cv_LIBFFI_DIR/$PHP_LIBDIR)
+	], -L$PSI_cv_LIBFFI_DIR/$PHP_LIBDIR)
+
+	AC_CACHE_CHECK(for libjit, PSI_cv_LIBJIT_DIR, [
+	for PSI_cv_LIBJIT_DIR in $PHP_PSI_LIBJIT {/usr{,/local},/opt}{,/libjit}
 	do
 		if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
 		then
@@ -16,10 +72,15 @@ if test "$PHP_PSI" != "no"; then
 		fi
 		PSI_cv_LIBJIT_DIR=
 	done])
-	if test -z "$PSI_cv_LIBJIT_DIR"
+	if test -n "$PSI_cv_LIBJIT_DIR"
 	then
-		AC_MSG_ERROR([Could not find libjit, please provide the base install path])
+		PHP_ADD_INCLUDE($PSI_cv_LIBJIT_DIR/include)
+		PHP_ADD_LIBRARY_WITH_PATH(jit, $PSI_cv_LIBJIT_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
+	else
+		AC_MSG_WARN([Could not find libjit, please provide the base install path])
 	fi
+	
+	PHP_SUBST(PSI_SHARED_LIBADD)
 
 	PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
 	PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
@@ -28,7 +89,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 src/libffi.c"
 
 	PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
 	PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)