X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config.m4;h=3ced949809406f3dce2a6c67249a9d7205744daa;hb=e82854b435ee087e5eb6af926866c9f2d810a5fe;hp=68d5c9f464f3c0f1814d82ce6baa8fe160795571;hpb=e976ce142e35c97919717acf52618900477a4ade;p=m6w6%2Fext-psi

diff --git a/config.m4 b/config.m4
index 68d5c9f..3ced949 100644
--- 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],
@@ -60,8 +61,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], [ ], [ ])
@@ -102,8 +103,22 @@ 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, [
+			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 +126,15 @@ 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(arpa/inet, arpa/inet.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 +142,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