Look for -ldl or -ldld where needed by Tcl 7.5.

Updated copyrights.
Close backquote in 'lint' target.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1cbdf9b0543951aab48bd8485add38f205aa44aa..9762be15666e472361a6f85dcd63761fb9430304 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+Wed Jan 24 15:42:24 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * Makefile.in (lint): Close backquotes.
+
+start-sanitize-gdbtk
+Wed Jan 24 15:28:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * gdbtk.tcl, gdbtk.c: Updated copyrights.
+
+       * configure.in: Look for -ldl or -ldld when using Tcl 7.5 or
+       greater.
+       * configure: Rebuilt.
+
+end-sanitize-gdbtk     
 Wed Jan 24 13:19:10 1996  Fred Fish  <fnf@cygnus.com>
 
        * NEWS: Make note of new record and replay feature for

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 975eeda2d9b4e3763a4f32e726f243ccabe69720..6dbfdd276ea2ccd9b74a7d5e57d424c805c14e24 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -845,7 +845,7 @@ m2-exp.tab.c: m2-exp.y
 
 lint: $(LINTFILES)
        $(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
-          `echo $(DEPFILES) | sed 's/\.o /\.c /g'
+          `echo $(DEPFILES) | sed 's/\.o /\.c /g'`
 
 gdb.cxref: $(SFILES)
        cxref -I. $(SFILES) >gdb.cxref

diff --git a/gdb/configure b/gdb/configure
index 46d25f3abcadb958dced04a551c4d81dee519b8e..b95962d2eb5ad35c17ce03b4e3f34352648fa152 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -1404,7 +1404,7 @@ ENABLE_GM=
 if test "${enable_gm+set}" = set; then
   enableval="$enable_gm"
   case "${enableval}" in
-yes)   ENABLE_OBS="${ENABLE_OBS} magic.o"
+yes)   ENABLE_OBS="${ENABLE_OBS} gmagic.o"
        ENABLE_CFLAGS=-DGENERAL_MAGIC
        ;;
 no)    ;;
@@ -2581,6 +2581,93 @@ fi
 
 
 
+    # Look for dynamic linking libraries that Tcl might need.  This is
+    # only done for Tcl 7.5 and greater.  It would be good to look for and
+    # use the "configInfo" file that Tcl generates, but for now that is
+    # beyond us.
+    if test $tclmajor -ge 7 -a $tclminor -ge 5 ; then
+       echo $ac_n "checking for -ldl""... $ac_c" 1>&6
+ac_lib_var=`echo dl | tr '.-/+' '___p'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2598 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+main()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for -ldld""... $ac_c" 1>&6
+ac_lib_var=`echo dld | tr '.-/+' '___p'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldld  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2636 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+main()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldld $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+    fi
+
     ENABLE_GDBTK=1
 
     if test "x$no_x" != "xyes"; then

diff --git a/gdb/configure.in b/gdb/configure.in
index b21544599f0e5302d9cf6477291ff2368d5d5aaa..e17dc09f4c818d8d33d6c5fdf84023a6dd688723 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -118,6 +118,14 @@ if test "${enable_gdbtk}" = "yes"; then
     CY_AC_PATH_TCL
     CY_AC_PATH_TK
 
+    # Look for dynamic linking libraries that Tcl might need.  This is
+    # only done for Tcl 7.5 and greater.  It would be good to look for and
+    # use the "configInfo" file that Tcl generates, but for now that is
+    # beyond us.
+    if test $tclmajor -ge 7 -a $tclminor -ge 5 ; then
+       AC_CHECK_LIB(dl, main, , AC_CHECK_LIB(dld, main))
+    fi
+
     ENABLE_GDBTK=1
 
     if test "x$no_x" != "xyes"; then

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index aaf919344bf008bc185d23a9b9b950cf60b281cf..31903f24553bd0ca4067fb371462729def79898e 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -1,5 +1,5 @@
 /* Tcl/Tk interface routines.
-   Copyright 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1996 Free Software Foundation, Inc.
 
    Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
 

diff --git a/gdb/gdbtk.tcl b/gdb/gdbtk.tcl
index c7b4ec12511929135df79a943525e1a63a9dd465..5ec2fb4837cf28258153d9eabdb743c4e96534b6 100644 (file)
--- a/gdb/gdbtk.tcl
+++ b/gdb/gdbtk.tcl
@@ -1,5 +1,5 @@
 # GDB GUI setup for GDB, the GNU debugger.
-# Copyright 1994, 1995
+# Copyright 1994, 1995, 1996
 # Free Software Foundation, Inc.
 
 # Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.