configure: fix fd restoration

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index 68d5c9f464f3c0f1814d82ce6baa8fe160795571..b4107c878b64c800d03da213c7d0f4df57f0a55a 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -60,8 +60,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 +102,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 +125,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 +139,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