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

 parent workspace "/export/home/ws/tk8.0".


FossilOrigin-Name: ae8414d2ed3e194f67644a484c0cc5244c295bca

2 files changed, 17 insertions, 9 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 725f9ab..63a56a5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -159,6 +159,12 @@ TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@
 TK_LIB_FILE = @TK_LIB_FILE@
 #TK_LIB_FILE = libtk.a
 
+TK_LIB_FLAG = @TK_LIB_FLAG@
+#TK_LIB_FLAG = -ltk
+
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
+#TCL_LIB_FLAG = -ltcl
+
 # The symbol below provides support for dynamic loading and shared
 # libraries.  See configure.in for a description of what it means.
 # The values of the symbolis normally set by the configure script.
@@ -295,10 +301,10 @@ all: wish
 
 # The following target is configured by autoconf to generate either
 # a shared library or non-shared library for Tk.
-@TK_LIB_FILE@: ${OBJS}
-	rm -f @TK_LIB_FILE@
+${TK_LIB_FILE}: ${OBJS}
+	rm -f ${TK_LIB_FILE}
 	@MAKE_LIB@
-	$(RANLIB) @TK_LIB_FILE@
+	$(RANLIB) ${TK_LIB_FILE}
 
 # Make target which outputs the list of the .o contained in the Tk lib
 # usefull to build a single big shared library containing Tcl/Tk and other
diff --git a/unix/configure.in b/unix/configure.in
index f861c13..54c897f 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -369,13 +369,13 @@ if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
     TK_SHARED_BUILD=1
     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}"
-    MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
     RANLIB=":"
 else
     TK_SHARED_BUILD=0
     TK_SHLIB_CFLAGS=""
     eval "TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}"
-    MAKE_LIB="ar cr ${TK_LIB_FILE} \${OBJS}"
+    MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
 fi
 
 # Note:  in the following variable, it's important to use the absolute
@@ -384,12 +384,12 @@ fi
 # up the Tcl library.
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TK_BUILD_LIB_SPEC="-L`pwd` -ltk${VERSION}\${DBGX}"
-    TK_LIB_SPEC="-L${exec_prefix}/lib -ltk${VERSION}\${DBGX}"
+    TK_LIB_FLAG="-ltk${VERSION}\${DBGX}"
 else
-    TK_BUILD_LIB_SPEC="-L`pwd` -ltk`echo ${VERSION} | tr -d .`\${DBGX}"
-    TK_LIB_SPEC="-L${exec_prefix}/lib -ltk`echo ${VERSION} | tr -d .`\${DBGX}"
+    TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${DBGX}"
 fi
+TK_BUILD_LIB_SPEC="-L`pwd` \${TK_LIB_FLAG}"
+TK_LIB_SPEC="-L${exec_prefix}/lib \${TK_LIB_FLAG}"
 
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_DEFAULT)
@@ -406,12 +406,14 @@ AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(SHLIB_VERSION)
 AC_SUBST(TCL_BIN_DIR)
 AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_BUILD_LIB_SPEC)
 AC_SUBST(TK_CC_SEARCH_FLAGS)
 AC_SUBST(TK_LD_SEARCH_FLAGS)
 AC_SUBST(TK_LIB_FILE)
+AC_SUBST(TK_LIB_FLAG)
 AC_SUBST(TK_LIB_SPEC)
 AC_SUBST(TK_MAJOR_VERSION)
 AC_SUBST(TK_MINOR_VERSION)