aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>1997-03-14 17:16:43 +0000
committerTom Tromey <tromey@redhat.com>1997-03-14 17:16:43 +0000
commit469640865ddced25eedd80f6d553e0d355cd6564 (patch)
treef14d9ff433af4c1e1f20c7e88b603be7e056e397
parentf3120217c8f675fbf0498a20f4b76ef60071a2da (diff)
downloadgdb-469640865ddced25eedd80f6d553e0d355cd6564.zip
gdb-469640865ddced25eedd80f6d553e0d355cd6564.tar.gz
gdb-469640865ddced25eedd80f6d553e0d355cd6564.tar.bz2
* configure: Regenerated.
* configure.in (LIBS): Re-reverse order of TCL_LIBS and TK_LIBS.
-rw-r--r--gdb/ChangeLog8
-rwxr-xr-xgdb/configure5
-rw-r--r--gdb/configure.in5
3 files changed, 15 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 16d246f..8e8265d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+start-sanitize-gdbtk
+Fri Mar 14 10:01:29 1997 Tom Tromey <tromey@cygnus.com>
+
+ * configure: Regenerated.
+ * configure.in (LIBS): Re-reverse order of TCL_LIBS and TK_LIBS.
+
+end-sanitize-gdbtk
Thu Mar 13 22:51:00 1997 Dawn Perchik <dawn@cygnus.com>
* utils.c(pollquit, notice_quit): If _WIN32, limit test for cntl-C
@@ -5,7 +12,6 @@ Thu Mar 13 22:51:00 1997 Dawn Perchik <dawn@cygnus.com>
(initialize_utils): If _WIN32, don't call ScreenRows and ScreenCols
except under wingdb. (Contributed by Martin Hunt).
-
Thu Mar 13 12:40:49 1997 Tom Tromey <tromey@cygnus.com>
* configure: Regenerated.
diff --git a/gdb/configure b/gdb/configure
index f575570..a3e5b32 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -2917,7 +2917,10 @@ fi
# Include some libraries that Tcl and Tk want.
TCL_LIBS='$(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
- LIBS="${LIBS} ${TK_LIBS} ${TCL_LIBS}"
+ # Yes, the ordering seems wrong here. But it isn't.
+ # TK_LIBS is the list of libraries that need to be linked
+ # after Tcl/Tk.
+ LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
fi
fi
diff --git a/gdb/configure.in b/gdb/configure.in
index c03b189..2498c1e 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -294,7 +294,10 @@ if test "${enable_gdbtk}" = "yes"; then
# Include some libraries that Tcl and Tk want.
TCL_LIBS='$(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
- LIBS="${LIBS} ${TK_LIBS} ${TCL_LIBS}"
+ # Yes, the ordering seems wrong here. But it isn't.
+ # TK_LIBS is the list of libraries that need to be linked
+ # after Tcl/Tk.
+ LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
fi
fi