X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=078f14f65a4c38ae91dc9a0fb1ff1ee9022b7d29;hb=2000d6aacccd89cb5a5e94cb68c8e7bb20a92e33;hp=278026bda937559981211ad2dbcd5596167768c7;hpb=cbc20dd0b142fcf6e0b6540c9ef69e1254867d01;p=ir-tcl-moved-to-github.git

diff --git a/configure.in b/configure.in
index 278026b..078f14f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,15 @@
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1996
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.15 1996-03-27 17:00:08 adam Exp $
+dnl $Id: configure.in,v 1.18 1996-07-26 09:15:09 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 dnl ------ Substitutions
 AC_SUBST(CC)
 AC_SUBST(TCLLIB)
 AC_SUBST(TKLIB)
-AC_SUBST(TCLINCLUDE)
-AC_SUBST(TKINCLUDE)
+AC_SUBST(TCLINC)
+AC_SUBST(TKINC)
 AC_SUBST(YAZDIR)
 AC_SUBST(MOSI)
 AC_SUBST(MOSIDIR)
@@ -26,10 +26,9 @@ dnl ------ look for YAZ/XTImOSI
 AC_MSG_CHECKING(for YAZ directory)
 AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz-1.0"
+	YAZDIR="../yaz-1.2"
 elif test "$YAZDIR" = ""; then
-        YAZDIR="../yaz"
-        for i in ../yaz-1.0pl3 ../yaz-1.0pl4 ../yaz-1.0pl5 ../yaz; do
+        for i in ../yaz* ../yaz; do
             if test -d $i; then
                 YAZDIR=$i
             fi
@@ -70,13 +69,8 @@ fi
 if test -r ${tryprefix}/lib/tclConfig.sh; then
 	AC_MSG_CHECKING(for Tcl)
 	source ${tryprefix}/lib/tclConfig.sh
-	if test "$TCL_LIB_VERSIONS_OK" = "yes"; then
-		TCLLIB="-L${TCL_PREFIX}/lib -ltcl${TCL_VERSION}"
-	else
-		TCLLIB=${TCL_PREFIX}/lib/${TCL_LIB_FILE}
-	fi
-	TCLLIB="${TCLLIB} ${TCL_LIBS}"
-	TCLINCLUDE=-I${TCL_PREFIX}/include
+	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
+	TCLINC=-I${TCL_PREFIX}/include
 	RANLIB=$TCL_RANLIB
 	AC_MSG_RESULT($TCL_VERSION)
 else
@@ -101,26 +95,26 @@ else
 	done
 	if test "$TCL_VERSION" = nope; then
 		AC_MSG_WARN(Didn't find Tcl)
-		TCLLIB=-ltcl
-		TCLINCLUDE=" # -I.. Tcl/Tk include path"
+		TCL_LIB_SPEC=-ltcl
+		TCLINC=" # -I.. Tcl/Tk include path"
 	else
 		if test "$TCL_VERSION" = ""; then
 			AC_MSG_RESULT(7.3)
 		else
 			AC_MSG_RESULT($TCL_VERSION)
 		fi
-		TCLLIB=${tryprefix}/lib/libtcl${TCL_VERSION}.a
-		TCLINCLUDE=-I${tryprefix}/include
+		TCL_LIB_SPEC=${tryprefix}/lib/libtcl${TCL_VERSION}.a
+		TCLINC=-I${tryprefix}/include
 	fi
-	TCLLIB="${TCLLIB} ${LIBS} -lm"
+	TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
 fi
 dnl ------ look for Tk
 if test -r ${tryprefix}/lib/tkConfig.sh; then
 	AC_MSG_CHECKING(for Tk)
 	source ${tryprefix}/lib/tkConfig.sh
 	AC_MSG_RESULT($TK_VERSION)
-	TKINCLUDE=${TK_XINCLUDES}
-	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TK_LIBS}"
+	TKINC=${TK_XINCLUDES}
+	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TCL_LIB_SPEC} ${TK_LIBS}"
 else
 	AC_MSG_CHECKING(for Tk)
 	TK_VERSION=nope
@@ -140,7 +134,7 @@ else
 			AC_MSG_RESULT($TK_VERSION)
 		fi
 	fi
-	TKLIB=${tryprefix}/lib/libtk${i}.a
+	TKLIB=${tryprefix}/lib/libtk${TK_VERSION}.a
 	AC_PATH_X
 	not_really_there=""
 	if test "$no_x" = ""; then
@@ -198,7 +192,7 @@ else
 		echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
 		XLIBSW=-lX11
 	fi
-	TKINCLUDE=$XINCLUDE
+	TKINC=$XINCLUDES
 	TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
 fi
 AC_OUTPUT(Makefile)