X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fspawn_h.m4;h=4903b6a4a19472fef1c9822ac184d62007695c0d;hb=c9ff025783e5374226ffbf7940f40ce7db6852ed;hp=da7582fc973d8cf5f3c9327201de5317b8224e74;hpb=8a81dc85e19b134d5b8ead55d9131fe87a12305b;p=gnulib.git

diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
index da7582fc9..4903b6a4a 100644
--- a/m4/spawn_h.m4
+++ b/m4/spawn_h.m4
@@ -1,5 +1,5 @@
-# spawn_h.m4 serial 9
-dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
+# spawn_h.m4 serial 13
+dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,6 @@ AC_DEFUN([gl_SPAWN_H],
   dnl <spawn.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_NEXT_HEADERS([spawn.h])
 
-  AC_CHECK_HEADERS_ONCE([spawn.h])
   if test $ac_cv_header_spawn_h = yes; then
     HAVE_SPAWN_H=1
     AC_CHECK_TYPES([posix_spawnattr_t], [], [HAVE_POSIX_SPAWNATTR_T=0], [[
@@ -29,14 +28,10 @@ AC_DEFUN([gl_SPAWN_H],
     HAVE_SPAWN_H=0
     HAVE_POSIX_SPAWNATTR_T=0
     HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
-    gl_REPLACE_SPAWN_H
   fi
   AC_SUBST([HAVE_SPAWN_H])
 
-  AC_CHECK_FUNCS_ONCE([posix_spawn])
-  if test $ac_cv_func_posix_spawn != yes; then
-    HAVE_POSIX_SPAWN=0
-  fi
+  AC_REQUIRE([gl_HAVE_POSIX_SPAWN])
 
   AC_REQUIRE([AC_C_RESTRICT])
 
@@ -55,20 +50,27 @@ AC_DEFUN([gl_SPAWN_H],
     posix_spawn_file_actions_adddup2])
 ])
 
-dnl Unconditionally enables the replacement of <spawn.h>.
-AC_DEFUN([gl_REPLACE_SPAWN_H],
+dnl Checks whether the system has the functions posix_spawn.
+dnl Sets ac_cv_func_posix_spawn and HAVE_POSIX_SPAWN.
+AC_DEFUN([gl_HAVE_POSIX_SPAWN],
 [
-  dnl This is a no-op, because <spawn.h> is always overridden.
-  :
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
+
+  AC_CHECK_FUNCS_ONCE([posix_spawn])
+  if test $ac_cv_func_posix_spawn != yes; then
+    HAVE_POSIX_SPAWN=0
+  fi
 ])
 
 AC_DEFUN([gl_SPAWN_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
   dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR([$1])
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
 ])
 
 AC_DEFUN([gl_SPAWN_H_DEFAULTS],