* Makefile.in: Use $(objdir)/tcl and $(objdir)/tk if they are

[deliverable/binutils-gdb.git] / gdb / configure.in

diff --git a/gdb/configure.in b/gdb/configure.in
index 31e9adfb45dba6ef2c3ce035c66e988f73efdcdf..4f63e1af4d2b0716510e05dab7c71fe3a0772834 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,6 +1,6 @@
 # This file is a shell script fragment that supplies the information
 # necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
+# script approriate for this directory.  For more information, check
 # any existing configure script.
 
 srcname="GDB"
@@ -49,7 +49,7 @@ i[345]86-sequent-sysv4*) gdb_host=ptx4 ;;
 i[345]86-sequent-sysv*)        gdb_host=ptx ;;
 i[345]86-*-aix*)       gdb_host=i386aix ;;
 i[345]86-*-bsd*)       gdb_host=i386bsd ;;
-i[345]86-*-netbsd*)    gdb_host=i386bsd ;;
+i[345]86-*-netbsd*)    gdb_host=nbsd ;;
 i[345]86-*-go32*)      gdb_host=go32 ;;
 i[345]86-*-linux*)     gdb_host=linux ;;
 i[345]86-*-lynxos*)    gdb_host=i386lynx ;;
@@ -111,6 +111,7 @@ none-*-*)           gdb_host=none ;;
 np1-*-*)               gdb_host=np1 ;;
 
 ns32k-*-mach3*)                gdb_host=mach3 ;;
+ns32k-*-netbsd*)       gdb_host=nbsd ;;
 ns32k-umax-*)          gdb_host=umax ;;
 ns32k-utek-sysv*)      gdb_host=merlin ;;
 
@@ -198,6 +199,7 @@ h8500-*-*)          gdb_target=h8500hms ;;
 sh-*-*)                        gdb_target=sh ;;
 
 hppa*-*-bsd*)          gdb_target=hppabsd ;;
+hppa*-*-pro*)          gdb_target=hppapro ;;
 hppa*-*-hpux*)         gdb_target=hppahpux ;;
 hppa*-*-hiux*)         gdb_target=hppahpux ;;
 hppa*-*-osf*)          gdb_target=hppaosf ;;
@@ -211,7 +213,7 @@ i[345]86-*-coff*)   gdb_target=i386v ;;
 i[345]86-*-elf*)       gdb_target=i386v ;;
 i[345]86-*-aix*)       gdb_target=i386aix ;;
 i[345]86-*-bsd*)       gdb_target=i386bsd ;;
-i[345]86-*-netbsd*)    gdb_target=i386bsd ;;
+i[345]86-*-netbsd*)    gdb_target=nbsd ;;
 i[345]86-*-os9k)       gdb_target=i386os9k ;;
 i[345]86-*-go32*)      gdb_target=i386aout ;;
 i[345]86-*-lynxos*)    gdb_target=i386lynx
@@ -298,6 +300,7 @@ none-*-*)           gdb_target=none ;;
 np1-*-*)               gdb_target=np1 ;;
 
 ns32k-*-mach3*)                gdb_target=mach3 ;;
+ns32k-*-netbsd*)       gdb_target=nbsd ;;
 ns32k-utek-sysv*)      gdb_target=merlin ;;
 ns32k-utek-*)          gdb_target=umax ;;
 
@@ -361,7 +364,7 @@ host_makefile_frag=config/${gdb_host_cpu}/${gdb_host}.mh
 target_makefile_frag=config/${gdb_target_cpu}/${gdb_target}.mt
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
-# (NAT_FILE) is not set in the ?config/* file, we don't make the
+# (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
 # corresponding links.  But we have to remove the xm.h files and tm.h
 # files anyway, e.g. when switching from "configure host" to
 # "configure none".
@@ -370,39 +373,26 @@ files=
 links=
 rm -f xm.h
 if [ "${hostfile}" != "" ]; then
-       if [ -f ${srcdir}/config/${hostfile} ]; then
-               files="${files} config/${hostfile}"
-       else
-               files="${files} config/${gdb_host_cpu}/${hostfile}"
-       fi
+       files="${files} config/${gdb_host_cpu}/${hostfile}"
        links="${links} xm.h"
 fi
 rm -f tm.h
 if [ "${targetfile}" != "" ]; then
-       if [ -f ${srcdir}/config/${targetfile} ]; then
-               files="${files} config/${targetfile}"
-       else
-               files="${files} config/${gdb_target_cpu}/${targetfile}"
-       fi
+       files="${files} config/${gdb_target_cpu}/${targetfile}"
        links="${links} tm.h"
 fi
 rm -f nm.h
 if [ "${nativefile}" != "" ]; then
-       if [ -f ${srcdir}/config/${nativefile} ]; then
-               files="${files} config/${nativefile}"
-       else
-               files="${files} config/${gdb_host_cpu}/${nativefile}"
-       fi
+       files="${files} config/${gdb_host_cpu}/${nativefile}"
        links="${links} nm.h"
-# temporary scaffolding until all hosts have the host/target/native
-# split in place.
 else
-       files="${files} config/nm-trash.h"
+       # A cross-only configuration.
+       files="${files} config/nm-empty.h"
        links="${links} nm.h"
 fi
 
 # Make it possible to use the GUI without doing a full install
-if [ "${enable_gdbtk}" = "yes" ] ; then
+if [ "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ] ; then
        files="${files} gdbtk.tcl"
        links="${links} gdbtk.tcl"
 fi
@@ -427,7 +417,7 @@ if [ "${enable_gdbtk}" = "yes" ] ; then
        sed -e '/# End of host and/i\
 \
 ENABLE_DEPFILES = gdbtk.o\
-ENABLE_CLIBS = -ltcl -ltk -lX11 -lm
+ENABLE_CLIBS = $(TCL) $(TK) -lX11 -lm
 ' < Makefile > Makefile.tem
        mv -f Makefile.tem Makefile
 fi