From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 04/10] Require GNU make
Date: Thu, 8 Apr 2021 14:33:06 -0600 [thread overview]
Message-ID: <20210408203312.2938165-5-tom@tromey.com> (raw)
In-Reply-To: <20210408203312.2938165-1-tom@tromey.com>
GDB has required GNU make for quite some time, and this patch applies
this approach to the sim as well. Requiring GNU make means that
automatic dependency tracking can be simple and reliable, and it also
makes other refactorings simpler.
sim/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* m4/sim_ac_common.m4 (SIM_AC_COMMON): Don't check for make.
sim/aarch64/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/arm/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/avr/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/bfin/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/common/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Make-common.in: Require GNU make.
sim/cr16/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/cris/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/d10v/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/erc32/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/example-synacor/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/frv/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/ft32/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/h8300/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/iq2000/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/lm32/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/m32c/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/m32r/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/m68hc11/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/mcore/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/microblaze/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/mips/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/mn10300/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/moxie/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/msp430/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/or1k/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/pru/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/riscv/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/rl78/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/rx/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/sh/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
sim/v850/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
---
sim/ChangeLog | 4 ++
sim/aarch64/ChangeLog | 4 ++
sim/aarch64/configure | 69 +----------------------------------
sim/arm/ChangeLog | 4 ++
sim/arm/configure | 69 +----------------------------------
sim/avr/ChangeLog | 4 ++
sim/avr/configure | 69 +----------------------------------
sim/bfin/ChangeLog | 4 ++
sim/bfin/configure | 69 +----------------------------------
sim/bpf/configure | 69 +----------------------------------
sim/common/ChangeLog | 4 ++
sim/common/Make-common.in | 30 +++++++--------
sim/cr16/ChangeLog | 4 ++
sim/cr16/configure | 69 +----------------------------------
sim/cris/ChangeLog | 4 ++
sim/cris/configure | 69 +----------------------------------
sim/d10v/ChangeLog | 4 ++
sim/d10v/configure | 69 +----------------------------------
sim/erc32/ChangeLog | 4 ++
sim/erc32/configure | 69 +----------------------------------
sim/example-synacor/ChangeLog | 4 ++
sim/example-synacor/configure | 69 +----------------------------------
sim/frv/ChangeLog | 4 ++
sim/frv/configure | 69 +----------------------------------
sim/ft32/ChangeLog | 4 ++
sim/ft32/configure | 69 +----------------------------------
sim/h8300/ChangeLog | 4 ++
sim/h8300/configure | 69 +----------------------------------
sim/iq2000/ChangeLog | 4 ++
sim/iq2000/configure | 69 +----------------------------------
sim/lm32/ChangeLog | 4 ++
sim/lm32/configure | 69 +----------------------------------
sim/m32c/ChangeLog | 4 ++
sim/m32c/configure | 69 +----------------------------------
sim/m32r/ChangeLog | 4 ++
sim/m32r/configure | 69 +----------------------------------
sim/m4/sim_ac_common.m4 | 10 -----
sim/m68hc11/ChangeLog | 4 ++
sim/m68hc11/configure | 69 +----------------------------------
sim/mcore/ChangeLog | 4 ++
sim/mcore/configure | 69 +----------------------------------
sim/microblaze/ChangeLog | 4 ++
sim/microblaze/configure | 69 +----------------------------------
sim/mips/ChangeLog | 4 ++
sim/mips/configure | 69 +----------------------------------
sim/mn10300/ChangeLog | 4 ++
sim/mn10300/configure | 69 +----------------------------------
sim/moxie/ChangeLog | 4 ++
sim/moxie/configure | 69 +----------------------------------
sim/msp430/ChangeLog | 4 ++
sim/msp430/configure | 69 +----------------------------------
sim/or1k/ChangeLog | 4 ++
sim/or1k/configure | 69 +----------------------------------
sim/pru/ChangeLog | 4 ++
sim/pru/configure | 69 +----------------------------------
sim/riscv/ChangeLog | 4 ++
sim/riscv/configure | 69 +----------------------------------
sim/rl78/ChangeLog | 4 ++
sim/rl78/configure | 69 +----------------------------------
sim/rx/ChangeLog | 4 ++
sim/rx/configure | 69 +----------------------------------
sim/sh/ChangeLog | 4 ++
sim/sh/configure | 69 +----------------------------------
sim/v850/ChangeLog | 4 ++
sim/v850/configure | 69 +----------------------------------
65 files changed, 205 insertions(+), 2102 deletions(-)
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index bb1e6296c96..70c5488a2de 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12220,10 +12159,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/arm/configure b/sim/arm/configure
index 7e8c3452ce8..a73ba1597a8 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12216,10 +12155,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/avr/configure b/sim/avr/configure
index 853462d64d5..f492aa553b0 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12216,10 +12155,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/bfin/configure b/sim/bfin/configure
index fc432d0ca03..49f1c8ba9dd 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -680,9 +680,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7148,64 +7145,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11255,7 +11194,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11258 "configure"
+#line 11197 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11361,7 +11300,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11364 "configure"
+#line 11303 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12691,10 +12630,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/bpf/configure b/sim/bpf/configure
index 8f4a1ebc91f..76524c23c09 100755
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7138,64 +7135,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11245,7 +11184,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11248 "configure"
+#line 11187 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11351,7 +11290,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11354 "configure"
+#line 11293 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12353,10 +12292,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index f1ebc5e30c7..c3c5748d061 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -401,21 +401,21 @@ hw_main_headers = \
# simpler scheme.
#
-@GMAKE_TRUE@ifeq ($(DEPMODE),depmode=gcc3)
+ifeq ($(DEPMODE),depmode=gcc3)
# Note that we put the dependencies into a .Tpo file, then move them
# into place if the compile succeeds. We need this because gcc does
# not atomically write the dependency output file.
-@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
-@GMAKE_TRUE@ -MF $(DEPDIR)/$(basename $(@F)).Tpo
-@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
-@GMAKE_TRUE@ $(DEPDIR)/$(basename $(@F)).Po
-@GMAKE_TRUE@else
-@GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
-@GMAKE_TRUE@ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
+override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
+ -MF $(DEPDIR)/$(basename $(@F)).Tpo
+override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
+ $(DEPDIR)/$(basename $(@F)).Po
+else
+override COMPILE.pre = source='$<' object='$@' libtool=no \
+ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
# depcomp handles atomicity for us, so we don't need a postcompile
# step.
-@GMAKE_TRUE@override POSTCOMPILE =
-@GMAKE_TRUE@endif
+override POSTCOMPILE =
+endif
all_object_files = $(LIB_OBJS) $(SIM_RUN_OBJS)
generated_files = \
@@ -428,14 +428,14 @@ generated_files = \
# Ensure that generated files are created early. Use order-only
# dependencies if available. They require GNU make 3.80 or newer,
# and the .VARIABLES variable was introduced at the same time.
-@GMAKE_TRUE@ifdef .VARIABLES
-@GMAKE_TRUE@$(all_object_files): | $(generated_files)
-@GMAKE_TRUE@else
+ifdef .VARIABLES
+$(all_object_files): | $(generated_files)
+else
$(all_object_files) : $(generated_files)
-@GMAKE_TRUE@endif
+endif
# Dependencies.
-@GMAKE_TRUE@-include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))
+-include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))
# FIXME This is one very simple-minded way of generating the file hw-config.h
hw-config.h: stamp-hw ; @true
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 16b0d7237a8..793aff7353d 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12213,10 +12152,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/cris/configure b/sim/cris/configure
index d882057cb8a..56740dabd5d 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -677,9 +677,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7139,64 +7136,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11246,7 +11185,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11249 "configure"
+#line 11188 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11352,7 +11291,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11355 "configure"
+#line 11294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12419,10 +12358,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 7bde3b270c3..84f33c45134 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12213,10 +12152,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 3f7227b2e7e..8729505a5f1 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -683,9 +683,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7120,64 +7117,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11227,7 +11166,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11230 "configure"
+#line 11169 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11333,7 +11272,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11336 "configure"
+#line 11275 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12254,10 +12193,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure
index 4392bc8c316..8e8bdcdbb2d 100755
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12216,10 +12155,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/frv/configure b/sim/frv/configure
index e3b9f0701c5..b55e7ead7cc 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -678,9 +678,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7142,64 +7139,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11249,7 +11188,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11252 "configure"
+#line 11191 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11355,7 +11294,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11358 "configure"
+#line 11297 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12424,10 +12363,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/ft32/configure b/sim/ft32/configure
index f3a84fae6b4..5dc69fd8d73 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12216,10 +12155,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 07f4d74ae62..0d022c6a801 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12226,10 +12165,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 5b5954d3f03..2207210db52 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -677,9 +677,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7139,64 +7136,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11246,7 +11185,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11249 "configure"
+#line 11188 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11352,7 +11291,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11355 "configure"
+#line 11294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12403,10 +12342,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 3b50a57b003..08f0eba9836 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -677,9 +677,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7139,64 +7136,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11246,7 +11185,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11249 "configure"
+#line 11188 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11352,7 +11291,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11355 "configure"
+#line 11294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12402,10 +12341,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 0ef2184ccaf..349101584e0 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -681,9 +681,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7118,64 +7115,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11225,7 +11164,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11228 "configure"
+#line 11167 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11331,7 +11270,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11334 "configure"
+#line 11273 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12129,10 +12068,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 1b02402f618..60a0d8eab38 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7141,64 +7138,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11248,7 +11187,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11251 "configure"
+#line 11190 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11354,7 +11293,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11357 "configure"
+#line 11296 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12418,10 +12357,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 8cb45a8b72a..31964bb7165 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -35,16 +35,6 @@ AC_SUBST(PACKAGE)
ZW_CREATE_DEPDIR
ZW_PROG_COMPILER_DEPENDENCIES([CC])
-# Check for the 'make' the user wants to use.
-AC_CHECK_PROGS(MAKE, make)
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
-AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes)
-
dnl We don't use gettext, but bfd does. So we do the appropriate checks
dnl to see if there are intl libraries we should link against.
ALL_LINGUAS=
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 8185d98a4d9..398dd283617 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -676,9 +676,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7128,64 +7125,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11235,7 +11174,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11238 "configure"
+#line 11177 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11341,7 +11280,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11344 "configure"
+#line 11283 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12323,10 +12262,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 7bde3b270c3..84f33c45134 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12213,10 +12152,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 7e8c3452ce8..a73ba1597a8 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12216,10 +12155,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/mips/configure b/sim/mips/configure
index e89ed1c83e5..92d41ece133 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -686,9 +686,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7158,64 +7155,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11265,7 +11204,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11268 "configure"
+#line 11207 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11371,7 +11310,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11374 "configure"
+#line 11313 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13142,10 +13081,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 3106bdad8d7..b5a2b6a712a 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -674,9 +674,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7134,64 +7131,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11241,7 +11180,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11244 "configure"
+#line 11183 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11347,7 +11286,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11350 "configure"
+#line 11289 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12429,10 +12368,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/moxie/configure b/sim/moxie/configure
index cf51ce0f548..6bf47d4d8a4 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -680,9 +680,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7126,64 +7123,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11233,7 +11172,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11236 "configure"
+#line 11175 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11339,7 +11278,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11342 "configure"
+#line 11281 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12310,10 +12249,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/msp430/configure b/sim/msp430/configure
index f2e49ba6730..14abf9a6ef9 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12229,10 +12168,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/or1k/configure b/sim/or1k/configure
index 8eca2376225..d65e7140e3d 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7138,64 +7135,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11245,7 +11184,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11248 "configure"
+#line 11187 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11351,7 +11290,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11354 "configure"
+#line 11293 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12375,10 +12314,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/pru/configure b/sim/pru/configure
index 853462d64d5..f492aa553b0 100755
--- a/sim/pru/configure
+++ b/sim/pru/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12216,10 +12155,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/riscv/configure b/sim/riscv/configure
index d631f311703..4b4fc6b8db2 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -677,9 +677,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7130,64 +7127,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11237,7 +11176,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11240 "configure"
+#line 11179 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11343,7 +11282,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11346 "configure"
+#line 11285 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12332,10 +12271,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 903ba63a58f..e00d20404f3 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -681,9 +681,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7118,64 +7115,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11225,7 +11164,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11228 "configure"
+#line 11167 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11331,7 +11270,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11334 "configure"
+#line 11273 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12127,10 +12066,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/rx/configure b/sim/rx/configure
index bfb8c79ecfa..4ad5c706464 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -681,9 +681,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7123,64 +7120,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11230,7 +11169,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11233 "configure"
+#line 11172 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11336,7 +11275,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11339 "configure"
+#line 11278 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12172,10 +12111,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/sh/configure b/sim/sh/configure
index 7bde3b270c3..84f33c45134 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -679,9 +679,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7125,64 +7122,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11232,7 +11171,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11174 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11338,7 +11277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11341 "configure"
+#line 11280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12213,10 +12152,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/sim/v850/configure b/sim/v850/configure
index 3f1085fc332..9176b7ff64c 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -677,9 +677,6 @@ INCINTL
LIBINTL_DEP
LIBINTL
USE_NLS
-GMAKE_FALSE
-GMAKE_TRUE
-MAKE
CCDEPMODE
DEPDIR
am__leading_dot
@@ -7131,64 +7128,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi
-# Check for the 'make' the user wants to use.
-for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MAKE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$MAKE" && break
-done
-
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
- *GNU*)
- MAKE_IS_GNU=yes
- ;;
-esac
- if test "$MAKE_IS_GNU" = yes; then
- GMAKE_TRUE=
- GMAKE_FALSE='#'
-else
- GMAKE_TRUE='#'
- GMAKE_FALSE=
-fi
-
-
ALL_LINGUAS=
# If we haven't got the data from the intl directory,
# assume NLS is disabled.
@@ -11238,7 +11177,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11241 "configure"
+#line 11180 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11344,7 +11283,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11347 "configure"
+#line 11286 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12322,10 +12261,6 @@ LTLIBOBJS=$ac_ltlibobjs
-if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
- as_fn_error $? "conditional \"GMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
--
2.26.2
next prev parent reply other threads:[~2021-04-08 20:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 20:33 [PATCH 00/10] sim build improvements Tom Tromey
2021-04-08 20:33 ` [PATCH 01/10] Make mostlyclean an alias for clean Tom Tromey
2021-04-09 0:25 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 02/10] Introduce stamp file for hw-config.h Tom Tromey
2021-04-09 0:25 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 03/10] Add stamp files for generated files in sim/ppc Tom Tromey
2021-04-09 0:25 ` Mike Frysinger
2021-04-08 20:33 ` Tom Tromey [this message]
2021-04-09 0:31 ` [PATCH 04/10] Require GNU make Mike Frysinger
2021-04-09 17:18 ` Tom Tromey
2021-04-09 22:45 ` Mike Frysinger
2021-04-21 23:14 ` Tom Tromey
2021-04-22 3:17 ` Mike Frysinger
2021-04-22 14:14 ` Tom Tromey
2021-04-08 20:33 ` [PATCH 05/10] Remove and modernize dependencies in sim Tom Tromey
2021-04-11 17:50 ` Mike Frysinger
2021-04-22 14:15 ` Tom Tromey
2021-04-23 0:44 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 06/10] Remove INCLUDE variable from some sim Makefiles Tom Tromey
2021-04-09 0:27 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 07/10] Remove LIBS from two " Tom Tromey
2021-04-09 0:27 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 08/10] Define autoconf substitution variables early in Make-common.in Tom Tromey
2021-04-09 0:44 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 09/10] Use prologue and epilogue Makefile fragments Tom Tromey
2021-04-08 20:33 ` [PATCH 10/10] Do not check for sys/time.h or sys/times.h Tom Tromey
2021-04-09 0:35 ` Mike Frysinger
2021-04-09 17:18 ` Tom Tromey
2021-04-09 0:26 ` [PATCH 00/10] sim build improvements Mike Frysinger
2021-04-09 17:14 ` Tom Tromey
2021-04-09 22:27 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210408203312.2938165-5-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).