diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-10-03 14:48:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-10-03 14:48:08 +0200 |
| commit | 1e91f2606b2380e6e443e7389f7648d86fb8c654 (patch) | |
| tree | ba5fd223976d6c48f120bf2096c74cad92ed57c2 /src/configure.in | |
| parent | 718f007499a5d3f0ff9c0a645780133131ab2b2e (diff) | |
| download | vim-git-1e91f2606b2380e6e443e7389f7648d86fb8c654.tar.gz | |
updated for version 7.3.674v7.3.674
Problem: Can't compile with Lua/dyn on Cygwin.
Solution: Adjust configure to use the right library name. (Ken Takata)
Diffstat (limited to 'src/configure.in')
| -rw-r--r-- | src/configure.in | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/src/configure.in b/src/configure.in index 5c14fc0c5..4b8c20079 100644 --- a/src/configure.in +++ b/src/configure.in @@ -455,31 +455,31 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then LUA_INC= 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) if test -f $vi_cv_path_lua_pfx/include/lua.h; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - 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/.* //'` ]) - AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua) - 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 + AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua) + 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 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 LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua" else @@ -491,17 +491,22 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then LUA_PRO="if_lua.pro" AC_DEFINE(FEAT_LUA) if test "$enable_luainterp" = "dynamic"; then - dnl Determine the SONAME for the current version, but fallback to - dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found. - for i in 0 1 2 3 4 5 6 7 8 9; do - if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then - LUA_SONAME=".$i" - break - fi - done + if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then + vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll" + else + dnl Determine the SONAME for the current version, but fallback to + dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found. + for i in 0 1 2 3 4 5 6 7 8 9; do + if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then + LUA_SONAME=".$i" + break + fi + done + vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME" + fi AC_DEFINE(DYNAMIC_LUA) 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 if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then |