X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=8cb371f1be9c7607d84858d5b581a59ee2bbd9e5;hb=4b96df0e1f1db0983dff2d019373fea918b8b6ec;hp=0a5e48926c3a3bafba0c51fe7d8b31d570d31901;hpb=6811554e4d608d2ef0e13643e917830db1aa9458;p=ir-tcl-moved-to-github.git diff --git a/configure.in b/configure.in index 0a5e489..8cb371f 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,10 @@ dnl IR toolkit for tcl/tk dnl (c) Index Data 1995 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.5 1995-06-23 10:58:11 adam Exp $ -AC_INIT(README) -AC_PROG_CC +dnl $Id: configure.in,v 1.9 1995-08-28 12:21:21 adam Exp $ +AC_INIT(ir-tcl.h) +CC=${CC-cc} +AC_SUBST(CC) AC_PROG_RANLIB AC_PROG_INSTALL checkBoth=0 @@ -21,7 +22,9 @@ AC_STDC_HEADERS AC_SUBST(TCLLIB) AC_CHECK_LIB(tcl, Tcl_Eval, tclFound=1, tclFound=0, -lm) if test "$tclFound" = 1; then - TCLLIB=-ltcl + TCLLIB=-ltcl +elif test -r /usr/local/lib/libtcl7.4.a; then + TCLLIB=/usr/local/lib/libtcl7.4.a else TCLLIB=/usr/local/lib/libtcl.a fi @@ -32,12 +35,14 @@ AC_SUBST(MOSIDIR) AC_MSG_CHECKING(for YAZ directory) AC_ARG_WITH(yazdir,[ --with-yazdir Yaz directory], [YAZDIR=$withval]) if test "$YAZDIR" = "yes"; then - YAZDIR="../yaz-1.0b" + YAZDIR="../yaz-1.0b3" elif test "$YAZDIR" = ""; then - YAZDIR="../yaz-1.0b" - if test -d "../yaz"; then - YAZDIR="../yaz" - fi + YAZDIR="../yaz" + for i in ../yaz-1.0b3 ../yaz-1.0b4 ../yaz-1.0 ../yaz; do + if test -d $i; then + YAZDIR=$i + fi + done fi AC_MSG_RESULT($YAZDIR) if test ! -d $YAZDIR; then @@ -126,6 +131,8 @@ AC_SUBST(TKLIB) AC_CHECK_LIB(tk, main, tkFound=1, tkFound=0, $TCLLIB $XLIBSW -lm) if test "$tkFound" = 1; then TKLIB=-ltk +elif test -r /usr/local/lib/libtk4.0.a; then + TKLIB=/usr/local/lib/libtk4.0.a else TKLIB=/usr/local/lib/libtk.a fi