public inbox for insight@sourceware.org
 help / color / mirror / Atom feed
* Patch for fix tcl/tk/tix compilation with --enable-symbols
@ 2002-09-15 16:23 Mo DeJong
  0 siblings, 0 replies; only message in thread
From: Mo DeJong @ 2002-09-15 16:23 UTC (permalink / raw)
  To: Insight

Here is a patch that fixes up the build when --enable-symbols is passed to
the configure script. This flag tells Tcl, Tk, and other extensions
to compile with symbols enabled. Also note that one must rerun with
autoconf 2.13 in the tix/unix/tk8.3 directory after the patch has
been applied.

(Changelog entry for the tix configure regen)

2002-09-15  Mo DeJong  <supermo@bayarea.net>

	* unix/tk8.3/configure: Regen.

2002-09-15  Mo DeJong  <supermo@bayarea.net>

	* acinclude.m4 (CYG_AC_LOAD_TCLCONFIG, CYG_AC_LOAD_TKCONFIG,
	CYG_AC_LOAD_ITCLCONFIG, CYG_AC_LOAD_ITKCONFIG):
	Subst TCL_LIB_FILE, TCL_LIB_FULL_PATH, TCL_BUILD_LIB_SPEC,
	TCL_LIB_SPEC, TK_BUILD_LIB_SPEC, ITCL_BUILD_LIB_SPEC,
	and ITK_BUILD_LIB_SPEC so that TCL_DBGX does not appear
	in a generated Makefile. This fixes build problems
	that show up when configured with --enable-symbols.

Index: config/acinclude.m4
===================================================================
RCS file: /cvs/src/src/config/acinclude.m4,v
retrieving revision 1.5
diff -u -r1.5 acinclude.m4
--- config/acinclude.m4	22 May 2002 09:21:32 -0000	1.5
+++ config/acinclude.m4	15 Sep 2002 23:11:11 -0000
@@ -1027,13 +1027,20 @@
 AC_DEFUN(CYG_AC_LOAD_TCLCONFIG, [
     . $TCLCONFIG
 
+dnl not used, don't export to save symbols
 dnl AC_SUBST(TCL_VERSION)
 dnl AC_SUBST(TCL_MAJOR_VERSION)
 dnl AC_SUBST(TCL_MINOR_VERSION)
 dnl AC_SUBST(TCL_CC)
     AC_SUBST(TCL_DEFS)
+    AC_SUBST(TCL_DBGX)
+
+dnl eval required to subst TCL_DBGX
+    eval TCL_LIB_FILE=${TCL_LIB_FILE}
+    eval TCL_LIB_FULL_PATH=${TCL_LIB_FULL_PATH}
+    eval TCL_BUILD_LIB_SPEC=\"${TCL_BUILD_LIB_SPEC}\"
+    eval TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"
 
-dnl not used, don't export to save symbols
     AC_SUBST(TCL_LIB_FILE)
     AC_SUBST(TCL_LIB_FULL_PATH)
     AC_SUBST(TCL_LIBS)
@@ -1275,6 +1282,9 @@
 dnl not used, don't export to save symbols
 dnl    AC_SUBST(TK_PREFIX)
 
+dnl eval required to subst TCL_DBGX
+    eval TK_BUILD_LIB_SPEC=\"${TK_BUILD_LIB_SPEC}\"
+
 dnl not used, don't export to save symbols
 dnl    AC_SUBST(TK_EXEC_PREFIX)
     AC_SUBST(TK_BUILD_INCLUDES)
@@ -1825,6 +1835,9 @@
       . $ITCLCONFIG
     fi
 
+dnl eval required to subst TCL_DBGX
+    eval ITCL_BUILD_LIB_SPEC=\"${ITCL_BUILD_LIB_SPEC}\"
+
     AC_SUBST(ITCL_BUILD_LIB_SPEC)
     AC_SUBST(ITCL_SH)
     AC_SUBST(ITCL_LIB_FILE)
@@ -1911,6 +1924,9 @@
     if test -f "$ITKCONFIG" ; then
       . $ITKCONFIG
     fi
+
+dnl eval required to subst TCL_DBGX
+    eval ITK_BUILD_LIB_SPEC=\"${ITK_BUILD_LIB_SPEC}\"
 
     AC_SUBST(ITK_BUILD_LIB_SPEC)
     AC_SUBST(ITK_LIB_FILE)

2002-09-15  Mo DeJong  <supermo@bayarea.net>

	* unix/Makefile.in: Add TCL_DBGX to fix
	Tk library names when configured with
 	the --enable-symbols flag.

Index: tk/unix/Makefile.in
===================================================================
RCS file: /cvs/src/src/tk/unix/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- tk/unix/Makefile.in	10 Jan 2002 20:21:26 -0000	1.5
+++ tk/unix/Makefile.in	15 Sep 2002 23:18:13 -0000
@@ -93,6 +93,7 @@
 
 # Libraries built with optimization switches have this additional extension
 TK_DBGX			= @TK_DBGX@
+TCL_DBGX		= @TCL_DBGX@
 
 # warning flags
 CFLAGS_WARNING		= @CFLAGS_WARNING@

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2002-09-15 23:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-09-15 16:23 Patch for fix tcl/tk/tix compilation with --enable-symbols Mo DeJong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).