From a24790d7edd6aeb466632c3d7dfbe2534d55b261 Mon Sep 17 00:00:00 2001
From: psmith <psmith>
Date: Tue, 15 Nov 2011 22:56:26 +0000
Subject: [PATCH] Allow os2 and mingw to disable jobserver with a configure
 option.

---
 configure.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 1797587..d994e7b 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@
 AC_INIT([GNU make],[3.82.90],[bug-make@gnu.org])
 
 AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.158 2011/11/15 21:12:54 psmith Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.159 2011/11/15 22:56:26 psmith Exp $]])
 
 # Autoconf setup
 AC_CONFIG_AUX_DIR(config)
@@ -306,15 +306,17 @@ case "/$ac_cv_func_pipe/$ac_cv_func_sigaction/$make_cv_sa_restart/$has_wait_noha
   */no/*) make_cv_job_server=no ;;
 esac
 
-# Also supported on OS2 and W32
+# Also supported on OS2 and MinGW
 case "$host_os" in
-  os2*|mingw32) make_cv_sa_restart=yes ;;
+  os2*|mingw*) make_cv_job_server=yes ;;
 esac
 
-if test "$make_cv_job_server" != no; then
-  AC_DEFINE(MAKE_JOBSERVER, 1,
-            [Define to 1 to enable job server support in GNU make.])
-fi
+# If we support it and the user didn't disable it, build with jobserver
+case "/$make_cv_job_server/$user_job_server/" in
+  */no/*) : no jobserver ;;
+  *) AC_DEFINE(MAKE_JOBSERVER, 1,
+               [Define to 1 to enable job server support in GNU make.]) ;;
+esac
 
 # if we have both lstat() and readlink() then we can support symlink
 # timechecks.
-- 
2.11.4.GIT