CPP builtins

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index d621ffc5766e10a6a9163ec1978f5067aa074cfd..75ea3f73052a5f4b9f32695e04179762693530d2 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,17 +1,8 @@
-PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
-
-case "PHP_EXT_BUILDDIR(psi)" in
-""|.) PHP_PSI_BUILDDIR=$PHP_PSI_SRCDIR
-       ;;
-*)    PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
-       ;;
-esac
-
 m4_foreach(incfile, [
+       [ax/ax_check_compile_flag.m4],
        [ax/ax_check_sign.m4],
        [ax/ax_pthread.m4],
        [psi/psi.m4],
-       [psi/psi_const.m4],
        [psi/psi_type.m4]], [
        dnl pecl build
        sinclude([m4/]incfile)
@@ -28,6 +19,9 @@ if test "$PHP_PSI" != no; then
        [  --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])
 
        PHP_ARG_WITH(psi-libjit, where to find libjit,
        [  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
@@ -37,75 +31,34 @@ if test "$PHP_PSI" != no; then
 
        AC_HEADER_ASSERT dnl # adds --disable-assert to define NDEBUG
 
+       PSI_CONFIG_INIT
+       
+       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
-       AC_MSG_CHECKING([for _GNU_SOURCE])
-       AC_EGREP_CPP([gnu_source_not_defined], [
-               #ifndef _GNU_SOURCE
-               gnu_source_not_defined
-               #endif
-       ], [
-               AC_MSG_RESULT([needs define])
-               AC_DEFINE([_GNU_SOURCE], [1], [ ])
-       ], [
-               AC_MSG_RESULT([already defined])
-       ])
-
-       AC_MSG_CHECKING([psi source dir])
-       AC_MSG_RESULT([$PHP_PSI_SRCDIR])
-       AC_MSG_CHECKING([psi build dir])
-       AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
+       PSI_CHECK_GNU_SOURCE
+       PSI_CHECK_CPP
+       PSI_CHECK_STD_TYPES
        
-       PSI_CHECK_LIBJIT
-       PSI_CHECK_LIBFFI
-
+       AC_HEADER_DIRENT
        AC_FUNC_FNMATCH
        AC_FUNC_MMAP
+       AC_CHECK_FUNCS([mknodat eaccess])
 
-       PSI_CONFIG_INIT
-       PSI_CHECK_STD_TYPES
-       PSI_CONFIG_DONE
+       PSI_CHECK_PTHREAD
+       PSI_CHECK_LIBJIT
+       PSI_CHECK_LIBFFI
 
-       PHP_SUBST(PSI_SHARED_LIBADD)
+       PSI_CONFIG_DONE
 
        AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
 
-       PHP_ADD_INCLUDE($PHP_PSI_SRCDIR)
-       PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
-       PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/calc)
-       PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/types)
-       PHP_ADD_INCLUDE($PHP_PSI_BUILDDIR)
-       PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
-       PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src/types)
-
-       PHP_PSI_HEADERS=" \
-               src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
-               src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
-               `(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
-       "
-       # parser* should come first
-       PHP_PSI_SOURCES=" \
-               src/parser_proc.c src/parser.c \
-               `(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
-                       | $EGREP -v '^src/parser' \
-               )` \
-       "
-       PHP_PSI_GENERATED=" \
-               src/parser_proc.c src/parser.c \
-               src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
-               src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
-       "
-
+       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_GENERATED)
-       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