From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 29 Jun 1995 14:06:24 +0000 (+0000)
Subject: Another bug in install fixed. Configure searches for more versions of yaz.
X-Git-Tag: IRTCL.1.4~232
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=84667651230fe801a73274c5f95e9f7c8bf0813a;p=ir-tcl-moved-to-github.git

Another bug in install fixed. Configure searches for more versions of yaz.
---

diff --git a/Makefile.in b/Makefile.in
index 44c6e0c..d2a9138 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # (c) Index Data 1995
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.12 1995-06-29 12:34:06 adam Exp $
+# $Id: Makefile.in,v 1.13 1995-06-29 14:06:24 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
@@ -41,7 +41,7 @@ MOSILIB=@MOSILIB@
 YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB) $(YAZDIR)/lib/libutil.a
 
 # All include paths
-INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR)
+INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) -I/usr/local/include
 
 # All command line options except CFLAGS
 DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
@@ -90,7 +90,9 @@ install: ir-tcl
 		cat head.bak client.tcl| sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," >client.bak; \
 		$(INSTALL_PROGRAM) client.bak $(BINDIR)/irclient; \
 		echo "Installing clientrc.tcl" ; \
-		$(INSTALL_DATA) LICENSE clientrc.tcl $(IRTCLDIR); \
+		$(INSTALL_DATA) clientrc.tcl $(IRTCLDIR); \
+		echo "Installing LICENSE" ; \
+		$(INSTALL_DATA) LICENSE $(IRTCLDIR); \
 		echo "Installing display format scripts"; \
 		for b in formats/*.tcl; do \
 			if [ -f $$b ]; then \
diff --git a/client.tcl b/client.tcl
index a99e741..a2f320f 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.58  1995-06-29 12:34:06  adam
+# Revision 1.59  1995-06-29 14:06:25  adam
+# Another bug in install fixed. Configure searches for more versions of yaz.
+#
+# Revision 1.58  1995/06/29  12:34:06  adam
 # IrTcl now works with both tk4.0b4/tcl7.4b4 and tk3.6/tcl7.3
 #
 # Revision 1.57  1995/06/29  09:20:30  adam
@@ -206,7 +209,12 @@
 #
 #
 
-set tk4 0
+if {$tk_version == "3.6"} {
+    set tk4 0
+} else {
+    set tk4 1
+}
+
 if {$tk4} {
     proc configure-enable-e {w n} {
         incr n
@@ -239,7 +247,7 @@ if {! $tk4} {
 
 set libdir LIBDIR
 if {[file readable bitmaps/book2]} {
-	set libdir .
+    set libdir .
 }
 if {! [file readable ${libdir}/bitmaps/book2]} {
     puts "Cannot locate system files in ${libdir}. You must either run this"
@@ -275,7 +283,6 @@ wm minsize . 0 0
 set setOffset 0
 set setMax 0
 
-if {0} {
 proc tkerror err {
     set w .tkerrorw
 
@@ -290,12 +297,11 @@ proc tkerror err {
 
     label $w.top.b -bitmap error
     message $w.top.t -aspect 300 -text "Error: $err" \
-            -font -Adobe-Helvetica-Bold-R-Normal-*-240-*
+            -font -Adobe-Helvetica-Bold-R-Normal-*-200-*
     pack $w.top.b $w.top.t -side left -padx 10 -pady 10
 
     bottom-buttons $w [list {Close} [list destroy $w]] 1
 }
-}
 
 proc read-formats {} {
     global displayFormats
@@ -1551,7 +1557,7 @@ proc bind-fields {list returnAction escapeAction} {
     bind [lindex $list $i] <Return> $returnAction
     bind [lindex $list $i] <Escape> $escapeAction
     if {!$tk4} {
-        bind [lindex $list $i] <Tab>    [list focus [lindex $list 0]]
+        bind [lindex $list $i] <Tab>  [list focus [lindex $list 0]]
         bind [lindex $list $i] <Left> [list left-cursor [lindex $list $i]]
         bind [lindex $list $i] <Right> [list right-cursor [lindex $list $i]]
     }
diff --git a/configure.in b/configure.in
index 0a5e489..0fd822c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,10 @@
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1995
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.5 1995-06-23 10:58:11 adam Exp $
-AC_INIT(README)
-AC_PROG_CC
+dnl $Id: configure.in,v 1.6 1995-06-29 14:06:26 adam Exp $
+AC_INIT(ir-tcl.h)
+CC=${CC-cc}
+AC_SUBST(CC)
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 checkBoth=0
@@ -34,10 +35,12 @@ AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
 	YAZDIR="../yaz-1.0b"
 elif test "$YAZDIR" = ""; then
-	YAZDIR="../yaz-1.0b"
-	if test -d "../yaz"; then
-		YAZDIR="../yaz"
-	fi
+        YAZDIR="../yaz"
+        for i in ../yaz-1.0b3 ../yaz-1.0b2 ../yaz-1.0b1 ../yaz-1.0b ../yaz; do
+            if test -d $i; then
+                YAZDIR=$i
+            fi
+        done
 fi
 AC_MSG_RESULT($YAZDIR)
 if test ! -d $YAZDIR; then