* configure: Regenerated.

        * configure.in (LIBS): Re-reverse order of TCL_LIBS and TK_LIBS.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 16d246fadc46a982dba0d896af0bed115f3e9c71..8e8265d165ad632865067a5e6a7c81d6cbc6384b 100644 (file)
--- 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 f5755708551afa66df787a500c1015426aace05b..a3e5b3212c3dfd871f2630ff5499a74d5752400a 100755 (executable)
--- 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 c03b189e94b8bf9e164dad2d86e654fc48023c37..2498c1e2e815bf6fc20ae8df0b0c266593f6e171 100644 (file)
--- 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