flush

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index e2a28dda547a414f0bd58eb6b23f1a4fb6fd2329..447ffe6f4b4e72b3c4c1c7be55803e66a89ec3f9 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,17 +1,9 @@
-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], [ ], [ ])
-
-PHP_ARG_WITH(psi-libffi, where to find libffi,
-[  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
-
 PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
 PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
 
 m4_foreach(incfile, [
        [ax_check_sign.m4],
+       [ax_pthread.m4],
        [psi.m4],
        [psi_type.m4],
        [psi_const.m4],
@@ -39,8 +31,10 @@ m4_foreach(incfile, [
        [netinet_in.m4],
        [netinet_tcp.m4],
        [poll.m4],
+       [signal.m4],
        [syslog.m4],
        [time.m4],
+       [unistd.m4],
        [wchar.m4],
        [wctype.m4]], [
        dnl pecl build
@@ -49,8 +43,22 @@ m4_foreach(incfile, [
        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_ENABLE(psi-posix, whether to pre-define POSIX decls,
+[  --ebable-psi-posix      PSI: pre-define POSIX decls], [ ], [ ])
+
+PHP_ARG_WITH(psi-libjit, where to find libjit,
+[  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
+
+PHP_ARG_WITH(psi-libffi, where to find libffi,
+[  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
+
 if test "$PHP_PSI" != no; then
        PHP_CONFIGURE_PART(Configuring PSI)
+       
+       ifdef([AC_USE_SYSTEM_EXTENSIONS],AC_USE_SYSTEM_EXTENSIONS)
 
        PSI_LEMON
        PSI_CHECK_LIBJIT
@@ -62,14 +70,15 @@ if test "$PHP_PSI" != no; then
        PSI_CONFIG_INIT
        PSI_CHECK_STD_TYPES
        PSI_CHECK_STDINT
-       PSI_CHECK_STDDEF
        PSI_CHECK_SYS_TYPES
+       PSI_CHECK_STDDEF
        PSI_CHECK_ERRNO
        PSI_CHECK_FCNTL
        PSI_CHECK_GLOB
        PSI_CHECK_LOCALE
        PSI_CHECK_STDIO
        PSI_CHECK_STDLIB
+       PSI_CHECK_UNISTD
        PSI_CHECK_TIME
        PSI_CHECK_SYS_SELECT
        PSI_CHECK_SYS_SOCKET
@@ -83,6 +92,7 @@ if test "$PHP_PSI" != no; then
        PSI_CHECK_NETINET_IN
        PSI_CHECK_NETINET_TCP
        PSI_CHECK_POLL
+       PSI_CHECK_SIGNAL
        PSI_CHECK_SYSLOG
        PSI_CHECK_WCHAR
        PSI_CHECK_WCTYPE
@@ -95,6 +105,7 @@ if test "$PHP_PSI" != no; then
        AC_DEFINE_UNQUOTED([PSI_STDINC], [$PSI_STDINC], [Standard includes])
        AC_DEFINE_UNQUOTED([PSI_TYPES], [$PSI_TYPES], [Predefined types])
        AC_DEFINE_UNQUOTED([PSI_STRUCTS], [$PSI_STRUCTS], [Predefined structs])
+       AC_DEFINE_UNQUOTED([PSI_UNIONS], [$PSI_UNIONS], [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])
@@ -105,8 +116,11 @@ 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="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_PSI_SOURCES= # parser* should come first
+       PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/parser_proc.c src/parser.c"
+       PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/libjit.c src/libffi.c src/engine.c"
+       PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/marshal.c src/calc.c src/module.c"
+       PHP_PSI_SOURCES="$PHP_PSI_SOURCES `(cd $PHP_PSI_SRCDIR && echo src/context*.c)`"
 
        PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
        PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)