libffi

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index fe5603f81ec54fd9aa92bfabfa91ddf8b6257219..8e6c1d121253445a11d50ad0d0fbdbea2392ffda 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -6,8 +6,30 @@ 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)
+       
+       if test -z "$PKG_CONFIG"
+       then
+               AC_PATH_PROG(PKG_CONFIG, pkg-config, false)
+       fi
+       
+       export PKG_CONFIG_PATH="/opt/libffi/lib/pkgconfig:$PKG_CONFIG_PATH"
+       
+       AC_CACHE_CHECK(for libffi, PSI_cv_LIBFFI, [
+       if $PKG_CONFIG --exists libffi
+       then
+               PSI_cv_LIBFFI=true
+       else
+               PSI_cv_LIBFFI=false
+       fi])
+       if $PSI_cv_LIBFFI
+       then
+               PHP_EVAL_INCLINE(`$PKG_CONFIG --cflags libffi`)
+               PHP_EVAL_LIBLINE(`$PKG_CONFIG --libs libffi`, PSI_SHARED_LIBADD)
+       else
+               AC_MSG_ERROR([Could not find libjit, please provide the base install path])
+       fi
 
-       AC_CACHE_CHECK(for libjit install root, PSI_cv_LIBJIT_DIR, [
+       AC_CACHE_CHECK(for libjit, PSI_cv_LIBJIT_DIR, [
        for PSI_cv_LIBJIT_DIR in $PHP_PSI {/usr{,/local},/opt}{,libjit}
        do
                if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
@@ -16,13 +38,14 @@ 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
+               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_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)
@@ -33,7 +56,7 @@ if test "$PHP_PSI" != "no"; then
 
        PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
        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_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)