X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=5767798759fb0d0a95be3efc0169845bd0f2f906;hb=3201adca0560cf447024e23b0e572c9b5137111c;hp=5f229806f397767333b521f672248a1219a65016;hpb=af8cb4656cb382dfd6fdb932778a5e59379c59b3;p=tclrobot.git

diff --git a/configure.in b/configure.in
index 5f22980..5767798 100644
--- a/configure.in
+++ b/configure.in
@@ -1,66 +1,76 @@
-dnl Web robot toolkit for tcl
-dnl (c) Index Data 1996-1998
+dnl (c) Index Data 1996-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.3 1999/02/04 21:32:02 adam Exp $
-AC_INIT(tclrobot.h)
+dnl $Id: configure.in,v 1.8 2002/09/20 09:45:02 adam Exp $
+AC_INIT(hswitch.c)
 dnl ------ Substitutions
+AC_SUBST(CC)
 AC_SUBST(TCLLIB)
-AC_SUBST(TKLIB)
 AC_SUBST(TCLINC)
-AC_SUBST(TKINC)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LD)
 AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(SHLIB_VERSION)
-dnl ------ Preliminary settings
 AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_CC
-AC_PREFIX_PROGRAM(tclsh)
-if test "x$prefix" = xNONE; then
-        AC_PREFIX_PROGRAM(tclsh8.1)
-fi
-if test "x$prefix" = xNONE; then
-        AC_PREFIX_PROGRAM(tclsh8.0)
-fi
-if test "x$prefix" = xNONE; then
-        AC_PREFIX_PROGRAM(tclsh7.6)
-fi
-if test "x$prefix" = xNONE; then
-        AC_PREFIX_PROGRAM(tclsh7.5)
-fi
-AC_STDC_HEADERS
-if test "$ac_cv_header_stdc" = no; then
-	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
-fi
+dnl
 dnl ------ look for Tcl
-if test "x$prefix" = xNONE; then
-	tryprefix=/usr/local
-else
-	tryprefix=${prefix}
+tclconfig=NONE
+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
+		AC_PREFIX_PROGRAM(tclsh8.1)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.0)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh7.6)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh7.5)
+	fi
+	if test "x$prefix" = xNONE; then
+		prefix=/usr/local
+	fi
+        tclconfig=${prefix}/lib
+        prefix=${saveprefix}
+	if test ! -r ${tclconfig}/tclConfig.sh; then
+		# Not found, try search for Tcl on Debian systems.
+		for d in /usr/lib/tcl*; do
+			if test -f $d/tclConfig.sh; then
+				tclconfig=$d
+			fi
+		done
+	fi
+fi
+AC_MSG_CHECKING(for Tcl)
+if test -d ${tclconfig}; then
+	tclconfig=${tclconfig}/tclConfig.sh
 fi
-if test -r ${tryprefix}/lib/tclConfig.sh; then
-	AC_MSG_CHECKING(for Tcl)
-	. ${tryprefix}/lib/tclConfig.sh
+if test -r ${tclconfig}; then
+	. ${tclconfig}
 	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
-	TCLINC=-I${TCL_PREFIX}/include
-	RANLIB=${TCL_RANLIB}
-	SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+
+	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
-        SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
-        SHLIB_VERSION=$TCL_SHLIB_VERSION
+	SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+	SHLIB_VERSION=$TCL_SHLIB_VERSION
 	AC_MSG_RESULT($TCL_VERSION)
+	CC=$TCL_CC
 else
-	AC_MSG_WARN(Didn't find Tcl)
-fi
-dnl ------ look for Tk
-AC_MSG_CHECKING(for Tk)
-if test -r ${tryprefix}/lib/tkConfig.sh; then
-	. ${tryprefix}/lib/tkConfig.sh
-	AC_MSG_RESULT($TK_VERSION)
-	TKINC=${TK_XINCLUDES}
-	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TK_LIBS}"
-else
-        AC_MSG_WARN(Didn't find Tk)
+	AC_MSG_RESULT(Not found)
 fi
 AC_OUTPUT(Makefile)