Updated to reflect recent changes in tcl.m4

2 files changed, 24 insertions, 14 deletions

diff --git a/unix/aclocal.m4 b/unix/aclocal.m4
index 975a6b5..828dfd7 100644
--- a/unix/aclocal.m4
+++ b/unix/aclocal.m4
@@ -1170,7 +1170,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
     fullSrcDir=`cd $srcdir; pwd`
     EXTRA_CFLAGS=""
     TCL_EXPORT_FILE_SUFFIX=""
-    TCL_UNSHARED_LIB_SUFFIX=""
+    UNSHARED_LIB_SUFFIX=""
     TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
@@ -1257,7 +1257,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	    DL_LIBS=""
 	    LD_FLAGS="-Wl,-D,08000000"
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	    TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 	    ;;
 	IRIX-5.*|IRIX-6.*|IRIX64-6.5*)
 	    SHLIB_CFLAGS=""
@@ -1343,7 +1343,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 		DL_LIBS=""
 		LD_FLAGS=""
 		LD_SEARCH_FLAGS=""
-		TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
 	    ], [
 		SHLIB_CFLAGS=""
 		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
@@ -1353,12 +1353,12 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 		DL_LIBS=""
 		LD_FLAGS=""
 		LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-		TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 	    ])
 
 	    # FreeBSD doesn't handle version numbers with dots.
 
-	    TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	FreeBSD-*)
@@ -1468,8 +1468,8 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	    # 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='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-	    TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	SunOS-5.[[0-6]]*)
@@ -1684,6 +1684,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	fi
     fi
 
+    if test "$SHARED_LIB_SUFFIX" = "" ; then
+	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
+    fi
+    if test "$UNSHARED_LIB_SUFFIX" = "" ; then
+	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+    fi
+
     AC_SUBST(DL_LIBS)
     AC_SUBST(CFLAGS_DEBUG)
     AC_SUBST(CFLAGS_OPTIMIZE)
diff --git a/unix/configure.in b/unix/configure.in
index 9ca62e1..09ff608 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.35 1999/06/15 22:23:19 wart Exp $
+# RCS: @(#) $Id: configure.in,v 1.36 1999/06/16 02:35:54 wart Exp $
 
 TK_VERSION=8.1
 TK_MAJOR_VERSION=8
@@ -334,12 +334,15 @@ SC_BUGGY_STRTOD
 
 SC_ENABLE_SHARED
 
-if test "$TK_SHARED_LIB_SUFFIX" = "" ; then
-    TK_SHARED_LIB_SUFFIX='${VERSION}\$\{TK_DBGX\}${SHLIB_SUFFIX}'
-fi
-if test "$TK_UNSHARED_LIB_SUFFIX" = "" ; then
-    TK_UNSHARED_LIB_SUFFIX='${VERSION}\$\{TK_DBGX\}.a'
-fi
+#if test "$TK_SHARED_LIB_SUFFIX" = "" ; then
+#    TK_SHARED_LIB_SUFFIX='${VERSION}\$\{TK_DBGX\}${SHLIB_SUFFIX}'
+#fi
+#if test "$TK_UNSHARED_LIB_SUFFIX" = "" ; then
+#    TK_UNSHARED_LIB_SUFFIX='${VERSION}\$\{TK_DBGX\}.a'
+#fi
+
+TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
 
 TCL_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_LIB_FLAG)'
 TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)'