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
Changed to use YAZ version 1.4. The new comstack utility, cs_straddr,
[ir-tcl-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
277a6f9
..
2e9b2d3
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,7
+1,7
@@
dnl IR toolkit for tcl/tk
dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1996
+dnl (c) Index Data 1996-1997
dnl See the file LICENSE for details.
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.21 1997-04-30 07:26:07 adam Exp $
AC_INIT(ir-tcl.h)
CC=${CC-cc}
dnl ------ Substitutions
AC_INIT(ir-tcl.h)
CC=${CC-cc}
dnl ------ Substitutions
@@
-15,6
+15,11
@@
AC_SUBST(MOSI)
AC_SUBST(MOSIDIR)
AC_SUBST(MOSILIB)
AC_SUBST(MOSIINC)
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)
dnl
dnl ------ Preliminary settings
AC_PROG_INSTALL
dnl
dnl ------ Preliminary settings
AC_PROG_INSTALL
@@
-78,8
+83,18
@@
if test -r ${tryprefix}/lib/tclConfig.sh; then
TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
TCLINC=-I${TCL_PREFIX}/include
RANLIB=$TCL_RANLIB
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}
AC_MSG_RESULT($TCL_VERSION)
else
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)
AC_PROG_RANLIB
checkBoth=0
AC_CHECK_FUNC(connect, tk_checkSocket=0, tk_checkSocket=1)
@@
-94,7
+109,7
@@
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 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
if test -r ${tryprefix}/lib/libtcl${i}.a; then
TCL_VERSION=$i
fi
@@
-126,7
+141,7
@@
if test -r ${tryprefix}/lib/tkConfig.sh; then
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 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
if test -r ${tryprefix}/lib/libtk${i}.a; then
TK_VERSION=$i
fi