X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=5cfb8675e6d671c2d1aa6a3843618e7635d4a122;hb=9fe86558a2152d3848d18c6be8a50902f75bafce;hp=0fd822c101612ba9585a6a01827503ca14693c64;hpb=84667651230fe801a73274c5f95e9f7c8bf0813a;p=ir-tcl-moved-to-github.git

diff --git a/configure.in b/configure.in
index 0fd822c..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.6 1995-06-29 14:06:26 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)
@@ -20,12 +20,22 @@ 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)
@@ -33,10 +43,10 @@ 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.0b"
+	YAZDIR="../yaz-1.0"
 elif test "$YAZDIR" = ""; then
         YAZDIR="../yaz"
-        for i in ../yaz-1.0b3 ../yaz-1.0b2 ../yaz-1.0b1 ../yaz-1.0b ../yaz; do
+        for i in ../yaz-1.0b3 ../yaz-1.0b4 ../yaz-1.0 ../yaz; do
             if test -d $i; then
                 YAZDIR=$i
             fi
@@ -61,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)
@@ -125,11 +135,4 @@ if test "$XLIBSW" = nope ; then
     XLIBSW=-lX11
 fi
 AC_SUBST(XLIBSW)
-AC_SUBST(TKLIB)
-AC_CHECK_LIB(tk, main, 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)