From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 23 Jun 1995 10:58:10 +0000 (+0000)
Subject: Work on configure.
X-Git-Tag: IRTCL.1.4~248
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=6811554e4d608d2ef0e13643e917830db1aa9458;p=ir-tcl-moved-to-github.git

Work on configure.
---

diff --git a/Makefile.in b/Makefile.in
index b2b1645..8f81cb7 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.4 1995-06-22 13:46:52 adam Exp $
+# $Id: Makefile.in,v 1.5 1995-06-23 10:58:10 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
@@ -53,12 +53,17 @@ O=ir-tcl.o marc.o
 
 all: ir-tk ir-tcl
 
-ir-tk: $(O) tkmain.o
-	$(CC) $(CFLAGS) $(O) tkmain.o -o ir-tk $(YAZLIB) $(TKLIB) \
+ir-tk: libirtcl.a tkmain.o
+	$(CC) $(CFLAGS) tkmain.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
 	$(TCLLIB) $(XLIB) $(LIBS)
 
-ir-tcl: $(O) tclmain.o
-	$(CC) $(CFLAGS) $(O) tclmain.o -o ir-tcl $(YAZLIB) $(TCLLIB) $(LIBS)
+ir-tcl: libirtcl.a tclmain.o
+	$(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) $(LIBS)
+
+libirtcl.a: $(O)
+	rm -f libirtcl.a
+	ar qc libirtcl.a $(O)
+	$(RANLIB) libirtcl.a
 
 install-tcl: ir-tcl
 	for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
diff --git a/configure.in b/configure.in
index 81bf02e..0a5e489 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.4 1995-06-22 13:46:53 adam Exp $
+dnl $Id: configure.in,v 1.5 1995-06-23 10:58:11 adam Exp $
 AC_INIT(README)
 AC_PROG_CC
 AC_PROG_RANLIB
@@ -123,7 +123,7 @@ if test "$XLIBSW" = nope ; then
 fi
 AC_SUBST(XLIBSW)
 AC_SUBST(TKLIB)
-AC_CHECK_LIB(tk, Tk_MainLoop, tkFound=1, tkFound=0, $TCLLIB $XLIBSW -lm)
+AC_CHECK_LIB(tk, main, tkFound=1, tkFound=0, $TCLLIB $XLIBSW -lm)
 if test "$tkFound" = 1; then
     TKLIB=-ltk
 else