From c322646257db069b29503848268d49d7e5ea85b1 Mon Sep 17 00:00:00 2001
From: Bruce Korb <bkorb@gnu.org>
Date: Sat, 19 May 2001 22:43:38 +0000
Subject: [PATCH] Do not use two warnings when one will do

From-SVN: r42323
---
 gcc/ChangeLog       |  4 ++++
 gcc/fixinc/genfixes | 18 +++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e2e2abaada..5998040f16a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-19  Bruce Korb  <bkorb@gnu.org>
+
+	* fixinc/genfixes: no need for two warnings
+
 2001-05-19  Mark Mitchell  <mark@codesourcery.com>
 
 	* jump.c (jump_optimize_1): Tidy.
diff --git a/gcc/fixinc/genfixes b/gcc/fixinc/genfixes
index d556de6a6ff..a47e091db7a 100755
--- a/gcc/fixinc/genfixes
+++ b/gcc/fixinc/genfixes
@@ -66,25 +66,17 @@ fi
 AG="autogen $AG"
 set -e
 
-if [ -z "`${AG} -v | fgrep 'Ver. 5.'`" ]
-then
-  echo "Your AutoGen is either out of date or not available" >&2
-  echo "Please get AutoGen5 from ftp.gnu.org/gnu/autogen" >&2
-  touch $@
-  exit 0
-fi
-
 case "$1" in
 fixincl.x | */fixincl.x )
-  if (${AG} --help > /dev/null 2>&1)
+  if [ -z "`${AG} -v | fgrep 'Ver. 5.'`" ]
   then
-    echo AutoGen-ing fixincl.x
-    $AG inclhack.def
-  else
-    echo "AutoGen does not appear to be correctly installed."
+    echo "AutoGen appears to be out of date or not correctly installed."
     echo "Please download and install:"
     echo "   ftp://gcc.gnu.org/pub/gcc/infrastructure/autogen.tar.gz"
     touch fixincl.x
+  else
+    echo AutoGen-ing fixincl.x
+    $AG inclhack.def
   fi
   ;;
 
-- 
2.30.2