flush

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index 991550584e99eef07506cf760d61c1c102323964..e7d1e1f69aa60bd08c6f30335a9a91a18eda7fab 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,35 +1,83 @@
-PHP_ARG_ENABLE(psi, whether to enable psi support,
-[  --with-psi[[=path to libjit]]
-                          Enable PHP System Interface support])
-
-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}
-       do
-               if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
-               then
-                       break
-               fi
-               PSI_cv_LIBJIT_DIR=
-       done])
-       if test -z "$PSI_cv_LIBJIT_DIR"
-       then
-               AC_MSG_ERROR([Could not find libjit, please provide the base install path])
-       fi
+PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
+[  --enable-psi            Enable PHP System Interface support])
+
+if test "$PHP_PSI" != no; then
+       PHP_CONFIGURE_PART(Configuring PSI)
 
        PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
        PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
 
+       m4_foreach(incfile, [
+               [ax_check_sign.m4],
+               [psi.m4],
+               [psi_type.m4],
+               [psi_const.m4],
+               [psi_decl.m4],
+               [psi_macro.m4],
+               [psi_struct.m4],
+               [errno.m4],
+               [glob.m4],
+               [stddef.m4],
+               [stdio.m4],
+               [stdint.m4],
+               [stdlib.m4],
+               [sys_select.m4],
+               [sys_socket.m4],
+               [sys_stat.m4],
+               [sys_time.m4],
+               [sys_times.m4],
+               [sys_types.m4],
+               [sys_uio.m4],
+               [sys_utsname.m4],
+               [time.m4],
+               [wchar.m4]], [
+               dnl pecl build
+               sinclude([m4/]incfile)
+               dnl php-src build
+               sinclude([ext/psi/m4/]incfile)
+       ])
+       PSI_LEMON
+       PSI_CHECK_LIBJIT
+       PSI_CHECK_LIBFFI
+
+       AC_FUNC_FNMATCH
+       AC_HEADER_DIRENT
+
+       PSI_CHECK_STD_TYPES
+       PSI_CHECK_STDINT
+       PSI_CHECK_STDDEF
+       PSI_CHECK_SYS_TYPES
+       PSI_CHECK_ERRNO
+       PSI_CHECK_GLOB
+       PSI_CHECK_STDIO
+       PSI_CHECK_STDLIB
+       PSI_CHECK_TIME
+       PSI_CHECK_SYS_SELECT
+       PSI_CHECK_SYS_SOCKET
+       PSI_CHECK_SYS_TIME
+       PSI_CHECK_SYS_TIMES
+       PSI_CHECK_SYS_STAT
+       PSI_CHECK_SYS_UIO
+       PSI_CHECK_SYS_UTSNAME
+       PSI_CHECK_WCHAR
+
+       PHP_SUBST(PSI_SHARED_LIBADD)
+
+       AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
+
+       AC_DEFINE_UNQUOTED([PSI_TYPES], [$PSI_TYPES], [Predefined types])
+       AC_DEFINE_UNQUOTED([PSI_STRUCTS], [$PSI_STRUCTS], [Predefined structs])
+       AC_DEFINE_UNQUOTED([PSI_CONSTS], [$PSI_CONSTS], [Predefined constants])
+       AC_DEFINE_UNQUOTED([PSI_MACROS], [$PSI_MACROS], [Redirected Macros])
+       AC_DEFINE_UNQUOTED([PSI_REDIRS], [$PSI_REDIRS], [Redirected functions])
+       AC_DEFINE_UNQUOTED([PSI_DECLS], [$PSI_DECLS], [Predefined functions])
+
        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=`(cd $PHP_PSI_SRCDIR && echo src/*.c)`
-       PHP_PSI_SOURCES="src/parser.c src/parser_proc.c"
+       PHP_PSI_SOURCES="src/parser_proc.c src/parser.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)
@@ -41,4 +89,6 @@ if test "$PHP_PSI" != "no"; then
        PHP_SUBST(PHP_PSI_BUILDDIR)
 
        PHP_ADD_MAKEFILE_FRAGMENT
+
+       AC_MSG_RESULT()
 fi