From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 26 Jul 1996 09:15:06 +0000 (+0000)
Subject: IrTcl version 1.2 patch level 1.
X-Git-Tag: IRTCL.1.4~100
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=2000d6aacccd89cb5a5e94cb68c8e7bb20a92e33;p=ir-tcl-moved-to-github.git

IrTcl version 1.2 patch level 1.
---

diff --git a/CHANGELOG b/CHANGELOG
index aa4d186..c0d5ddf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-$Id: CHANGELOG,v 1.24 1996-07-25 15:51:54 adam Exp $
+$Id: CHANGELOG,v 1.25 1996-07-26 09:15:06 adam Exp $
 
 06/19/95 Release of ir-tcl-1.0b
 ------------------------------------------------------
@@ -91,3 +91,9 @@ $Id: CHANGELOG,v 1.24 1996-07-25 15:51:54 adam Exp $
 
 07/25/96 Release of ir-tcl-1.2
 ------------------------------------------------------
+
+07/26/96 Bug fix: configure script didn't include library specification
+         for Tcl when linking ir-tk.
+
+07/26/96 Release of ir-tcl-1.2pl1
+------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index aff9630..d2b0a44 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1996, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
diff --git a/Makefile.in b/Makefile.in
index 2e0db98..342e3fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,12 +1,12 @@
 # IR toolkit for tcl/tk
-# (c) Index Data 1995
+# (c) Index Data 1995-1996
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.37 1996-07-25 14:07:09 adam Exp $
+# $Id: Makefile.in,v 1.38 1996-07-26 09:15:06 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.2
+VERSION=1.2pl1
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
diff --git a/README b/README
index ed8073e..7e5d918 100644
--- a/README
+++ b/README
@@ -3,9 +3,9 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
 
-IrTcl version 1.2
+IrTcl version 1.2pl1
 
----- $Date: 1996-07-25 13:43:57 $
+---- $Date: 1996-07-26 09:15:07 $
 
 Information about Tcl can be found at http://www.indexdata.dk/irtcl.html.
 This page contains pointers to documentation in various formats.
diff --git a/client.tcl b/client.tcl
index 91aed37..a475d46 100644
--- a/client.tcl
+++ b/client.tcl
@@ -1,10 +1,13 @@
 # IR toolkit for tcl/tk
-# (c) Index Data 1995
+# (c) Index Data 1995-1996
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.94  1996-07-25 15:55:34  adam
+# Revision 1.95  1996-07-26 09:15:08  adam
+# IrTcl version 1.2 patch level 1.
+#
+# Revision 1.94  1996/07/25  15:55:34  adam
 # IrTcl version 1.2 release.
 #
 # Revision 1.93  1996/06/28  08:43:54  adam
diff --git a/configure.in b/configure.in
index d6e93d2..078f14f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1996
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.17 1996-06-28 08:43:55 adam Exp $
+dnl $Id: configure.in,v 1.18 1996-07-26 09:15:09 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 dnl ------ Substitutions
@@ -28,8 +28,7 @@ AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
 	YAZDIR="../yaz-1.2"
 elif test "$YAZDIR" = ""; then
-        YAZDIR="../yaz"
-        for i in ../yaz-1.2 ../yaz-1.3 ../yaz; do
+        for i in ../yaz* ../yaz; do
             if test -d $i; then
                 YAZDIR=$i
             fi
@@ -70,12 +69,7 @@ fi
 if test -r ${tryprefix}/lib/tclConfig.sh; then
 	AC_MSG_CHECKING(for Tcl)
 	source ${tryprefix}/lib/tclConfig.sh
-	if test "$TCL_LIB_VERSIONS_OK" = "yes"; then
-		TCLLIB="-L${TCL_PREFIX}/lib -ltcl${TCL_VERSION}"
-	else
-		TCLLIB=${TCL_PREFIX}/lib/${TCL_LIB_FILE}
-	fi
-	TCLLIB="${TCLLIB} ${TCL_LIBS}"
+	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
 	TCLINC=-I${TCL_PREFIX}/include
 	RANLIB=$TCL_RANLIB
 	AC_MSG_RESULT($TCL_VERSION)
@@ -101,7 +95,7 @@ else
 	done
 	if test "$TCL_VERSION" = nope; then
 		AC_MSG_WARN(Didn't find Tcl)
-		TCLLIB=-ltcl
+		TCL_LIB_SPEC=-ltcl
 		TCLINC=" # -I.. Tcl/Tk include path"
 	else
 		if test "$TCL_VERSION" = ""; then
@@ -109,10 +103,10 @@ else
 		else
 			AC_MSG_RESULT($TCL_VERSION)
 		fi
-		TCLLIB=${tryprefix}/lib/libtcl${TCL_VERSION}.a
+		TCL_LIB_SPEC=${tryprefix}/lib/libtcl${TCL_VERSION}.a
 		TCLINC=-I${tryprefix}/include
 	fi
-	TCLLIB="${TCLLIB} ${LIBS} -lm"
+	TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
 fi
 dnl ------ look for Tk
 if test -r ${tryprefix}/lib/tkConfig.sh; then
@@ -120,7 +114,7 @@ if test -r ${tryprefix}/lib/tkConfig.sh; then
 	source ${tryprefix}/lib/tkConfig.sh
 	AC_MSG_RESULT($TK_VERSION)
 	TKINC=${TK_XINCLUDES}
-	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TK_LIBS}"
+	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TCL_LIB_SPEC} ${TK_LIBS}"
 else
 	AC_MSG_CHECKING(for Tk)
 	TK_VERSION=nope
@@ -140,7 +134,7 @@ else
 			AC_MSG_RESULT($TK_VERSION)
 		fi
 	fi
-	TKLIB=${tryprefix}/lib/libtk${i}.a
+	TKLIB=${tryprefix}/lib/libtk${TK_VERSION}.a
 	AC_PATH_X
 	not_really_there=""
 	if test "$no_x" = ""; then
@@ -198,7 +192,7 @@ else
 		echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
 		XLIBSW=-lX11
 	fi
-	TKINC=$XINCLUDE
+	TKINC=$XINCLUDES
 	TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
 fi
 AC_OUTPUT(Makefile)
diff --git a/ir-tcl.h b/ir-tcl.h
index 249197f..39b2434 100644
--- a/ir-tcl.h
+++ b/ir-tcl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1996, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: ir-tcl.h,v $
- * Revision 1.14  1996-02-21 10:16:19  adam
+ * Revision 1.15  1996-07-26 09:15:09  adam
+ * IrTcl version 1.2 patch level 1.
+ *
+ * Revision 1.14  1996/02/21  10:16:19  adam
  * Simplified select handling. Only one function ir_tcl_select_set has
  * to be externally defined.
  *