Merge branch 'slimconfigure'

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index de400c449e851ed844cdc79b2680c1a455917f59..01a82a2b7f978eaf9b2b85966958f71f5d1f04e5 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -16,6 +16,7 @@ m4_foreach(incfile, [
        [psi/psi_decl.m4],
        [psi/psi_macro.m4],
        [psi/psi_composite.m4],
+       [posix/arpa_inet.m4],
        [posix/errno.m4],
        [posix/fcntl.m4],
        [posix/glob.m4],
@@ -24,6 +25,7 @@ m4_foreach(incfile, [
        [posix/stdio.m4],
        [posix/stdint.m4],
        [posix/stdlib.m4],
+       [posix/stdarg.m4],
        [posix/sys_select.m4],
        [posix/sys_socket.m4],
        [posix/sys_stat.m4],
@@ -60,8 +62,8 @@ if test "$PHP_PSI" != no; then
        [  --enable-psi-maintainer-mode
                           PSI: enable maintainer mode
                            . parallel configure
-                           . source dependencies
-                           . extra decl wrappers], [no], [no])
+                           . make dependencies
+                           . extra debug wrappers], [no], [no])
 
        PHP_ARG_WITH(psi-libjit, where to find libjit,
        [  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
@@ -85,11 +87,14 @@ 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
 
@@ -102,7 +107,10 @@ if test "$PHP_PSI" != no; then
        PSI_CHECK_STDDEF
        
        dnl parallel
-       AC_MSG_CHECKING([for POSIX modules: $PHP_PSI_POSIX])
+       AC_MSG_CHECKING([for POSIX modules])
+       if ! $PSI_FAST_CONFIG; then
+               AC_MSG_RESULT([$PHP_PSI_POSIX])
+       fi
        
        PSI_CONFIG_POSIX(signal, signal.h, [
                PSI_CONFIG_POSIX(time, time.h, [
@@ -122,8 +130,11 @@ if test "$PHP_PSI" != no; then
        PSI_CONFIG_POSIX(stdio, stdio.h)
        PSI_CONFIG_POSIX(stdlib, stdlib.h)
        PSI_CONFIG_POSIX(unistd, unistd.h)
+       PSI_CONFIG_POSIX(stdarg, stdarg.h)
        PSI_CONFIG_POSIX(sys/socket, sys/socket.h, [
-               PSI_CONFIG_POSIX(netinet/in, netinet/in.h)
+               PSI_CONFIG_POSIX(netinet/in, netinet/in.h, [
+                       PSI_CONFIG_POSIX(arpa/inet, arpa/inet.h)
+               ])
                PSI_CONFIG_POSIX(netdb, netdb.h)
        ])
        PSI_CONFIG_POSIX(netinet/tcp, netinet/tcp.h)
@@ -145,18 +156,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)