Towards 1.4.

[ir-tcl-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 7c7e0cf..4d5999c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1996-1999
+dnl (c) Index Data 1996-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.29 2000-10-11 12:26:47 adam Exp $
+dnl $Id: configure.in,v 1.31 2001-12-03 00:31:06 adam Exp $
 AC_INIT(ir-tcl.h)
 dnl ------ Substitutions
 AC_SUBST(CC)
@@ -35,6 +35,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
@@ -60,7 +63,9 @@ if test -r ${tclconfig}/tclConfig.sh; then
        AC_MSG_CHECKING(for Tcl)
        . ${tclconfig}/tclConfig.sh
        TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
-       if test "${TCL_PREFIX}" = "/usr"; then
+       if test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then
+               TCLINC=-I${TCL_PREFIX}/include/tcl${TCL_VERSION}
+       elif test "${TCL_PREFIX}" = "/usr"; then
                TCLINC=""
        else
                TCLINC=-I${TCL_PREFIX}/include
@@ -135,64 +140,64 @@ else
                else
                        AC_MSG_RESULT($TK_VERSION)
                fi
-       fi
-       AC_PATH_X
-       not_really_there=""
-       if test "$no_x" = ""; then
-               if test "$x_includes" = ""; then
-                       AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
+               AC_PATH_X
+               not_really_there=""
+               if test "$no_x" = ""; then
+                       if test "$x_includes" = ""; then
+                               AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
+                       else
+                               if test ! -r $x_includes/X11/Intrinsic.h; then
+                                       not_really_there="yes"
+                               fi
+                       fi
+               fi
+               if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
+                       echo checking for X11 header files
+                       XINCLUDES="# no special path needed"
+                       AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
+                       if test "$XINCLUDES" = nope; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
+                               for i in $dirs ; do
+                                       if test -r $i/X11/Intrinsic.h; then
+                                               XINCLUDES=" -I$i"
+                                       fi
+                               done
+                       fi
                else
-                       if test ! -r $x_includes/X11/Intrinsic.h; then
-                               not_really_there="yes"
+                       if test "$x_includes" != ""; then
+                               XINCLUDES=-I$x_includes
+                       else
+                               XINCLUDES="# no special path needed"
                        fi
                fi
-       fi
-       if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
-               echo checking for X11 header files
-               XINCLUDES="# no special path needed"
-               AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
-               if test "$XINCLUDES" = nope; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
+               if test "$XINCLUDES" = nope; then
+                       echo "Warning:  couldn't find any X11 include files."
+                       XINCLUDES="# no include files found"
+               fi
+               if test "$no_x" = yes; then
+                       XLIBSW=nope
+                       if test "$XLIBSW" = nope; then
+                               dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
                        for i in $dirs ; do
-                               if test -r $i/X11/Intrinsic.h; then
-                                       XINCLUDES=" -I$i"
+                               if test -r $i/libX11.a; then
+                                       XLIBSW="-L$i -lX11"
                                fi
                        done
                fi
-       else
-               if test "$x_includes" != ""; then
-                       XINCLUDES=-I$x_includes
                else
-                       XINCLUDES="# no special path needed"
-               fi
-       fi
-       if test "$XINCLUDES" = nope; then
-               echo "Warning:  couldn't find any X11 include files."
-               XINCLUDES="# no include files found"
-       fi
-       if test "$no_x" = yes; then
-               XLIBSW=nope
-               if test "$XLIBSW" = nope; then
-                       dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
-               for i in $dirs ; do
-                       if test -r $i/libX11.a; then
-                               XLIBSW="-L$i -lX11"
+                       if test "$x_libraries" = ""; then
+                               XLIBSW=-lX11
+                       else
+                               XLIBSW="-L$x_libraries -lX11"
                        fi
-               done
-       fi
-       else
-               if test "$x_libraries" = ""; then
+               fi
+               if test "$XLIBSW" = nope ; then
+                       AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow)
+               fi
+               if test "$XLIBSW" = nope ; then
+                       echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
                        XLIBSW=-lX11
-               else
-                       XLIBSW="-L$x_libraries -lX11"
                fi
        fi
-       if test "$XLIBSW" = nope ; then
-               AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow)
-       fi
-       if test "$XLIBSW" = nope ; then
-               echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
-               XLIBSW=-lX11
-       fi
        TKINC=$XINCLUDES
        TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
        IRCLIENT_SHELL=ir-tk