Minor.

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

diff --git a/configure.in b/configure.in
index 277a6f9..827f0a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1996
+dnl (c) Index Data 1996-1998
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.19 1996-09-03 13:52:09 adam Exp $
+dnl $Id: configure.in,v 1.24 1998-03-11 11:14:04 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 dnl ------ Substitutions
@@ -15,10 +15,29 @@ AC_SUBST(MOSI)
 AC_SUBST(MOSIDIR)
 AC_SUBST(MOSILIB)
 AC_SUBST(MOSIINC)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(SHLIB_VERSION)
+AC_SUBST(SHLIB_IRTCL)
+AC_SUBST(ALL_SPEC)
+AC_SUBST(IRCLIENT_SHELL)
 dnl
 dnl ------ Preliminary settings
 AC_PROG_INSTALL
 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)
@@ -29,7 +48,7 @@ dnl
 AC_MSG_CHECKING(for YAZ directory)
 AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
-       YAZDIR="../yaz-1.2"
+       YAZDIR="../yaz-1.4"
 elif test "$YAZDIR" = ""; then
        YAZDIR=../yaz
         for i in ../yaz* ../yaz; do
@@ -74,12 +93,23 @@ else
 fi
 if test -r ${tryprefix}/lib/tclConfig.sh; then
        AC_MSG_CHECKING(for Tcl)
-       source ${tryprefix}/lib/tclConfig.sh
+       . ${tryprefix}/lib/tclConfig.sh
        TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
        TCLINC=-I${TCL_PREFIX}/include
        RANLIB=$TCL_RANLIB
+        SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+       SHLIB_LD=$TCL_SHLIB_LD
+       SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+       SHLIB_VERSION=$TCL_SHLIB_VERSION
+       SHLIB_IRTCL=irtcl${TCL_SHLIB_SUFFIX}
+       ALL_SPEC="irtcl${TCL_SHLIB_SUFFIX} libirtcl.a"
        AC_MSG_RESULT($TCL_VERSION)
 else
+        SHLIB_CFLAGS=""
+       SHLIB_LD="shared-linker"
+       SHLIB_SUFFIX=""
+       SHLIB_VERSION=""
+       SHLIB_IRTCL="irtcl-shared"
        AC_PROG_RANLIB
        checkBoth=0
        AC_CHECK_FUNC(connect, tk_checkSocket=0, tk_checkSocket=1)
@@ -94,7 +124,7 @@ else
        AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
        AC_MSG_CHECKING(for Tcl)
        TCL_VERSION=nope
-       for i in "" 7.4 7.5 7.6 7.7; do
+       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
@@ -113,20 +143,22 @@ else
                TCLINC=-I${tryprefix}/include
        fi
        TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
+       ALL_SPEC="ir-tcl ir-tk"
 fi
 dnl 
 dnl ------ look for Tk
 dnl
 if test -r ${tryprefix}/lib/tkConfig.sh; then
        AC_MSG_CHECKING(for Tk)
-       source ${tryprefix}/lib/tkConfig.sh
+       . ${tryprefix}/lib/tkConfig.sh
        AC_MSG_RESULT($TK_VERSION)
        TKINC=${TK_XINCLUDES}
        TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
+       IRCLIENT_SHELL=wish${TK_VERSION}
 else
        AC_MSG_CHECKING(for Tk)
        TK_VERSION=nope
-       for i in "" 4.0 4.1 4.2 4.3; do
+       for i in "" 4.0 4.1 4.2 8.0; do
                if test -r ${tryprefix}/lib/libtk${i}.a; then
                        TK_VERSION=$i
                fi
@@ -201,5 +233,6 @@ else
        fi
        TKINC=$XINCLUDES
        TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
+       IRCLIENT_SHELL=ir-tk
 fi
 AC_OUTPUT(Makefile)