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.
This commit is contained in:
parent
ad0f139c74
commit
b21158bc4e
|
@ -589,7 +589,6 @@ ac_no_link=no
|
||||||
enable_option_checking=no
|
enable_option_checking=no
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
SET_MAKE
|
|
||||||
INSTALL_LICENSE
|
INSTALL_LICENSE
|
||||||
subdirs
|
subdirs
|
||||||
cygwin_headers
|
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"
|
ac_config_files="$ac_config_files Makefile"
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
|
|
|
@ -43,7 +43,5 @@ INSTALL_LICENSE="install-license"
|
||||||
|
|
||||||
AC_SUBST(INSTALL_LICENSE)
|
AC_SUBST(INSTALL_LICENSE)
|
||||||
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -589,7 +589,6 @@ ac_no_link=no
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
configure_args
|
configure_args
|
||||||
SET_MAKE
|
|
||||||
WINDRES
|
WINDRES
|
||||||
DLLTOOL
|
DLLTOOL
|
||||||
NM
|
NM
|
||||||
|
@ -4105,38 +4104,6 @@ else
|
||||||
fi
|
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.
|
# Check whether --enable-debugging was given.
|
||||||
if test "${enable_debugging+set}" = set; then :
|
if test "${enable_debugging+set}" = set; then :
|
||||||
enableval=$enable_debugging; case "${enableval}" in
|
enableval=$enable_debugging; case "${enableval}" in
|
||||||
|
|
|
@ -55,8 +55,6 @@ AC_CHECK_TOOL(NM, nm, nm)
|
||||||
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
|
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
|
||||||
AC_CHECK_TOOL(WINDRES, windres, windres)
|
AC_CHECK_TOOL(WINDRES, windres, windres)
|
||||||
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(debugging,
|
AC_ARG_ENABLE(debugging,
|
||||||
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
|
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
|
||||||
[case "${enableval}" in
|
[case "${enableval}" in
|
||||||
|
|
|
@ -94,8 +94,6 @@ STRIP:=@STRIP@
|
||||||
LDSCRIPT:=cygwin.sc
|
LDSCRIPT:=cygwin.sc
|
||||||
MKDIRP:=$(INSTALL) -m 755 -d
|
MKDIRP:=$(INSTALL) -m 755 -d
|
||||||
|
|
||||||
@SET_MAKE@
|
|
||||||
|
|
||||||
# Setup the testing framework, if you have one
|
# Setup the testing framework, if you have one
|
||||||
EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
|
EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
|
||||||
echo $${rootme}/../../expect/expect$(EXEEXT) ; \
|
echo $${rootme}/../../expect/expect$(EXEEXT) ; \
|
||||||
|
|
|
@ -595,7 +595,6 @@ DLL_ENTRY
|
||||||
DLL_NAME
|
DLL_NAME
|
||||||
LIBSERVER
|
LIBSERVER
|
||||||
configure_args
|
configure_args
|
||||||
SET_MAKE
|
|
||||||
WINDRES
|
WINDRES
|
||||||
STRIP
|
STRIP
|
||||||
RANLIB
|
RANLIB
|
||||||
|
@ -4392,38 +4391,6 @@ else
|
||||||
fi
|
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.
|
# Check whether --enable-debugging was given.
|
||||||
if test "${enable_debugging+set}" = set; then :
|
if test "${enable_debugging+set}" = set; then :
|
||||||
enableval=$enable_debugging; case "${enableval}" in
|
enableval=$enable_debugging; case "${enableval}" in
|
||||||
|
|
|
@ -59,8 +59,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
|
||||||
AC_CHECK_TOOL(STRIP, strip, strip)
|
AC_CHECK_TOOL(STRIP, strip, strip)
|
||||||
AC_CHECK_TOOL(WINDRES, windres, windres)
|
AC_CHECK_TOOL(WINDRES, windres, windres)
|
||||||
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(debugging,
|
AC_ARG_ENABLE(debugging,
|
||||||
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
|
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
|
||||||
[case "${enableval}" in
|
[case "${enableval}" in
|
||||||
|
|
Loading…
Reference in New Issue