aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.674

Browse Source 
Problem:    Can't compile with Lua/dyn on Cygwin.
Solution:   Adjust configure to use the right library name. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2012-10-03 14:48:08 +02:00
parent 718f007499
commit 1e91f2606b
3 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/auto/configure vendored
View File

@ -4648,15 +4648,7 @@ $as_echo "not set, default to /usr" >&6; }
LUA_INC= LUA_INC=
if test "X$vi_cv_path_lua_pfx" != "X"; then if test "X$vi_cv_path_lua_pfx" != "X"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 # Extract the first word of "lua", so it can be a program name with args.
$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
if test -f $vi_cv_path_lua_pfx/include/lua.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
# Extract the first word of "lua", so it can be a program name with args.
set dummy lua; ac_word=$2 set dummy lua; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; }
@ -4696,8 +4688,8 @@ $as_echo "no" >&6; }
fi fi
if test "X$vi_cv_path_lua" != "X"; then if test "X$vi_cv_path_lua" != "X"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
$as_echo_n "checking Lua version... " >&6; } $as_echo_n "checking Lua version... " >&6; }
if test "${vi_cv_version_lua+set}" = set; then : if test "${vi_cv_version_lua+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -4706,23 +4698,31 @@ else
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5
$as_echo "$vi_cv_version_lua" >&6; } $as_echo "$vi_cv_version_lua" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5 fi
$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 if test -f $vi_cv_path_lua_pfx/include/lua.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
LUA_INC=/lua$vi_cv_version_lua else
else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
vi_cv_path_lua_pfx= { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
fi $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
LUA_INC=/lua$vi_cv_version_lua
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
vi_cv_path_lua_pfx=
fi fi
fi fi
fi fi
if test "X$vi_cv_path_lua_pfx" != "X"; then if test "X$vi_cv_path_lua_pfx" != "X"; then
if test "X$vi_cv_version_lua" != "X"; then if test "X$LUA_INC" != "X"; then
LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua" LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
else else
LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua" LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
@ -4734,16 +4734,21 @@ $as_echo "no" >&6; }
$as_echo "#define FEAT_LUA 1" >>confdefs.h $as_echo "#define FEAT_LUA 1" >>confdefs.h
if test "$enable_luainterp" = "dynamic"; then if test "$enable_luainterp" = "dynamic"; then
for i in 0 1 2 3 4 5 6 7 8 9; do if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
LUA_SONAME=".$i" else
break for i in 0 1 2 3 4 5 6 7 8 9; do
fi if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
done LUA_SONAME=".$i"
break
fi
done
vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
fi
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
LUA_LIBS="" LUA_LIBS=""
LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS" LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
fi fi
fi fi
if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then

53
src/configure.in
View File

@ -455,31 +455,31 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
LUA_INC= LUA_INC=
if test "X$vi_cv_path_lua_pfx" != "X"; then if test "X$vi_cv_path_lua_pfx" != "X"; then
dnl -- try to find Lua executable
AC_PATH_PROG(vi_cv_path_lua, lua)
if test "X$vi_cv_path_lua" != "X"; then
dnl -- find Lua version
AC_CACHE_CHECK(Lua version, vi_cv_version_lua,
[ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ])
fi
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include) AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
if test -f $vi_cv_path_lua_pfx/include/lua.h; then if test -f $vi_cv_path_lua_pfx/include/lua.h; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
dnl -- try to find Lua executable AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
AC_PATH_PROG(vi_cv_path_lua, lua) if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
if test "X$vi_cv_path_lua" != "X"; then AC_MSG_RESULT(yes)
dnl -- find Lua version LUA_INC=/lua$vi_cv_version_lua
AC_CACHE_CHECK(Lua version, vi_cv_version_lua, else
[ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ]) AC_MSG_RESULT(no)
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua) vi_cv_path_lua_pfx=
if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
AC_MSG_RESULT(yes)
LUA_INC=/lua$vi_cv_version_lua
else
AC_MSG_RESULT(no)
vi_cv_path_lua_pfx=
fi
fi fi
fi fi
fi fi
if test "X$vi_cv_path_lua_pfx" != "X"; then if test "X$vi_cv_path_lua_pfx" != "X"; then
if test "X$vi_cv_version_lua" != "X"; then if test "X$LUA_INC" != "X"; then
dnl Test alternate location using version dnl Test alternate location using version
LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua" LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
else else
@ -491,17 +491,22 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
LUA_PRO="if_lua.pro" LUA_PRO="if_lua.pro"
AC_DEFINE(FEAT_LUA) AC_DEFINE(FEAT_LUA)
if test "$enable_luainterp" = "dynamic"; then if test "$enable_luainterp" = "dynamic"; then
dnl Determine the SONAME for the current version, but fallback to if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found. vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
for i in 0 1 2 3 4 5 6 7 8 9; do else
if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then dnl Determine the SONAME for the current version, but fallback to
LUA_SONAME=".$i" dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
break for i in 0 1 2 3 4 5 6 7 8 9; do
fi if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
done LUA_SONAME=".$i"
break
fi
done
vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
fi
AC_DEFINE(DYNAMIC_LUA) AC_DEFINE(DYNAMIC_LUA)
LUA_LIBS="" LUA_LIBS=""
LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS" LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
fi fi
fi fi
if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
674,
/**/ /**/
673, 673,
/**/ /**/