diff --git a/libada/ChangeLog b/libada/ChangeLog
index 796a3e4ba8f90dbed6954d487f19d0ad07d6279f..02abac72fc6dcecd3bbbbcf37bd300e20465c5b6 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.ac: Fix stupid brain-fade; set default_gnattools_target
+	correctly.
+	* configure: Regenerate.
+
 2004-04-19  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* Makefile.in: Revert most of Arnaud's last change.  Prefer anything
diff --git a/libada/configure b/libada/configure
index b5e1827717ecb6f34a185237ec5dc61f8126e0cc..1d5e30da9d56a5642a94de5cab7651b8f7c1f2f7 100755
--- a/libada/configure
+++ b/libada/configure
@@ -1556,13 +1556,19 @@ if test $build = $target \
    && test ${enable_shared} = yes ; then
   # Note that build=target is almost certainly the wrong test; FIXME
   default_gnatlib_target="gnatlib-shared"
-  default_gnattools_target="gnattools-cross"
 else
   default_gnatlib_target="gnatlib-plain"
-  default_gnattools_target="gnattools-native"
 fi
 
 
+# Determine what to build for 'gnattools'
+if test $build = $target ; then
+  # Note that build=target is almost certainly the wrong test; FIXME
+  default_gnattools_target="gnattools-native"
+else
+  default_gnattools_target="gnattools-cross"
+fi
+
 
 # Output: create a Makefile.
           ac_config_files="$ac_config_files Makefile"
diff --git a/libada/configure.ac b/libada/configure.ac
index eaa50b8644182050132a5bdb8b1b983bd0b8e696..1b52698cd7ae6a1273b0249e2e6547a9dd0917e0 100644
--- a/libada/configure.ac
+++ b/libada/configure.ac
@@ -81,12 +81,18 @@ if test $build = $target \
    && test ${enable_shared} = yes ; then
   # Note that build=target is almost certainly the wrong test; FIXME
   default_gnatlib_target="gnatlib-shared"
-  default_gnattools_target="gnattools-cross"
 else
   default_gnatlib_target="gnatlib-plain"
-  default_gnattools_target="gnattools-native"
 fi
 AC_SUBST([default_gnatlib_target])
+
+# Determine what to build for 'gnattools'
+if test $build = $target ; then
+  # Note that build=target is almost certainly the wrong test; FIXME
+  default_gnattools_target="gnattools-native"
+else
+  default_gnattools_target="gnattools-cross"
+fi
 AC_SUBST([default_gnattools_target])
 
 # Output: create a Makefile.