From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id C93823857C46; Wed, 14 Oct 2020 14:40:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C93823857C46 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jon TURNEY To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Remove AC_PROG_MAKE_SET X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: ad0f139c74a3d8e93d9b74f91d2393602328c53d X-Git-Newrev: b21158bc4e3e37d64009e7d83362cde5115d7504 Message-Id: <20201014144024.C93823857C46@sourceware.org> Date: Wed, 14 Oct 2020 14:40:24 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2020 14:40:24 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b21158bc4e3e37d64009e7d83362cde5115d7504 commit b21158bc4e3e37d64009e7d83362cde5115d7504 Author: Jon Turney Date: Mon Oct 12 14:12:40 2020 +0100 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: --- winsup/configure | 33 --------------------------------- winsup/configure.ac | 2 -- winsup/cygserver/configure | 33 --------------------------------- winsup/cygserver/configure.ac | 2 -- winsup/cygwin/Makefile.in | 2 -- winsup/cygwin/configure | 33 --------------------------------- winsup/cygwin/configure.ac | 2 -- 7 files changed, 107 deletions(-) diff --git a/winsup/configure b/winsup/configure index 384403050..cb83c7cb7 100755 --- 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 131dc79ee..e917ee1c5 100644 --- 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 6de9ed0d4..b36f4cfe4 100755 --- 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 560de0c05..d8b2a61fa 100644 --- 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 3a7a73adb..7f19a57fd 100644 --- 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 d89ed8a2f..54b7f04c3 100755 --- 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 ff12dc259..ac019c94e 100644 --- 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