pre-evaluate constant value on validation

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index a873ab94dbb7ff97fb3a9b1b4bfb2660c9490ccc..68d5c9f464f3c0f1814d82ce6baa8fe160795571 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -15,7 +15,7 @@ m4_foreach(incfile, [
        [psi/psi_const.m4],
        [psi/psi_decl.m4],
        [psi/psi_macro.m4],
-       [psi/psi_struct.m4],
+       [psi/psi_composite.m4],
        [posix/errno.m4],
        [posix/fcntl.m4],
        [posix/glob.m4],
@@ -139,33 +139,25 @@ if test "$PHP_PSI" != no; then
 
        AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
 
-       AC_DEFINE_UNQUOTED([PSI_STDINC], ["$PSI_STDINC"], [Standard includes])
-       AC_DEFINE_UNQUOTED([PSI_TYPES], ["$PSI_TYPES"], [Predefined types])
-       AC_DEFINE_UNQUOTED([PSI_STRUCTS], ["$PSI_STRUCTS"], [Predefined structs])
-       AC_DEFINE_UNQUOTED([PSI_UNIONS], ["$PSI_UNIONS"], [Predefined structs])
-       AC_DEFINE_UNQUOTED([PSI_CONSTS], ["$PSI_CONSTS"], [Predefined constants])
-       AC_DEFINE_UNQUOTED([PSI_MACROS], ["$PSI_MACROS"], [Redirected Macros])
-       AC_DEFINE_UNQUOTED([PSI_REDIRS], ["$PSI_REDIRS"], [Redirected functions])
-       AC_DEFINE_UNQUOTED([PSI_DECLS], ["$PSI_DECLS"], [Predefined functions])
-       AC_DEFINE_UNQUOTED([PSI_VA_DECLS], ["$PSI_VA_DECLS"], [Predefined vararg functions])
-
        PHP_ADD_INCLUDE($PHP_PSI_SRCDIR)
        PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
        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)`
        # parser* should come first
        PHP_PSI_SOURCES=" \
-               src/parser_proc.c \
-               src/parser.c \
+               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"
 
        PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
        PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)
 
+       PHP_SUBST(PHP_PSI_GENERATED)
        PHP_SUBST(PHP_PSI_HEADERS)
        PHP_SUBST(PHP_PSI_SOURCES)