Make all-gdb include all-tcl/all-tk unless gdbtk is not built.

diff --git a/ChangeLog b/ChangeLog
index b17dc0e274b1becc913c42c980bdb451fd8322a1..23634503ee345a40ce07d1e16cc6b4130db15123 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan  6 07:23:33 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
+
+       * Makefile.in (all-gdb): Depend on $(GDB_TK).
+       * configure (GDB_TK): Set GDB_TK to either "all-tcl all-tk" or
+       nothing depending on whether gdbtk is being built.
+
 Wed Jan  3 17:54:41 1996  Doug Evans  <dje@canuck.cygnus.com>
 
        * Makefile.in (newlib.tar.gz): Delete building of newlib's info files.

diff --git a/Makefile.in b/Makefile.in
index d3c3c75b4eccd11dc14787d7ad522d7c5876d46d..53ee13310ea1376f3a373e00b29362c70b9f4061 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1082,7 +1082,8 @@ all-gawk:
 ALL_GCC = all-gcc
 all-gcc: all-libiberty all-byacc all-binutils all-gas all-ld
 all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld
-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements)
+GDB_TK = all-tk all-tcl
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
 all-gprof: all-libiberty all-bfd
 all-grep: all-libiberty
 all-grez: all-libiberty all-bfd

diff --git a/configure b/configure
index b8a2aef95abb926de8600e771c743631baf31d1b..a7f583c523895bb5666c10111fa71ecc74b1be7d 100755 (executable)
--- a/configure
+++ b/configure
@@ -141,7 +141,7 @@ do
                ;;
 # These options have mandatory values.  Since we didn't find an = sign,
 # the value must be in the next argument
-       --b* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-*)
+       --bu* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-* | --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
                optarg=$1
                shift
                arguments="$arguments $option=$optarg"
@@ -157,7 +157,7 @@ do
 # Now, process the options
        case $option in
 
-       --build* | --b*)
+       --build* | --bu*)
                case "$build_alias" in
                "") build_alias=$optarg ;;
                *) echo '***' Can only configure for one build machine at a time.  1>&2
@@ -285,6 +285,9 @@ do
                ;;
        --x-i* | --x-l*) other_options="$other_options $orig_option"
                ;;
+       --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
+               # These options were added to autoconf for emacs.
+               ;;
        --*)
                echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
                exit 1
@@ -796,6 +799,18 @@ fi
 export CC
 export CXX
 
+case "$host" in
+       *go32*)
+           enable_gdbtk=no ;;
+esac
+
+# Determine whether gdb needs tk/tcl or not.
+if [ "$enable_gdbtk" != "no" ]; then
+       GDB_TK="all-tcl all-tk"
+else
+       GDB_TK=""
+fi
+
 for subdir in . ${subdirs} ; do
 
     # ${subdir} is relative path from . to the directory we're currently
@@ -1060,6 +1075,7 @@ EOF
                        s%^CXX[         ]*=.*$%CXX = ${CXX}%
                        }" \
                    -e "s:^SHELL[        ]*=.*$:SHELL = ${config_shell}:" \
+                   -e "s:^GDB_TK[       ]*=.*$:GDB_TK = ${GDB_TK}:" \
                     -e "s:^srcdir[     ]*=.*$:srcdir = ${makesrcdir}:" \
                     -e "s/\f//" \
                     -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \