From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 22 Dec 1995 09:10:03 +0000 (+0000)
Subject: Enhancement of configure script.
X-Git-Tag: IRTCL.1.4~181
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=9fe86558a2152d3848d18c6be8a50902f75bafce;p=ir-tcl-moved-to-github.git

Enhancement of configure script.
---

diff --git a/Makefile.in b/Makefile.in
index e231b49..e31d21d 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.20 1995-11-28 17:26:35 adam Exp $
+# $Id: Makefile.in,v 1.21 1995-12-22 09:10:03 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
@@ -39,10 +39,10 @@ TCLINCLUDE=@TCLINCLUDE@
 MOSILIB=@MOSILIB@
 
 # All YAZ libraries - including MOSI libraries.
-YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB) $(YAZDIR)/lib/libutil.a
+YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
 
 # All include paths
-INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) $(TCLINCLUDE)
+INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) $(TCLINCLUDE)
 
 # All command line options except CFLAGS
 DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
diff --git a/configure.in b/configure.in
index 6998af5..5cfb867 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1995
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.10 1995-09-20 11:37:01 adam Exp $
+dnl $Id: configure.in,v 1.11 1995-12-22 09:10:05 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 AC_SUBST(CC)
@@ -43,7 +43,7 @@ AC_SUBST(MOSIDIR)
 AC_MSG_CHECKING(for YAZ directory)
 AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz-1.0b3"
+	YAZDIR="../yaz-1.0"
 elif test "$YAZDIR" = ""; then
         YAZDIR="../yaz"
         for i in ../yaz-1.0b3 ../yaz-1.0b4 ../yaz-1.0 ../yaz; do
@@ -71,7 +71,7 @@ if test -r ${YAZDIR}/lib/librfc.a; then
 else
 	MOSI=0
 	MOSIDIR=$MOSIDIR
-        MOSILIB=''
+        MOSILIB='# $(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
         MOSITELL=no
 fi
 AC_MSG_RESULT($MOSITELL)