new test
[m6w6/ext-psi] / config.m4
index a185764ae3632e6324f7c4100e0580fd1ccdb45e..75ea3f73052a5f4b9f32695e04179762693530d2 100644 (file)
--- a/config.m4
+++ b/config.m4
+m4_foreach(incfile, [
+       [ax/ax_check_compile_flag.m4],
+       [ax/ax_check_sign.m4],
+       [ax/ax_pthread.m4],
+       [psi/psi.m4],
+       [psi/psi_type.m4]], [
+       dnl pecl build
+       sinclude([m4/]incfile)
+       dnl php-src build
+       sinclude([ext/psi/m4/]incfile)
+])
+
 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)
+[  --enable-psi            Enable PSI (PHP System Interface) support])
+
+if test "$PHP_PSI" != no; then
 
-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)
+       PHP_ARG_ENABLE(psi-maintainer-mode, whether to enable maintainer mode,
+       [  --enable-psi-maintainer-mode
+                          PSI: enable maintainer mode
+                           . make dependencies], [no], [no])
+    PHP_ARG_ENABLE(psi-threaded-parser, whether to enable threaded parser,
+    [  --enable-psi-threaded-parser
+                          PSI: enable threads for startup parsing], [yes], [no])
 
-       if test -z "$PKG_CONFIG"
-       then
-               AC_PATH_PROG(PKG_CONFIG, pkg-config, false)
-       fi
+       PHP_ARG_WITH(psi-libjit, where to find libjit,
+       [  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
 
-       export PKG_CONFIG_PATH="$PHP_PSI_LIBFFI/lib/pkgconfig:$PHP_PSI_LIBJIT/lib/pkgconfig:$PKG_CONFIG_PATH"
+       PHP_ARG_WITH(psi-libffi, where to find libffi,
+       [  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
 
-       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_HEADER_ASSERT dnl # adds --disable-assert to define NDEBUG
 
-       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
-                       break
-               fi
-               PSI_cv_LIBJIT_DIR=
-       done])
-       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_WARN([Could not find libjit, please provide the base install path])
-       fi
+       PSI_CONFIG_INIT
        
-       PHP_SUBST(PSI_SHARED_LIBADD)
+       PSI_CHECK_MAINTAINER_MODE
+       PSI_CHECK_THREADED_PARSER
+
+       dnl we cannot use AC_USE_SYSTEM_EXTENSIONS here, because we're way too late
+       dnl in the game, and we're currently only targeting _GNU_SOURCE for now
+       PSI_CHECK_GNU_SOURCE
+       PSI_CHECK_CPP
+       PSI_CHECK_STD_TYPES
+       
+       AC_HEADER_DIRENT
+       AC_FUNC_FNMATCH
+       AC_FUNC_MMAP
+       AC_CHECK_FUNCS([mknodat eaccess])
 
-       PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
-       PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
+       PSI_CHECK_PTHREAD
+       PSI_CHECK_LIBJIT
+       PSI_CHECK_LIBFFI
 
-       PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
-       PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
+       PSI_CONFIG_DONE
 
-       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 src/libffi.c"
+       AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
 
+       PHP_SUBST(PSI_SHARED_LIBADD)
        PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
        PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)
 
-       PHP_SUBST(PHP_PSI_HEADERS)
-       PHP_SUBST(PHP_PSI_SOURCES)
-
-       PHP_SUBST(PHP_PSI_SRCDIR)
-       PHP_SUBST(PHP_PSI_BUILDDIR)
-
        PHP_ADD_MAKEFILE_FRAGMENT
+       AC_MSG_RESULT()
 fi