Merged changes between child workspace "/home/escoffon/ws/tcl8.0" and

 parent workspace "/ws/tcl8.0".

1 files changed, 41 insertions, 15 deletions

diff --git a/unix/configure.in b/unix/configure.in
index 3a77cb2..21b9867 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -2,7 +2,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# SCCS: @(#) configure.in 1.144 97/11/20 12:39:44
+# SCCS: %Z% $Id: configure.in,v 1.4 1998/07/01 19:17:08 escoffon Exp $ 
 
 TCL_VERSION=8.0
 TCL_MAJOR_VERSION=8
@@ -655,6 +655,8 @@ fullSrcDir=`cd $srcdir; pwd`
 TCL_SHARED_LIB_SUFFIX=""
 TCL_UNSHARED_LIB_SUFFIX=""
 TCL_LIB_VERSIONS_OK=ok
+CFLAGS_DEBUG=-g
+CFLAGS_OPTIMIZE=-O
 case $system in
     AIX-4.[[2-9]])
 	SHLIB_CFLAGS=""
@@ -666,7 +668,7 @@ case $system in
 	LD_FLAGS=""
 	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 	AIX=yes
-	TCL_SHARED_LIB_SUFFIX='${VERSION}.a'
+	TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 	;;
     AIX-*)
 	SHLIB_CFLAGS=""
@@ -677,7 +679,7 @@ case $system in
 	DL_LIBS="-lld"
 	LD_FLAGS=""
 	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	TCL_SHARED_LIB_SUFFIX='${VERSION}.a'
+	TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 	;;
     BSD/OS-2.1*|BSD/OS-3*)
 	SHLIB_CFLAGS=""
@@ -721,7 +723,7 @@ case $system in
 	DL_LIBS=""
 	LD_FLAGS="-Wl,-D,08000000"
 	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	TCL_SHARED_LIB_SUFFIX='${VERSION}.a'
+	TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 	;;
     IRIX-5.*|IRIX-6.*)
 	SHLIB_CFLAGS=""
@@ -793,7 +795,7 @@ case $system in
 	    DL_LIBS=""
 	    LD_FLAGS=""
 	    LD_SEARCH_FLAGS=""
-	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
+	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`\$\{DBGX\}.so.1.0'
 	], [
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
@@ -803,12 +805,12 @@ case $system in
 	    DL_LIBS=""
 	    LD_FLAGS=""
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.a'
+	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`\$\{DBGX\}.a'
 	])
 
 	# FreeBSD doesn't handle version numbers with dots.
 
-	TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.a'
+	TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`\$\{DBGX\}.a'
 	TCL_LIB_VERSIONS_OK=nodots
 	;;
     NEXTSTEP-*)
@@ -903,8 +905,8 @@ case $system in
 	# requires an extra version number at the end of .so file names.
 	# So, the library has to have a name like libtcl75.so.1.0
 
-	TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
-	TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.a'
+	TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`\$\{DBGX\}.so.1.0'
+	TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`\$\{DBGX\}.a'
 	TCL_LIB_VERSIONS_OK=nodots
 	;;
     SunOS-5*)
@@ -1081,6 +1083,18 @@ if test "$DL_OBJS" != "tclLoadNone.o" ; then
     fi
 fi
 
+# Set the default compiler switches based on the --enable-symbols option
+
+AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols],
+    [tcl_ok=$enableval], [tcl_ok=no])
+if test "$tcl_ok" = "yes"; then
+    CFLAGS_DEFAULT=CFLAGS_DEBUG
+    DBGX=g
+else
+    CFLAGS_DEFAULT=CFLAGS_OPTIMIZE
+    DBGX=""
+fi
+
 #--------------------------------------------------------------------
 #	The statements below check for systems where POSIX-style
 #	non-blocking I/O (O_NONBLOCK) doesn't work or is unimplemented. 
@@ -1139,10 +1153,10 @@ esac
 
 realRanlib=$RANLIB
 if test "$TCL_SHARED_LIB_SUFFIX" = "" ; then
-    TCL_SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
+    TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
 fi
 if test "$TCL_UNSHARED_LIB_SUFFIX" = "" ; then
-    TCL_UNSHARED_LIB_SUFFIX='${VERSION}.a'
+    TCL_UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 fi
 AC_ARG_ENABLE(shared,
     [  --enable-shared         build libtcl as a shared library],
@@ -1177,17 +1191,23 @@ else
     MAKE_LIB="ar cr ${TCL_LIB_FILE} \${OBJS}"
 fi
 
+# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
+# so that the backslashes quoting the DBX braces are dropped.
+
+eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
+eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
+
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
 # AIX remembers this path and will attempt to use it at run-time to look
 # up the Tcl library.
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_BUILD_LIB_SPEC="-L`pwd` -ltcl${VERSION}"
-    TCL_LIB_SPEC="-L${exec_prefix}/lib -ltcl${VERSION}"
+    TCL_BUILD_LIB_SPEC="-L`pwd` -ltcl${VERSION}\${DBGX}"
+    TCL_LIB_SPEC="-L${exec_prefix}/lib -ltcl${VERSION}\${DBGX}"
 else
-    TCL_BUILD_LIB_SPEC="-L`pwd` -ltcl`echo ${VERSION} | tr -d .`"
-    TCL_LIB_SPEC="-L${exec_prefix}/lib -ltcl`echo ${VERSION} | tr -d .`"
+    TCL_BUILD_LIB_SPEC="-L`pwd` -ltcl`echo ${VERSION} | tr -d .`\${DBGX}"
+    TCL_LIB_SPEC="-L${exec_prefix}/lib -ltcl`echo ${VERSION} | tr -d .`\${DBGX}"
 fi
 
 #--------------------------------------------------------------------
@@ -1204,6 +1224,12 @@ else
 fi
 
 AC_SUBST(BUILD_DLTEST)
+AC_SUBST(CFLAGS_DEBUG)
+AC_SUBST(CFLAGS_DEFAULT)
+AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
+AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
+AC_SUBST(DBGX)
 AC_SUBST(DL_LIBS)
 AC_SUBST(DL_OBJS)
 AC_SUBST(LD_FLAGS)