X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=74fefdb3ed4ce0fef45a7b84a56c0b6d7eb65c52;hp=817887d199f019606a408143032b3c1bfbc706a6;hb=ed5ebb3caac1ac8bf6a4b32eabfb523f23de8576;hpb=5abcb8724ac7046d62203ea643e9ce69f63a6a8a

diff --git a/config.m4 b/config.m4
index 817887d..74fefdb 100644
--- a/config.m4
+++ b/config.m4
@@ -1,6 +1,3 @@
-PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
-[  --enable-psi            Enable PHP System Interface support])
-
 PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
 PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
 
@@ -13,6 +10,7 @@ m4_foreach(incfile, [
 	[psi_macro.m4],
 	[psi_struct.m4],
 	[errno.m4],
+	[fcntl.m4],
 	[glob.m4],
 	[locale.m4],
 	[stddef.m4],
@@ -27,6 +25,7 @@ m4_foreach(incfile, [
 	[sys_types.m4],
 	[sys_uio.m4],
 	[sys_utsname.m4],
+	[ndbm.m4],
 	[netdb.m4],
 	[netinet_in.m4],
 	[netinet_tcp.m4],
@@ -41,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)
 
@@ -54,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
@@ -69,6 +81,7 @@ if test "$PHP_PSI" != no; then
 	PSI_CHECK_SYS_STAT
 	PSI_CHECK_SYS_UIO
 	PSI_CHECK_SYS_UTSNAME
+	PSI_CHECK_NDBM
 	PSI_CHECK_NETDB
 	PSI_CHECK_NETINET_IN
 	PSI_CHECK_NETINET_TCP
@@ -95,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)