configure: move some logic to configure.in

* configure: move some logic to configure.in
* configure.in: move some logic from configure

From-SVN: r53432

diff --git a/ChangeLog b/ChangeLog
index a13825e13d8e90c0e5ce64cf498794307bffa739..7ea9f1e8e747ee90a0499cbbf008670eae565327 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
+
+       * configure: move some logic to configure.in
+       * configure.in: move some logic from configure
+
 2002-05-11  Tom Tromey  <tromey@redhat.com>
 
        * MAINTAINERS: Reflect libgcj reality.

diff --git a/configure b/configure
index 8c6870a222d4ec588f629fe5a64663ec97834c70..8a130bdb7af8891f2ec911bec1d7b4885b48b717 100755 (executable)
--- a/configure
+++ b/configure
@@ -89,7 +89,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.39 $"
+version="$Revision: 1.40 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
@@ -1072,22 +1072,6 @@ export CXX
 export CFLAGS
 export CXXFLAGS
 
-# FIXME: This should be in configure.in, not configure
-case "$host" in
-       *go32*)
-           enable_gdbtk=no ;;
-       *msdosdjgpp*)
-           enable_gdbtk=no ;;
-esac
-
-# FIXME: This should be in configure.in, not configure
-# Determine whether gdb needs tk/tcl or not.
-if [ "$enable_gdbtk" != "no" ]; then
-       GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui"
-else
-       GDB_TK=""
-fi
-
 all_build_modules=
 if test x"${build_alias}" != x"${host_alias}"
 then

diff --git a/configure.in b/configure.in
index 2569cc2ecfc00d05176969333f8f221f3ae85de9..5b13cd4a9849054a11ae0dd640371f64e99b8a68 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1319,6 +1319,18 @@ if test -n "${target_makefile_frag}" ; then
   target_makefile_frag=mt-frag
 fi
 
+case "$host" in
+  *msdosdjgpp*)
+    enable_gdbtk=no ;;
+esac
+# Determine whether gdb needs tk/tcl or not.
+case "$enable_gdbtk" in
+  no)
+    GDB_TK="" ;;
+  *)
+    GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" ;;
+esac
+
 # post-target:
 
 # Make sure that the compiler is able to generate an executable.  If it