From a9924149bcbcc61504d8c51ef6069f831f931a84 Mon Sep 17 00:00:00 2001
From: neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 26 Feb 2004 23:27:53 +0000
Subject: [PATCH] * Makefile.am: Remove bogus duplicate setting of
AM_CFLAGS. * Makefile.in: Regenerate.
* configure.in: Remove bogus duplicate invocation of
AM_MAINTAINER_MODE. Remove obsolete comment.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78529 138bc75d-0d04-0410-961f-82ee72b054a4
---
boehm-gc/ChangeLog | 7 +++++++
boehm-gc/Makefile.am | 2 --
boehm-gc/Makefile.in | 1 -
boehm-gc/configure | 24 ------------------------
boehm-gc/configure.in | 3 ---
5 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 6324b0a29c58..112bc0cfcb40 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,5 +1,12 @@
2004-02-26 Nathanael Nerode <neroden@gcc.gnu.org>
+ * Makefile.am: Remove bogus duplicate setting of AM_CFLAGS.
+ * Makefile.in: Regenerate.
+
+ * configure.in: Remove bogus duplicate invocation of
+ AM_MAINTAINER_MODE. Remove obsolete comment.
+ * configure: Regenerate.
+
* acinclude.m4: Remove GC_CONFIGURE macro; move contents
to configure.in.
* aclocal.m4: Regenerate.
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index f169c4fe83b2..286a34c5a788 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -90,8 +90,6 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
-AM_CFLAGS = @GC_CFLAGS@
-
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and
# friends when we are called from the top level Makefile.
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 1abd33b8ed4e..b64617c036c7 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -154,7 +154,6 @@ libgcjgc_convenience_la_LIBADD = @addobjs@
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
AM_CXXFLAGS = @GC_CFLAGS@
-
AM_CFLAGS = @GC_CFLAGS@
check_PROGRAMS = gctest
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 8033dd55f1fc..c6e2ebb802bd 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -4700,30 +4700,6 @@ if test "${with_cross_host+set}" = set; then
fi;
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
- USE_MAINTAINER_MODE=$enableval
-else
- USE_MAINTAINER_MODE=no
-fi;
- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-
-if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
-fi
- MAINT=$MAINTAINER_MODE_TRUE
-
-
-
echo "$as_me:$LINENO: checking for thread model used by GCC" >&5
echo $ECHO_N "checking for thread model used by GCC... $ECHO_C" >&6
THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index 0ab5a84a3793..81f00f270c1b 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -24,7 +24,6 @@ AC_INIT(gcj_mlc.c)
# exported.
ORIGINAL_LD_FOR_MULTILIBS=$LD
-dnl Can't be done in GC_CONFIGURE because that confuses automake.
AC_CONFIG_AUX_DIR(.)
dnl Default to --enable-multilib
@@ -124,8 +123,6 @@ AC_ARG_WITH(target-subdir,
AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler])
-AM_MAINTAINER_MODE
-
AC_MSG_CHECKING([for thread model used by GCC])
THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
if test -z "$THREADS"; then
--
GitLab