From 1ffc5c6e21af08111f4565a835b9aa878ca81f29 Mon Sep 17 00:00:00 2001
From: Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
Date: Tue, 13 Feb 2001 13:00:04 +0000
Subject: [PATCH] configure.in: Use "have_gnat" variable, not "gnat".

	* configure.in: Use "have_gnat" variable, not "gnat".
	* configure: Regenerated.

From-SVN: r39632
---
 gcc/ChangeLog    |  3 +++
 gcc/configure    | 20 ++++++++++----------
 gcc/configure.in |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 776b9958e2b..456841fba3b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Tue Feb 13 07:52:04 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
+	* configure.in: Use "have_gnat" variable, not "gnat".
+	* configure: Regenerated.
+
 	* config/sparc/sparc.c (function_value): Treat all non-record
 	aggregate types like used to treat UNION_TYPE.
 
diff --git a/gcc/configure b/gcc/configure
index 2fa46112e26..c5c9b02f717 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -2207,28 +2207,28 @@ fi
 set dummy gnatbind; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:2210: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnat'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_prog_have_gnat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$gnat"; then
-  ac_cv_prog_gnat="$gnat" # Let the user override the test.
+  if test -n "$have_gnat"; then
+  ac_cv_prog_have_gnat="$have_gnat" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_gnat="yes"
+      ac_cv_prog_have_gnat="yes"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_gnat" && ac_cv_prog_gnat="no"
+  test -z "$ac_cv_prog_have_gnat" && ac_cv_prog_have_gnat="no"
 fi
 fi
-gnat="$ac_cv_prog_gnat"
-if test -n "$gnat"; then
-  echo "$ac_t""$gnat" 1>&6
+have_gnat="$ac_cv_prog_have_gnat"
+if test -n "$have_gnat"; then
+  echo "$ac_t""$have_gnat" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -6475,7 +6475,7 @@ do
 	  if test x"${add_this_lang}" = xyes; then
 		case $lang in
 		    ${srcdir}/ada/config-lang.in)
-			if test x$gnat = xyes ; then
+			if test x$have_gnat = xyes ; then
 				subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
 			fi
 			;;
@@ -7021,7 +7021,7 @@ s%@INSTALL@%$INSTALL%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@CPP@%$CPP%g
-s%@gnat@%$gnat%g
+s%@have_gnat@%$have_gnat%g
 s%@have_mktemp_command@%$have_mktemp_command%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@BUILD_INFO@%$BUILD_INFO%g
diff --git a/gcc/configure.in b/gcc/configure.in
index 1ad41a6b474..52207e63456 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -433,7 +433,7 @@ AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])
 AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
 
 # See if GNAT has been installed
-AC_CHECK_PROG(gnat, gnatbind, yes, no)
+AC_CHECK_PROG(have_gnat, gnatbind, yes, no)
 
 # See if we have the mktemp command.
 AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
@@ -1520,7 +1520,7 @@ changequote(,)dnl
 	  if test x"${add_this_lang}" = xyes; then
 		case $lang in
 		    ${srcdir}/ada/config-lang.in)
-			if test x$gnat = xyes ; then
+			if test x$have_gnat = xyes ; then
 				subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
 			fi
 			;;
-- 
2.30.2