diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.in | 12 |
3 files changed, 18 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index a13825e13d8..7ea9f1e8e74 100644 --- 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 8c6870a222d..8a130bdb7af 100755 --- 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 2569cc2ecfc..5b13cd4a984 100644 --- 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 |