X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=ccba64e299bf8c890fc80906170fe78da2b69c7c;hb=e80b5c034f20b43530880ba530a8e1de06646726;hp=66ba230688448c67936aaafd3efa9f97a531ddd4;hpb=87b050c8552f5b45c870b8c942ca67fe1da363a5;p=tclrobot.git

diff --git a/configure.in b/configure.in
index 66ba230..ccba64e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl (c) Index Data 1996-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.4 1999/12/27 11:49:31 adam Exp $
+dnl $Id: configure.in,v 1.6 2001/01/23 12:05:07 adam Exp $
 AC_INIT(hswitch.c)
 dnl ------ Substitutions
 AC_SUBST(CC)
@@ -10,15 +10,8 @@ AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LD)
 AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(SHLIB_VERSION)
-AC_SUBST(YAZLIB)
-AC_SUBST(YAZINC)
-dnl
-dnl ------ Build root
-AC_SUBST(build_root)
-AC_ARG_WITH(build-root, [  --with-buildroot        RPM Build root],[build_root=$withval],[build_root=""])
-dnl
-dnl ------ Preliminary settings
 AC_PROG_INSTALL
+dnl
 dnl ------ look for Tcl
 tclconfig=NONE
 tryprefix=NONE
@@ -27,6 +20,9 @@ if test "x$tclconfig" = xNONE; then
         saveprefix=${prefix}
 	AC_PREFIX_PROGRAM(tclsh)
 	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.3)
+	fi
+	if test "x$prefix" = xNONE; then
 		AC_PREFIX_PROGRAM(tclsh8.2)
 	fi
 	if test "x$prefix" = xNONE; then
@@ -89,34 +85,4 @@ else
 	fi
 	TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
 fi
-dnl 
-dnl ------ Look for Yaz
-dnl See if user specified location of yaz-config; otherwise
-dnl use ../yaz if is a directory (internal development); otherwise
-dnl use yaz-config found in PATH.
-yazconfig=NONE
-yazpath=NONE
-AC_ARG_WITH(yazconfig, [  --with-yazconfig        Path for yaz-config], [yazpath=$withval])
-if test "x$yazpath" != "xNONE"; then
-        yazconfig=$yazpath/yaz-config
-else
-        for i in ../yaz* ../yaz; do
-                if test -d $i; then
-                        if test -r $i/include/yaz/yaz-version.h; then
-                                yazconfig=$i/yaz-config
-                        fi
-                fi
-        done
-        if test "x$yazconfig" = "xNONE"; then
-                AC_PATH_PROG(yazconfig, yaz-config, NONE)
-        fi
-fi
-AC_MSG_CHECKING(for YAZ)
-if test -r $yazconfig; then
-        . $yazconfig
-        AC_MSG_RESULT($yazconfig)
-else
-        AC_MSG_RESULT(Not found)
-fi
-dnl
 AC_OUTPUT(Makefile)