administrativa

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index de400c449e851ed844cdc79b2680c1a455917f59..d621ffc5766e10a6a9163ec1978f5067aa074cfd 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -11,38 +11,8 @@ m4_foreach(incfile, [
        [ax/ax_check_sign.m4],
        [ax/ax_pthread.m4],
        [psi/psi.m4],
-       [psi/psi_type.m4],
        [psi/psi_const.m4],
-       [psi/psi_decl.m4],
-       [psi/psi_macro.m4],
-       [psi/psi_composite.m4],
-       [posix/errno.m4],
-       [posix/fcntl.m4],
-       [posix/glob.m4],
-       [posix/locale.m4],
-       [posix/stddef.m4],
-       [posix/stdio.m4],
-       [posix/stdint.m4],
-       [posix/stdlib.m4],
-       [posix/sys_select.m4],
-       [posix/sys_socket.m4],
-       [posix/sys_stat.m4],
-       [posix/sys_time.m4],
-       [posix/sys_times.m4],
-       [posix/sys_types.m4],
-       [posix/sys_uio.m4],
-       [posix/sys_utsname.m4],
-       [posix/ndbm.m4],
-       [posix/netdb.m4],
-       [posix/netinet_in.m4],
-       [posix/netinet_tcp.m4],
-       [posix/poll.m4],
-       [posix/signal.m4],
-       [posix/syslog.m4],
-       [posix/time.m4],
-       [posix/unistd.m4],
-       [posix/wchar.m4],
-       [posix/wctype.m4]], [
+       [psi/psi_type.m4]], [
        dnl pecl build
        sinclude([m4/]incfile)
        dnl php-src build
@@ -53,15 +23,11 @@ PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
 [  --enable-psi            Enable PSI (PHP System Interface) support])
 
 if test "$PHP_PSI" != no; then
-       PHP_ARG_ENABLE(psi-posix, whether to pre-define POSIX decls,
-       [  --enable-psi-posix=...  PSI: pre-define POSIX decls], [all], [no])
-       
+
        PHP_ARG_ENABLE(psi-maintainer-mode, whether to enable maintainer mode,
        [  --enable-psi-maintainer-mode
                           PSI: enable maintainer mode
-                           . parallel configure
-                           . source dependencies
-                           . extra decl wrappers], [no], [no])
+                           . make dependencies], [no], [no])
 
        PHP_ARG_WITH(psi-libjit, where to find libjit,
        [  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
@@ -85,58 +51,19 @@ if test "$PHP_PSI" != no; then
                AC_MSG_RESULT([already defined])
        ])
 
-       PSI_LEMON
+       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_LIBJIT
        PSI_CHECK_LIBFFI
 
-       AC_PATH_PROG(NM, nm)
        AC_FUNC_FNMATCH
        AC_FUNC_MMAP
 
        PSI_CONFIG_INIT
-
-       dnl basics, one-by-one
        PSI_CHECK_STD_TYPES
-       PSI_CHECK_STDINT
-       PSI_CHECK_SYS_TYPES
-       PSI_CHECK_STDDEF
-       
-       dnl parallel
-       AC_MSG_CHECKING([for POSIX modules: $PHP_PSI_POSIX])
-       
-       PSI_CONFIG_POSIX(signal, signal.h, [
-               PSI_CONFIG_POSIX(time, time.h, [
-                       PSI_CONFIG_POSIX(sys/stat, sys/stat.h)
-                       PSI_CONFIG_POSIX(wchar, wchar.h, [
-                               PSI_CONFIG_POSIX(wctype, wctype.h)
-                       ])
-               ])
-               PSI_CONFIG_POSIX(sys/select, sys/select.h)
-       ])
-       PSI_CONFIG_POSIX(poll, poll.h)
-       PSI_CONFIG_POSIX(syslog, syslog.h)
-       PSI_CONFIG_POSIX(errno, errno.h)
-       PSI_CONFIG_POSIX(fcntl, fcntl.h)
-       PSI_CONFIG_POSIX(glob, glob.h)
-       PSI_CONFIG_POSIX(locale, locale.h xlocale.h)
-       PSI_CONFIG_POSIX(stdio, stdio.h)
-       PSI_CONFIG_POSIX(stdlib, stdlib.h)
-       PSI_CONFIG_POSIX(unistd, unistd.h)
-       PSI_CONFIG_POSIX(sys/socket, sys/socket.h, [
-               PSI_CONFIG_POSIX(netinet/in, netinet/in.h)
-               PSI_CONFIG_POSIX(netdb, netdb.h)
-       ])
-       PSI_CONFIG_POSIX(netinet/tcp, netinet/tcp.h)
-       PSI_CONFIG_POSIX(sys/time, sys/time.h)
-       PSI_CONFIG_POSIX(sys/times, sys/times.h)
-       PSI_CONFIG_POSIX(sys/uio, sys/uio.h)
-       PSI_CONFIG_POSIX(sys/utsname, sys/utsname.h)
-       PSI_CONFIG_POSIX(ndbm, dnl
-               ndbm.h dnl posix
-               relic.h dnl qdbm
-               gdbm-ndbm.h dnl gdbm
-       )
-       
        PSI_CONFIG_DONE
 
        PHP_SUBST(PSI_SHARED_LIBADD)
@@ -145,18 +72,29 @@ if test "$PHP_PSI" != no; then
 
        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=`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)`
+       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')` \
+               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_PSI_GENERATED="src/parser_proc.y src/parser_proc.c src/parser.c"
 
        PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
        PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)