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

diff --git a/configure.in b/configure.in
index 66ba230..017b51b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl (c) Index Data 1996-2000
+dnl (c) Index Data 1996-2001
 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.7 2001/10/26 13:26:11 adam Exp $
 AC_INIT(hswitch.c)
 dnl ------ Substitutions
 AC_SUBST(CC)
@@ -10,23 +10,19 @@ 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
-AC_ARG_WITH(tclconfig, [  --with-tclconfig        Path for tclConfig.sh/tkConfig.sh], [tclconfig=$withval])
+AC_ARG_WITH(tclconfig, [  --with-tclconfig        Path for tclConfig.sh], [tclconfig=$withval])
 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
@@ -48,11 +44,19 @@ if test "x$tclconfig" = xNONE; then
 	tryprefix=${prefix}
         prefix=${saveprefix}
 fi
-if test -r ${tclconfig}/tclConfig.sh; then
-	AC_MSG_CHECKING(for Tcl)
-	. ${tclconfig}/tclConfig.sh
+AC_MSG_CHECKING(for Tcl)
+if test -d ${tclconfig}; then
+	tclconfig=${tclconfig}/tclConfig.sh
+fi
+if test -r ${tclconfig}; then
+	. ${tclconfig}
 	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
-	TCLINC=-I${TCL_PREFIX}/include
+
+	if test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then
+		TCLINC=-I${TCL_PREFIX}/include/tcl${TCL_VERSION}
+	else
+		TCLINC=-I${TCL_PREFIX}/include
+	fi
 	RANLIB=$TCL_RANLIB
         SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
 	SHLIB_LD=$TCL_SHLIB_LD
@@ -61,62 +65,6 @@ if test -r ${tclconfig}/tclConfig.sh; then
 	AC_MSG_RESULT($TCL_VERSION)
 	CC=$TCL_CC
 else
-	AC_PROG_CC
-        SHLIB_CFLAGS=""
-	SHLIB_LD="shared-linker"
-	SHLIB_SUFFIX=""
-	SHLIB_VERSION=""
-	AC_PROG_RANLIB
-	AC_MSG_CHECKING(for Tcl)
-	TCL_VERSION=nope
-	for i in "" 7.4 7.5 7.6 8.0; do
-		if test -r ${tryprefix}/lib/libtcl${i}.a; then
-			TCL_VERSION=$i
-		fi
-	done
-	if test "$TCL_VERSION" = nope; then
-		AC_MSG_WARN(Didn't find Tcl)
-		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
-		TCL_LIB_SPEC=${tryprefix}/lib/libtcl${TCL_VERSION}.a
-		TCLINC=-I${tryprefix}/include
-	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
+	AC_MSG_RESULT(Not found)
 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)