This is the mail archive of the
insight@sources.redhat.com
mailing list for the Insight project.
[PATCH] tix build problems
- From: Keith Seitz <keiths at redhat dot com>
- To: Insight Maling List <insight at sources dot redhat dot com>
- Date: Fri, 11 Jan 2002 15:43:37 -0800 (PST)
- Subject: [PATCH] tix build problems
Hi,
Ok, I've sat on this long enough. This patch fixes some build problems
with tix on unix. It is no doubt perfect, but at least this tixsam stuff
now builds (on linux static/shared and on solaris static).
This patch is a little hacky, since TCL_BIN_DIR is really supposed to come
from TCL, but I don't want to mess with Tcl, since we're going to dump tix
as soon as I can build it on cygwin.
Keith
tix/ChangeLog
2002-01-11 Keith Seitz <keiths@redhat.com>
* unix/tk8.3/Makefile.in (RUN_TCLSH): Update with
real name/location of tcl.
* unix/tk8.3/configure.in (TCL_BIN_DIR): Figure out
where tclsh is installed: it's needed by the install
target.
* unix/tk8.3/configure: Regenerated.
Patch
Index: tix/unix/tk8.3/Makefile.in
===================================================================
RCS file: /cvs/src/src/tix/unix/tk8.3/Makefile.in,v
retrieving revision 1.2
diff -p -r1.2 Makefile.in
*** tix/unix/tk8.3/Makefile.in 2001/09/08 23:25:55 1.2
--- tix/unix/tk8.3/Makefile.in 2002/01/11 23:34:20
*************** LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL
*** 85,91 ****
RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
TK_LIBRARY=$(TK_SRC_DIR)/library \
! $(TCL_BIN_DIR)/tclsh
#----------------------------------------------------------------
--- 85,91 ----
RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
TK_LIBRARY=$(TK_SRC_DIR)/library \
! $(TCL_BIN_DIR)/tclsh8.3
#----------------------------------------------------------------
Index: tix/unix/tk8.3/configure.in
===================================================================
RCS file: /cvs/src/src/tix/unix/tk8.3/configure.in,v
retrieving revision 1.2
diff -p -r1.2 configure.in
*** tix/unix/tk8.3/configure.in 2001/09/08 23:25:55 1.2
--- tix/unix/tk8.3/configure.in 2002/01/11 23:34:29
*************** fi
*** 255,260 ****
--- 255,271 ----
TIX_LIB_FULL_PATH="`pwd`/${TIX_LIB_FILE}"
+ # BEGIN RED HAT LOCAL
+ #--------------------------------------------------------------------
+ # Find out where tcl is installed.
+ #--------------------------------------------------------------------
+ if test x"${exec_prefix}" = xNONE; then
+ TCL_BIN_DIR="${prefix}/bin"
+ else
+ TCL_BIN_DIR="${exec_prefix}/bin"
+ fi
+ # END RED HAT LOCAL
+
#--------------------------------------------------------------------
# Check for the existence of the -lsocket and -lnsl libraries.
# The order here is important, so that they end up in the right