From 16d63e77a35ae097b9d329c1a1693edf5b29409e Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 3 Sep 1996 13:52:09 +0000
Subject: [PATCH] Fixes.

---
 CHANGELOG    |    8 ++++++--
 configure.in |   17 ++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index aca2800..65688bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-$Id: CHANGELOG,v 1.27 1996-08-21 13:32:49 adam Exp $
+$Id: CHANGELOG,v 1.28 1996-09-03 13:52:09 adam Exp $
 
 06/19/95 Release of ir-tcl-1.0b
 ------------------------------------------------------
@@ -98,7 +98,7 @@ $Id: CHANGELOG,v 1.27 1996-08-21 13:32:49 adam Exp $
 07/26/96 Release of ir-tcl-1.2pl1
 ------------------------------------------------------
 
-08/09/96 Updated IrTcl to work with Tcl7.5/tk4.1 patch level 1. The
+08/09/96 Updated IrTcl to work with tcl7.5/tk4.1 patch level 1. The
          asynchronous I/O works much better on Windows now.
 
 08/09/96 Borland C 5 makefile supplied with IrTcl.
@@ -108,3 +108,7 @@ $Id: CHANGELOG,v 1.27 1996-08-21 13:32:49 adam Exp $
 08/21/96 loadFile method changed to use load records previously saved
          with saveFile.
 
+09/02/96 Updated IrTcl to work with tcl7.6b1/tk4.2b1.
+
+09/03/96 Bug fix: configure script could fail if yaz couldn't be located.
+
diff --git a/configure.in b/configure.in
index 078f14f..277a6f9 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.18 1996-07-26 09:15:09 adam Exp $
+dnl $Id: configure.in,v 1.19 1996-09-03 13:52:09 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 dnl ------ Substitutions
@@ -15,6 +15,7 @@ AC_SUBST(MOSI)
 AC_SUBST(MOSIDIR)
 AC_SUBST(MOSILIB)
 AC_SUBST(MOSIINC)
+dnl
 dnl ------ Preliminary settings
 AC_PROG_INSTALL
 AC_PREFIX_PROGRAM(tclsh)
@@ -22,12 +23,15 @@ AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = no; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
+dnl
 dnl ------ look for YAZ/XTImOSI
+dnl
 AC_MSG_CHECKING(for YAZ directory)
 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* ../yaz; do
             if test -d $i; then
                 YAZDIR=$i
@@ -60,7 +64,9 @@ else
         MOSITELL=no
 fi
 AC_MSG_RESULT($MOSITELL)
+dnl
 dnl ------ look for Tcl
+dnl
 if test "x$prefix" = xNONE; then
 	tryprefix=/usr/local
 else
@@ -88,7 +94,7 @@ else
 	AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 	AC_MSG_CHECKING(for Tcl)
 	TCL_VERSION=nope
-	for i in "" 7.4 7.5; do
+	for i in "" 7.4 7.5 7.6 7.7; do
 		if test -r ${tryprefix}/lib/libtcl${i}.a; then
 			TCL_VERSION=$i
 		fi
@@ -108,17 +114,19 @@ else
 	fi
 	TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
 fi
+dnl 
 dnl ------ look for Tk
+dnl
 if test -r ${tryprefix}/lib/tkConfig.sh; then
 	AC_MSG_CHECKING(for Tk)
 	source ${tryprefix}/lib/tkConfig.sh
 	AC_MSG_RESULT($TK_VERSION)
 	TKINC=${TK_XINCLUDES}
-	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TCL_LIB_SPEC} ${TK_LIBS}"
+	TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
 else
 	AC_MSG_CHECKING(for Tk)
 	TK_VERSION=nope
-	for i in "" 4.0 4.1; do
+	for i in "" 4.0 4.1 4.2 4.3; do
 		if test -r ${tryprefix}/lib/libtk${i}.a; then
 			TK_VERSION=$i
 		fi
@@ -134,7 +142,6 @@ else
 			AC_MSG_RESULT($TK_VERSION)
 		fi
 	fi
-	TKLIB=${tryprefix}/lib/libtk${TK_VERSION}.a
 	AC_PATH_X
 	not_really_there=""
 	if test "$no_x" = ""; then
-- 
1.7.10.4