Minor changes.

[tclrobot.git] / configure.in

diff --git a/configure.in b/configure.in
index 5f22980..ccba64e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,66 +1,88 @@
-dnl Web robot toolkit for tcl
-dnl (c) Index Data 1996-1998
+dnl (c) Index Data 1996-2000
 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.6 2001/01/23 12:05:07 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
+tclconfig=NONE
+tryprefix=NONE
+AC_ARG_WITH(tclconfig, [  --with-tclconfig        Path for tclConfig.sh/tkConfig.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
        tryprefix=${prefix}
+        prefix=${saveprefix}
 fi
-if test -r ${tryprefix}/lib/tclConfig.sh; then
+if test -r ${tclconfig}/tclConfig.sh; then
        AC_MSG_CHECKING(for Tcl)
-       . ${tryprefix}/lib/tclConfig.sh
+       . ${tclconfig}/tclConfig.sh
        TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
        TCLINC=-I${TCL_PREFIX}/include
-       RANLIB=${TCL_RANLIB}
-       SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+       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_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
 AC_OUTPUT(Makefile)