* unix/configure:

	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Don't set
	TCL_LIBS if it is already set to support
	use of TCL_LIBS var from tclConfig.sh in
	the Tk configure script.

3 files changed, 20 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c6f359..3ac0fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-04-03  Mo DeJong  <mdejong@users.sourceforge.net>
 
+	* unix/configure:
+	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Don't set
+	TCL_LIBS if it is already set to support
+	use of TCL_LIBS var from tclConfig.sh in
+	the Tk configure script.
+
+2003-04-03  Mo DeJong  <mdejong@users.sourceforge.net>
+
 	* unix/Makefile.in: Don't subst MATH_LIBS,
 	LIBS, and DL_LIBS separately. Instead, just
 	subst TCL_LIBS since it includes the others.
diff --git a/unix/configure b/unix/configure
index ac4a6a3..db36eb7 100755
--- a/unix/configure
+++ b/unix/configure
@@ -12453,7 +12453,12 @@ fi;
     fi
 
     # Define TCL_LIBS now that we know what DL_LIBS is.
-    TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
+    # The trick here is that we don't want to change
+    # the value of TCL_LIBS if it is already set when
+    # tclConfig.sh had been loaded by Tk.
+    if test "x${TCL_LIBS}" = "x"; then
+        TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
+    fi
 
 
     # FIXME: This subst was left in only because the TCL_DL_LIBS
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 448562a..88eaa56 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1743,7 +1743,12 @@ dnl        esac
     fi
 
     # Define TCL_LIBS now that we know what DL_LIBS is.
-    TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
+    # The trick here is that we don't want to change
+    # the value of TCL_LIBS if it is already set when
+    # tclConfig.sh had been loaded by Tk.
+    if test "x${TCL_LIBS}" = "x"; then
+        TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
+    fi
     AC_SUBST(TCL_LIBS)
 
     # FIXME: This subst was left in only because the TCL_DL_LIBS