Mercurial > vim

comparison src/configure.in @ 7538:c9fc24b76293 v7.4.1070

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/8a5115cf18751022387af2085f374d38c60dde83 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 9 19:41:11 2016 +0100 patch 7.4.1070 Problem: The Tcl interface can't be loaded dynamically on Unix. Solution: Make it possible to load it dynamically. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 09 Jan 2016 19:45:05 +0100
parents c79a52efcf2f
children 77a14f3bc18b
comparison
equal deleted inserted replaced
7537:e1a5a830aebb 7538:c9fc24b76293
1620 fi 1620 fi
1621 fi 1621 fi
1622 1622
1623 AC_MSG_CHECKING(--enable-tclinterp argument) 1623 AC_MSG_CHECKING(--enable-tclinterp argument)
1624 AC_ARG_ENABLE(tclinterp, 1624 AC_ARG_ENABLE(tclinterp,
1625 [ --enable-tclinterp Include Tcl interpreter.], , 1625 [ --enable-tclinterp[=OPTS] Include Tcl interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1626 [enable_tclinterp="no"]) 1626 [enable_tclinterp="no"])
1627 AC_MSG_RESULT($enable_tclinterp) 1627 AC_MSG_RESULT($enable_tclinterp)
1628 1628
1629 if test "$enable_tclinterp" = "yes"; then 1629 if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then
1630 1630
1631 dnl on FreeBSD tclsh is a silly script, look for tclsh8.[5420] 1631 dnl on FreeBSD tclsh is a silly script, look for tclsh8.[5420]
1632 AC_MSG_CHECKING(--with-tclsh argument) 1632 AC_MSG_CHECKING(--with-tclsh argument)
1633 AC_ARG_WITH(tclsh, [ --with-tclsh=PATH which tclsh to use (default: tclsh8.0)], 1633 AC_ARG_WITH(tclsh, [ --with-tclsh=PATH which tclsh to use (default: tclsh8.0)],
1634 tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name), 1634 tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name),
1658 AC_MSG_CHECKING(Tcl version) 1658 AC_MSG_CHECKING(Tcl version)
1659 if echo 'exit [[expr [info tclversion] < 8.0]]' | "$vi_cv_path_tcl" - ; then 1659 if echo 'exit [[expr [info tclversion] < 8.0]]' | "$vi_cv_path_tcl" - ; then
1660 tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -` 1660 tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -`
1661 AC_MSG_RESULT($tclver - OK); 1661 AC_MSG_RESULT($tclver - OK);
1662 tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -` 1662 tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
1663 tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
1663 1664
1664 AC_MSG_CHECKING(for location of Tcl include) 1665 AC_MSG_CHECKING(for location of Tcl include)
1665 if test "x$MACOSX" != "xyes"; then 1666 if test "x$MACOSX" != "xyes"; then
1666 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" 1667 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
1667 else 1668 else
1692 for try in $tclcnf; do 1693 for try in $tclcnf; do
1693 if test -f "$try/tclConfig.sh"; then 1694 if test -f "$try/tclConfig.sh"; then
1694 AC_MSG_RESULT($try/tclConfig.sh) 1695 AC_MSG_RESULT($try/tclConfig.sh)
1695 . "$try/tclConfig.sh" 1696 . "$try/tclConfig.sh"
1696 dnl use eval, because tcl 8.2 includes ${TCL_DBGX} 1697 dnl use eval, because tcl 8.2 includes ${TCL_DBGX}
1697 TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` 1698 if test "$enable_tclinterp" = "dynamic"; then
1699 TCL_LIBS=`eval echo "$TCL_STUB_LIB_SPEC $TCL_LIBS"`
1700 else
1701 TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
1702 fi
1698 dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the 1703 dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the
1699 dnl "-D_ABC" items. Watch out for -DFOO=long\ long. 1704 dnl "-D_ABC" items. Watch out for -DFOO=long\ long.
1700 TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[[^-]]/d' -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` 1705 TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[[^-]]/d' -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
1701 break 1706 break
1702 fi 1707 fi
1735 TCL_CFLAGS="-I$TCL_INC $TCL_DEFS" 1740 TCL_CFLAGS="-I$TCL_INC $TCL_DEFS"
1736 fi 1741 fi
1737 fi 1742 fi
1738 else 1743 else
1739 AC_MSG_RESULT(too old; need Tcl version 8.0 or later) 1744 AC_MSG_RESULT(too old; need Tcl version 8.0 or later)
1745 fi
1746 fi
1747 if test "$enable_tclinterp" = "dynamic"; then
1748 if test "X$TCL_SRC" != "X" -a "X$tcldll" != "X"; then
1749 AC_DEFINE(DYNAMIC_TCL)
1750 TCL_CFLAGS="-DDYNAMIC_TCL_DLL=\\\"$tcldll\\\" -DDYNAMIC_TCL_VER=\\\"$tclver\\\" $TCL_CFLAGS"
1740 fi 1751 fi
1741 fi 1752 fi
1742 if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then 1753 if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
1743 AC_MSG_ERROR([could not configure Tcl]) 1754 AC_MSG_ERROR([could not configure Tcl])
1744 fi 1755 fi