X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config.m4;h=de400c449e851ed844cdc79b2680c1a455917f59;hb=9a01d0b6658e90781eb27117e44727dca70b1aa5;hp=a873ab94dbb7ff97fb3a9b1b4bfb2660c9490ccc;hpb=3ef8c66ab1300801bcdb15b43f9f28e77b6487b6;p=m6w6%2Fext-psi

diff --git a/config.m4 b/config.m4
index a873ab9..de400c4 100644
--- 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],
@@ -104,6 +104,17 @@ if test "$PHP_PSI" != no; then
 	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)
@@ -111,12 +122,13 @@ 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(time, time.h)
-	PSI_CONFIG_POSIX(sys/select, sys/select.h)
-	PSI_CONFIG_POSIX(sys/socket, sys/socket.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/stat, sys/stat.h)
 	PSI_CONFIG_POSIX(sys/uio, sys/uio.h)
 	PSI_CONFIG_POSIX(sys/utsname, sys/utsname.h)
 	PSI_CONFIG_POSIX(ndbm, dnl
@@ -124,14 +136,6 @@ if test "$PHP_PSI" != no; then
 		relic.h dnl qdbm
 		gdbm-ndbm.h dnl gdbm
 	)
-	PSI_CONFIG_POSIX(netdb, netdb.h)
-	PSI_CONFIG_POSIX(netinet/in, netinet/in.h)
-	PSI_CONFIG_POSIX(netinet/tcp, netinet/tcp.h)
-	PSI_CONFIG_POSIX(poll, poll.h)
-	PSI_CONFIG_POSIX(signal, signal.h)
-	PSI_CONFIG_POSIX(syslog, syslog.h)
-	PSI_CONFIG_POSIX(wchar, wchar.h)
-	PSI_CONFIG_POSIX(wctype, wctype.h)
 	
 	PSI_CONFIG_DONE
 
@@ -139,33 +143,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)