X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=configure.in;h=2494d60136da30abdb7c39d911627ce5a46585b7;hb=00c3f4aa3544517faf05260bf5f3e8d676229d83;hp=81bf02e25e953e2f8e2c64784b690b5ba0b606d5;hpb=7a1456252a76dea54f0c4204f510b82b6457f3bc;p=ir-tcl-moved-to-github.git

diff --git a/configure.in b/configure.in
index 81bf02e..2494d60 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.4 1995-06-22 13:46:53 adam Exp $
-AC_INIT(README)
-AC_PROG_CC
+dnl $Id: configure.in,v 1.13 1996-01-11 12:14:53 adam Exp $
+AC_INIT(ir-tcl.h)
+CC=${CC-cc}
+AC_SUBST(CC)
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 checkBoth=0
@@ -19,25 +20,38 @@ fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 AC_STDC_HEADERS
 AC_SUBST(TCLLIB)
-AC_CHECK_LIB(tcl, Tcl_Eval, tclFound=1, tclFound=0, -lm)
-if test "$tclFound" = 1; then
-    TCLLIB=-ltcl
-else
-    TCLLIB=/usr/local/lib/libtcl.a
-fi
+AC_SUBST(TKLIB)
+AC_SUBST(TCLINCLUDE)
+TCLLIB=-ltcl
+TKLIB=-ltk
+TCLINCLUDE=" # -I.. Tcl/Tk include path"
+for i in .a 7.4.a 7.5.a; do
+	if test -r /usr/local/lib/libtcl$i; then
+		TCLLIB=/usr/local/lib/libtcl$i
+		TCLINCLUDE=-I/usr/local/include
+	fi
+done
+for i in .a 4.0.a 4.1.a; do
+	if test -r /usr/local/lib/libtk$i; then
+		TKLIB=/usr/local/lib/libtk$i
+	fi
+done
 AC_SUBST(YAZDIR)
 AC_SUBST(MOSI)
-AC_SUBST(MOSILIB)
 AC_SUBST(MOSIDIR)
+AC_SUBST(MOSILIB)
+AC_SUBST(MOSIINC)
 AC_MSG_CHECKING(for YAZ directory)
 AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz-1.0b"
+	YAZDIR="../yaz-1.0"
 elif test "$YAZDIR" = ""; then
-	YAZDIR="../yaz-1.0b"
-	if test -d "../yaz"; then
-		YAZDIR="../yaz"
-	fi
+        YAZDIR="../yaz"
+        for i in ../yaz-1.0pl3 ../yaz-1.0pl4 ../yaz-1.0pl5 ../yaz; do
+            if test -d $i; then
+                YAZDIR=$i
+            fi
+        done
 fi
 AC_MSG_RESULT($YAZDIR)
 if test ! -d $YAZDIR; then
@@ -54,11 +68,13 @@ if test -r ${YAZDIR}/lib/librfc.a; then
 	MOSI=1
 	MOSIDIR=$MOSIDIR
 	MOSILIB='$(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
+	MOSIINC='-I$(MOSIDIR)'
         MOSITELL=yes
 else
 	MOSI=0
 	MOSIDIR=$MOSIDIR
-        MOSILIB=''
+        MOSILIB='# $(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
+	MOSIINC='# -I$(MOSIDIR)'
         MOSITELL=no
 fi
 AC_MSG_RESULT($MOSITELL)
@@ -122,11 +138,4 @@ if test "$XLIBSW" = nope ; then
     XLIBSW=-lX11
 fi
 AC_SUBST(XLIBSW)
-AC_SUBST(TKLIB)
-AC_CHECK_LIB(tk, Tk_MainLoop, tkFound=1, tkFound=0, $TCLLIB $XLIBSW -lm)
-if test "$tkFound" = 1; then
-    TKLIB=-ltk
-else
-    TKLIB=/usr/local/lib/libtk.a
-fi
 AC_OUTPUT(Makefile)