calc: generate calculators

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index b4107c878b64c800d03da213c7d0f4df57f0a55a..828c93740753d64d8f798be06c6f6ad2f1ec5d58 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],
@@ -126,7 +127,9 @@ if test "$PHP_PSI" != no; then
        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(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)
@@ -148,18 +151,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/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.y 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/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)