Honor TCL_LIBS in tclConfig.sh.

3 files changed, 27 insertions, 11 deletions

diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index b9fff7969a7..90657e72555 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/11/19 13:24:11 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/12/06 16:20:12 minskim Exp $
 
 SHA1 (xcircuit-3.3.0.tgz) = ec3c0995fd4f8755a50d39e278ca0ab293705b38
 Size (xcircuit-3.3.0.tgz) = 1308602 bytes
-SHA1 (patch-aa) = 83ac777b29b9e2979f3ff8e5ef04c0af8317f7b2
-SHA1 (patch-ab) = 3314749c7a09ea1cb5b617d3cf0742df99e1292c
+SHA1 (patch-aa) = 0d23ac7e52c0fa879c252008fcde37e96d5b5b77
+SHA1 (patch-ab) = 1d61d017c22f8068aefbea23d628678ebad1f93e
 SHA1 (patch-ac) = 1f84054174f790bd32d14eafa6a91444737795ff
diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index 2f27f0565a1..63fa56000be 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2004/11/19 13:24:11 adam Exp $
+$NetBSD: patch-aa,v 1.6 2004/12/06 16:20:12 minskim Exp $
 
---- configure.in.orig	2004-10-01 04:24:09.000000000 +0000
+--- configure.in.orig	2004-09-30 23:24:09.000000000 -0500
 +++ configure.in
-@@ -544,7 +544,7 @@ fi
+@@ -469,6 +469,7 @@ fi
+ if test "x$xc_with_tcl" != "x" ; then
+   . $tcl_config_sh
+   . $tk_config_sh
++  LIBS="${LIBS} ${TCL_LIBS}"
+ 
+   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
+     :
+@@ -544,7 +545,7 @@ fi
  
  if test "x$xc_with_tcl" != "x" ; then
    case $target in
@@ -11,7 +19,7 @@ $NetBSD: patch-aa,v 1.5 2004/11/19 13:24:11 adam Exp $
        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
        ;;
-@@ -890,9 +890,9 @@ if test "x$xc_with_tcl" != "x" ; then
+@@ -890,9 +891,9 @@ if test "x$xc_with_tcl" != "x" ; then
        # Not available on all versions:  check for include file.
        AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
        if test "$test_ok" = yes; then
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index 9d0b6d01d69..cb58cd5ed27 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.5 2004/11/19 13:24:11 adam Exp $
+$NetBSD: patch-ab,v 1.6 2004/12/06 16:20:12 minskim Exp $
 
---- configure.orig	2004-10-01 04:25:07.000000000 +0000
+--- configure.orig	2004-09-30 23:25:07.000000000 -0500
 +++ configure
-@@ -7704,7 +7704,7 @@ fi
+@@ -7629,6 +7629,7 @@ fi
+ if test "x$xc_with_tcl" != "x" ; then
+   . $tcl_config_sh
+   . $tk_config_sh
++  LIBS="${LIBS} ${TCL_LIBS}"
+ 
+   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
+     :
+@@ -7704,7 +7705,7 @@ fi
  
  if test "x$xc_with_tcl" != "x" ; then
    case $target in
@@ -11,7 +19,7 @@ $NetBSD: patch-ab,v 1.5 2004/11/19 13:24:11 adam Exp $
        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
        ;;
-@@ -8244,9 +8244,9 @@ fi
+@@ -8244,9 +8245,9 @@ fi
  
  
        if test "$test_ok" = yes; then