Cygwin: Remove AC_PROG_MAKE_SET

This is only needed if we are using an ancient make which doesn't set
${MAKE}, but we say "This makefile requires GNU make." everywhere.

It only has an effect if @SET_MAKE@ is used, which we aren't doing
consistently.

diff --git a/winsup/configure b/winsup/configure
index 384403050d7e6516054e543debc542c161b9ccf1..cb83c7cb7ea49a484fa1605ce5a17bfbe4924fbd 100755 (executable)
--- a/winsup/configure
+++ b/winsup/configure
@@ -589,7 +589,6 @@ ac_no_link=no
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-SET_MAKE
 INSTALL_LICENSE
 subdirs
 cygwin_headers
@@ -3458,38 +3457,6 @@ INSTALL_LICENSE="install-license"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-       @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF

diff --git a/winsup/configure.ac b/winsup/configure.ac
index 131dc79ee9740705305ac54d4dc1d215607ef506..e917ee1c5dee12ccf1f0a440ba6bb5fba0424a51 100644 (file)
--- a/winsup/configure.ac
+++ b/winsup/configure.ac
@@ -43,7 +43,5 @@ INSTALL_LICENSE="install-license"
 
 AC_SUBST(INSTALL_LICENSE)
 
-AC_PROG_MAKE_SET
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure
index 6de9ed0d4dca31832839a74c58c615e56d114b4e..b36f4cfe4709f6ac5d8533db87e0b66d0d3ebbb7 100755 (executable)
--- a/winsup/cygserver/configure
+++ b/winsup/cygserver/configure
@@ -589,7 +589,6 @@ ac_no_link=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 configure_args
-SET_MAKE
 WINDRES
 DLLTOOL
 NM
@@ -4105,38 +4104,6 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-       @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
 # Check whether --enable-debugging was given.
 if test "${enable_debugging+set}" = set; then :
   enableval=$enable_debugging; case "${enableval}" in

diff --git a/winsup/cygserver/configure.ac b/winsup/cygserver/configure.ac
index 560de0c056e7f9e373075c67e20052b6dd5c8ca1..d8b2a61fa1d7190c30bfa0ce1639d54647f9ca4a 100644 (file)
--- a/winsup/cygserver/configure.ac
+++ b/winsup/cygserver/configure.ac
@@ -55,8 +55,6 @@ AC_CHECK_TOOL(NM, nm, nm)
 AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
 AC_CHECK_TOOL(WINDRES, windres, windres)
 
-AC_PROG_MAKE_SET
-
 AC_ARG_ENABLE(debugging,
 [ --enable-debugging           Build a cygwin DLL which has more consistency checking for debugging],
 [case "${enableval}" in

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 3a7a73adb04e4da7debfd7fee9574f597d8d8835..7f19a57fd5117aea426977cedf469e40e3c2e8d7 100644 (file)
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -94,8 +94,6 @@ STRIP:=@STRIP@
 LDSCRIPT:=cygwin.sc
 MKDIRP:=$(INSTALL) -m 755 -d
 
-@SET_MAKE@
-
 # Setup the testing framework, if you have one
 EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
            echo $${rootme}/../../expect/expect$(EXEEXT) ; \

diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index d89ed8a2f1ec56b3e30c30f454a14c1756f0ab16..54b7f04c3333e6d485bb4ef1faeee45dca077a45 100755 (executable)
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -595,7 +595,6 @@ DLL_ENTRY
 DLL_NAME
 LIBSERVER
 configure_args
-SET_MAKE
 WINDRES
 STRIP
 RANLIB
@@ -4392,38 +4391,6 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-       @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
 # Check whether --enable-debugging was given.
 if test "${enable_debugging+set}" = set; then :
   enableval=$enable_debugging; case "${enableval}" in

diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac
index ff12dc259927ac468f057a0db860ff9f61525be8..ac019c94e667ebb9c98f446e6f3e34ea2b25ea30 100644 (file)
--- a/winsup/cygwin/configure.ac
+++ b/winsup/cygwin/configure.ac
@@ -59,8 +59,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
 AC_CHECK_TOOL(STRIP, strip, strip)
 AC_CHECK_TOOL(WINDRES, windres, windres)
 
-AC_PROG_MAKE_SET
-
 AC_ARG_ENABLE(debugging,
 [ --enable-debugging           Build a cygwin DLL which has more consistency checking for debugging],
 [case "${enableval}" in