silence first validation round

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index 9666b1b38f39dbd1c500a209ff44f078d13b1f0a..74fefdb3ed4ce0fef45a7b84a56c0b6d7eb65c52 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,12 +1,3 @@
-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)
 
@@ -19,6 +10,7 @@ m4_foreach(incfile, [
        [psi_macro.m4],
        [psi_struct.m4],
        [errno.m4],
+       [fcntl.m4],
        [glob.m4],
        [locale.m4],
        [stddef.m4],
@@ -48,6 +40,18 @@ 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)
 
@@ -61,9 +65,10 @@ 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
@@ -103,8 +108,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)