From e15b2e8691cb26b7ecf8b7ea3d52e508c3be6625 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 28 Feb 2022 23:32:12 -0500
Subject: [PATCH] newlib: drop redundant AM_MAINTAINER_MODE call

This is already called earlier in this file, so no need to do it again.
---
 newlib/acinclude.m4 |  4 +---
 newlib/configure    | 28 ----------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 60fe6ca74..424460dc7 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -115,7 +115,7 @@ AC_SUBST(abs_newlib_basedir)
 AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([foreign no-installinfo no-dependencies no-dist no-define subdir-objects 1.15.1])
-AM_MAINTAINER_MODE()
+AM_MAINTAINER_MODE
 AM_SILENT_RULES(yes)
 
 AC_NO_EXECUTABLES
@@ -132,8 +132,6 @@ dnl expanding them multiple times.
 AC_REQUIRE([AC_PROG_INSTALL])dnl
 AC_REQUIRE([AC_PROG_AWK])dnl
 
-AM_MAINTAINER_MODE
-
 . [$]{newlib_basedir}/configure.host
 
 NEWLIB_CFLAGS=${newlib_cflags}
diff --git a/newlib/configure b/newlib/configure
index 4a145c8ba..993abcafa 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -4682,30 +4682,6 @@ fi
 
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-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
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$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
-
-
-
 . ${newlib_basedir}/configure.host
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -6633,10 +6609,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5