X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=ade6f45b52f415348c42f4063fcf69bf5e2aece1;hp=fd41d32494e46810f8948df94519d3dc7a723454;hb=6a459a08a40a2c243b0211ceb0cb263d29302627;hpb=81b71a515e2024cee739deb6e207eb3b0e7c5d64

diff --git a/config.m4 b/config.m4
index fd41d32..ade6f45 100644
--- a/config.m4
+++ b/config.m4
@@ -1,6 +1,12 @@
 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)
 
@@ -13,6 +19,7 @@ m4_foreach(incfile, [
 	[psi_macro.m4],
 	[psi_struct.m4],
 	[errno.m4],
+	[fcntl.m4],
 	[glob.m4],
 	[locale.m4],
 	[stddef.m4],
@@ -27,7 +34,11 @@ m4_foreach(incfile, [
 	[sys_types.m4],
 	[sys_uio.m4],
 	[sys_utsname.m4],
+	[ndbm.m4],
 	[netdb.m4],
+	[netinet_in.m4],
+	[netinet_tcp.m4],
+	[poll.m4],
 	[syslog.m4],
 	[time.m4],
 	[wchar.m4],
@@ -54,6 +65,7 @@ if test "$PHP_PSI" != no; then
 	PSI_CHECK_STDDEF
 	PSI_CHECK_SYS_TYPES
 	PSI_CHECK_ERRNO
+	PSI_CHECK_FCNTL
 	PSI_CHECK_GLOB
 	PSI_CHECK_LOCALE
 	PSI_CHECK_STDIO
@@ -66,7 +78,11 @@ 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
+	PSI_CHECK_POLL
 	PSI_CHECK_SYSLOG
 	PSI_CHECK_WCHAR
 	PSI_CHECK_WCTYPE
@@ -89,8 +105,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)