projects
/
ir-tcl-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spell fix of an error message.
[ir-tcl-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
278026b
..
a113902
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,20
+1,21
@@
dnl IR toolkit for tcl/tk
dnl (c) Index Data 1996
dnl See the file LICENSE for details.
dnl IR toolkit for tcl/tk
dnl (c) Index Data 1996
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.15 1996-03-27 17:00:08 adam Exp $
+dnl $Id: configure.in,v 1.20 1997-04-13 19:00:42 adam Exp $
AC_INIT(ir-tcl.h)
CC=${CC-cc}
dnl ------ Substitutions
AC_SUBST(CC)
AC_SUBST(TCLLIB)
AC_SUBST(TKLIB)
AC_INIT(ir-tcl.h)
CC=${CC-cc}
dnl ------ Substitutions
AC_SUBST(CC)
AC_SUBST(TCLLIB)
AC_SUBST(TKLIB)
-AC_SUBST(TCLINCLUDE)
-AC_SUBST(TKINCLUDE)
+AC_SUBST(TCLINC)
+AC_SUBST(TKINC)
AC_SUBST(YAZDIR)
AC_SUBST(MOSI)
AC_SUBST(MOSIDIR)
AC_SUBST(MOSILIB)
AC_SUBST(MOSIINC)
AC_SUBST(YAZDIR)
AC_SUBST(MOSI)
AC_SUBST(MOSIDIR)
AC_SUBST(MOSILIB)
AC_SUBST(MOSIINC)
+dnl
dnl ------ Preliminary settings
AC_PROG_INSTALL
AC_PREFIX_PROGRAM(tclsh)
dnl ------ Preliminary settings
AC_PROG_INSTALL
AC_PREFIX_PROGRAM(tclsh)
@@
-22,14
+23,16
@@
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = no; then
AC_MSG_WARN(Your system doesn't seem to support ANSI C)
fi
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 YAZ/XTImOSI
dnl ------ look for YAZ/XTImOSI
+dnl
AC_MSG_CHECKING(for YAZ directory)
AC_ARG_WITH(yazdir,[ --with-yazdir Yaz directory], [YAZDIR=$withval])
if test "$YAZDIR" = "yes"; then
AC_MSG_CHECKING(for YAZ directory)
AC_ARG_WITH(yazdir,[ --with-yazdir Yaz directory], [YAZDIR=$withval])
if test "$YAZDIR" = "yes"; then
- YAZDIR="../yaz-1.0"
+ YAZDIR="../yaz-1.2"
elif test "$YAZDIR" = ""; then
elif test "$YAZDIR" = ""; then
- YAZDIR="../yaz"
- for i in ../yaz-1.0pl3 ../yaz-1.0pl4 ../yaz-1.0pl5 ../yaz; do
+ YAZDIR=../yaz
+ for i in ../yaz* ../yaz; do
if test -d $i; then
YAZDIR=$i
fi
if test -d $i; then
YAZDIR=$i
fi
@@
-61,7
+64,9
@@
else
MOSITELL=no
fi
AC_MSG_RESULT($MOSITELL)
MOSITELL=no
fi
AC_MSG_RESULT($MOSITELL)
+dnl
dnl ------ look for Tcl
dnl ------ look for Tcl
+dnl
if test "x$prefix" = xNONE; then
tryprefix=/usr/local
else
if test "x$prefix" = xNONE; then
tryprefix=/usr/local
else
@@
-70,13
+75,8
@@
fi
if test -r ${tryprefix}/lib/tclConfig.sh; then
AC_MSG_CHECKING(for Tcl)
source ${tryprefix}/lib/tclConfig.sh
if test -r ${tryprefix}/lib/tclConfig.sh; then
AC_MSG_CHECKING(for Tcl)
source ${tryprefix}/lib/tclConfig.sh
- if test "$TCL_LIB_VERSIONS_OK" = "yes"; then
- TCLLIB="-L${TCL_PREFIX}/lib -ltcl${TCL_VERSION}"
- else
- TCLLIB=${TCL_PREFIX}/lib/${TCL_LIB_FILE}
- fi
- TCLLIB="${TCLLIB} ${TCL_LIBS}"
- TCLINCLUDE=-I${TCL_PREFIX}/include
+ TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
+ TCLINC=-I${TCL_PREFIX}/include
RANLIB=$TCL_RANLIB
AC_MSG_RESULT($TCL_VERSION)
else
RANLIB=$TCL_RANLIB
AC_MSG_RESULT($TCL_VERSION)
else
@@
-94,37
+94,39
@@
else
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
AC_MSG_CHECKING(for Tcl)
TCL_VERSION=nope
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; 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
done
if test "$TCL_VERSION" = nope; then
AC_MSG_WARN(Didn't find Tcl)
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)
- TCLLIB=-ltcl
- TCLINCLUDE=" # -I.. Tcl/Tk include path"
+ 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
else
if test "$TCL_VERSION" = ""; then
AC_MSG_RESULT(7.3)
else
AC_MSG_RESULT($TCL_VERSION)
fi
- TCLLIB=${tryprefix}/lib/libtcl${TCL_VERSION}.a
- TCLINCLUDE=-I${tryprefix}/include
+ TCL_LIB_SPEC=${tryprefix}/lib/libtcl${TCL_VERSION}.a
+ TCLINC=-I${tryprefix}/include
fi
fi
- TCLLIB="${TCLLIB} ${LIBS} -lm"
+ TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
fi
fi
+dnl
dnl ------ look for Tk
dnl ------ look for Tk
+dnl
if test -r ${tryprefix}/lib/tkConfig.sh; then
AC_MSG_CHECKING(for Tk)
source ${tryprefix}/lib/tkConfig.sh
AC_MSG_RESULT($TK_VERSION)
if test -r ${tryprefix}/lib/tkConfig.sh; then
AC_MSG_CHECKING(for Tk)
source ${tryprefix}/lib/tkConfig.sh
AC_MSG_RESULT($TK_VERSION)
- TKINCLUDE=${TK_XINCLUDES}
- TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TK_LIBS}"
+ TKINC=${TK_XINCLUDES}
+ TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
else
AC_MSG_CHECKING(for Tk)
TK_VERSION=nope
else
AC_MSG_CHECKING(for Tk)
TK_VERSION=nope
- for i in "" 4.0 4.1; 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
if test -r ${tryprefix}/lib/libtk${i}.a; then
TK_VERSION=$i
fi
@@
-140,7
+142,6
@@
else
AC_MSG_RESULT($TK_VERSION)
fi
fi
AC_MSG_RESULT($TK_VERSION)
fi
fi
- TKLIB=${tryprefix}/lib/libtk${i}.a
AC_PATH_X
not_really_there=""
if test "$no_x" = ""; then
AC_PATH_X
not_really_there=""
if test "$no_x" = ""; then
@@
-198,7
+199,7
@@
else
echo "Warning: couldn't find the X11 library archive. Using -lX11."
XLIBSW=-lX11
fi
echo "Warning: couldn't find the X11 library archive. Using -lX11."
XLIBSW=-lX11
fi
- TKINCLUDE=$XINCLUDE
+ TKINC=$XINCLUDES
TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
fi
AC_OUTPUT(Makefile)
TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
fi
AC_OUTPUT(Makefile)