- added support for configuration of debug/nodebug in configure script.

- also added a atring to append to generated libraries when built with
symbols.

2 files changed, 24 insertions, 6 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 93f8c2b..ce8cfd9 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -71,9 +71,19 @@ MAN3_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man3
 # Tcl commands:
 MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
 
-# To change the compiler switches, for example to change from -O
-# to -g, change the following line:
-CFLAGS = -O
+# Libraries built with optimization switches have this additional extension
+DBGX =			@DBGX@
+
+# The default switches for optimization or debugging
+CFLAGS_DEBUG =		@CFLAGS_DEBUG@
+CFLAGS_OPTIMIZE =	@CFLAGS_OPTIMIZE@
+
+# To change the compiler switches, for example to change from optimization to
+# debugging symbols, change the following line:
+#CFLAGS = 		$(CFLAGS_DEBUG)
+#CFLAGS = 		$(CFLAGS_OPTIMIZE)
+#CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+CFLAGS = 		$(@CFLAGS_DEFAULT@)
 
 # To disable ANSI-C procedure prototypes reverse the comment characters
 # on the following lines:
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index 905aa84..2042389 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -9,7 +9,7 @@
 #
 # The information in this file is specific to a single platform.
 #
-# SCCS: @(#) tclConfig.sh.in 1.20 97/07/01 11:40:19
+# SCCS: %Z% $Id: tclConfig.sh.in,v 1.2 1998/07/01 18:02:01 escoffon Exp $ 
 
 # Tcl's version number.
 TCL_VERSION='@TCL_VERSION@'
@@ -23,6 +23,14 @@ TCL_CC='@CC@'
 # -D flags for use with the C compiler.
 TCL_DEFS='@DEFS@'
 
+# If TCL was built with debugging symbols, generated libraries contain
+# this string at the end of the library name (before the extension).
+TCL_DBGX=@DBGX@
+
+# Default flags used in an optimized and debuggable build, respectively.
+TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
+TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
+
 # Flag, 1: we built a shared lib, 0 we didn't
 TCL_SHARED_BUILD=@TCL_SHARED_BUILD@
 
@@ -94,13 +102,13 @@ TCL_LIB_VERSIONS_OK='@TCL_LIB_VERSIONS_OK@'
 # extension, and anything else needed).  May depend on the variables
 # VERSION and SHLIB_SUFFIX.  On most UNIX systems this is
 # ${VERSION}${SHLIB_SUFFIX}.
-TCL_SHARED_LIB_SUFFIX='@TCL_SHARED_LIB_SUFFIX@'
+TCL_SHARED_LIB_SUFFIX='@CFG_TCL_SHARED_LIB_SUFFIX@'
 
 # String that can be evaluated to generate the part of an unshared library
 # name that comes after the "libxxx" (includes version number, if any,
 # extension, and anything else needed).  May depend on the variable
 # VERSION.  On most UNIX systems this is ${VERSION}.a.
-TCL_UNSHARED_LIB_SUFFIX='@TCL_UNSHARED_LIB_SUFFIX@'
+TCL_UNSHARED_LIB_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@'
 
 # Location of the top-level source directory from which Tcl was built.
 # This is the directory that contains a README file as well as