summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsmith <>2011-11-15 22:56:26 +0000
committerpsmith <>2011-11-15 22:56:26 +0000
commit36ae2250d889b63b990a5bac839be96a834cad11 (patch)
tree54d795f3943db13b65bc4d6e1dd346900e232808
parent87bda909718d9d10fd4f2545a55761df72c5084b (diff)
downloadmake-master.tar.gz
Allow os2 and mingw to disable jobserver with a configure option.master
-rw-r--r--configure.in16
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.in b/configure.in
index 17975872..d994e7b5 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.