- To: gdb-patches <gdb-patches at sources dot redhat dot com>
- Subject: [RFA] Dependency of gdb on tcl/tk
- From: "John R. Moore" <jmoore at redhat dot com>
- Date: Thu, 26 Jul 2001 15:17:11 -0700 (PDT)
This was tested on RH-7.1 Linux using gcc version 2.96-gnupro-00r1
as well as on CYGWIN_NT-5.0 also using gnupro-00r1.
2001-07-26 John R. Moore <jmoore@redhat.com>
* configure.in: Added dependency of gdb on tcl/tk libraries.
* Makefile.in: Likewise.
* configure: Regenerated with the above using autoconf.
Index: gdb/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.104
diff -p -u -r1.104 Makefile.in
--- gdb/Makefile.in 2001/07/22 12:41:49 1.104
+++ gdb/Makefile.in 2001/07/26 18:36:24
@@ -229,7 +229,7 @@ LIB_INSTALL_DIR = $(libdir)
LIB_RUNTIME_DIR = $(libdir)
TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_BUILD_LIB_SPEC@
TCL_CFLAGS = @TCLHDIR@
-TCL_DEPS =
+TCL_DEPS = @TCL_DEPS@
GDBTKLIBS = @GDBTKLIBS@
# Extra flags that the GDBTK files need:
GDBTK_CFLAGS = @GDBTK_CFLAGS@
@@ -237,7 +237,7 @@ GDBTK_CFLAGS = @GDBTK_CFLAGS@
# Where is the TK library? Typically in ../tk.
TK = @TK_BUILD_LIB_SPEC@
TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
-TK_DEPS =
+TK_DEPS = @TK_DEPS@
# Where is Itcl? Typically in ../itcl/itcl.
ITCL_CFLAGS = @ITCLHDIR@
Index: gdb/configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.67
diff -p -u -r1.67 configure.in
--- gdb/configure.in 2001/07/23 19:21:51 1.67
+++ gdb/configure.in 2001/07/26 18:36:51
@@ -929,6 +929,19 @@ if test "${enable_gdbtk}" = "yes"; then
CY_AC_LOAD_TCLCONFIG
CY_AC_PATH_TKCONFIG
+ # now look for Tcl library stuff
+
+ case "${host}" in
+ *-*-cygwin*)
+ tcldir=../tcl/win/
+ ;;
+ *)
+ tcldir=../tcl/unix/
+ ;;
+ esac
+
+ TCL_DEPS="${tcldir}${TCL_LIB_FILE}"
+
# If $no_tk is nonempty, then we can't do Tk, and there is no
# point to doing Tcl.
if test -z "${no_tk}"; then
@@ -939,6 +952,20 @@ if test "${enable_gdbtk}" = "yes"; then
CY_AC_PATH_ITKH
CY_AC_PATH_TIXH
+
+ # now look for Tk library stuff
+
+ case "${host}" in
+ *-*-cygwin*)
+ tkdir=../tk/win/
+ ;;
+ *)
+ tkdir=../tk/unix/
+ ;;
+ esac
+
+ TK_DEPS="${tkdir}${TK_LIB_FILE}"
+
# now look for Itcl library stuff
CY_AC_PATH_ITCLCONFIG
@@ -1026,6 +1053,8 @@ fi
AC_SUBST(X_CFLAGS)
AC_SUBST(X_LDFLAGS)
AC_SUBST(X_LIBS)
+AC_SUBST(TCL_DEPS)
+AC_SUBST(TK_DEPS)
AC_SUBST(ITCLLIB)
AC_SUBST(ITCL_DEPS)
AC_SUBST(ITKLIB)
-------------------------------