Mercurial > vim

comparison src/configure.in @ 3833:4da6003f0f0e v7.3.674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.674 Problem: Can't compile with Lua/dyn on Cygwin. Solution: Adjust configure to use the right library name. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Wed, 03 Oct 2012 14:48:08 +0200
parents 2b3b7b483708
children de253f606048
comparison
equal deleted inserted replaced
3832:47036f674d53 3833:4da6003f0f0e
453 fi 453 fi
454 fi 454 fi
455 455
456 LUA_INC= 456 LUA_INC=
457 if test "X$vi_cv_path_lua_pfx" != "X"; then 457 if test "X$vi_cv_path_lua_pfx" != "X"; then
458 dnl -- try to find Lua executable
459 AC_PATH_PROG(vi_cv_path_lua, lua)
460 if test "X$vi_cv_path_lua" != "X"; then
461 dnl -- find Lua version
462 AC_CACHE_CHECK(Lua version, vi_cv_version_lua,
463 [ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ])
464 fi
458 AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include) 465 AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
459 if test -f $vi_cv_path_lua_pfx/include/lua.h; then 466 if test -f $vi_cv_path_lua_pfx/include/lua.h; then
460 AC_MSG_RESULT(yes) 467 AC_MSG_RESULT(yes)
461 else 468 else
462 AC_MSG_RESULT(no) 469 AC_MSG_RESULT(no)
463 dnl -- try to find Lua executable 470 AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
464 AC_PATH_PROG(vi_cv_path_lua, lua) 471 if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
465 if test "X$vi_cv_path_lua" != "X"; then 472 AC_MSG_RESULT(yes)
466 dnl -- find Lua version 473 LUA_INC=/lua$vi_cv_version_lua
467 AC_CACHE_CHECK(Lua version, vi_cv_version_lua, 474 else
468 [ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ]) 475 AC_MSG_RESULT(no)
469 AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua) 476 vi_cv_path_lua_pfx=
470 if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
471 AC_MSG_RESULT(yes)
472 LUA_INC=/lua$vi_cv_version_lua
473 else
474 AC_MSG_RESULT(no)
475 vi_cv_path_lua_pfx=
476 fi
477 fi 477 fi
478 fi 478 fi
479 fi 479 fi
480 480
481 if test "X$vi_cv_path_lua_pfx" != "X"; then 481 if test "X$vi_cv_path_lua_pfx" != "X"; then
482 if test "X$vi_cv_version_lua" != "X"; then 482 if test "X$LUA_INC" != "X"; then
483 dnl Test alternate location using version 483 dnl Test alternate location using version
484 LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua" 484 LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
485 else 485 else
486 LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua" 486 LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
487 fi 487 fi
489 LUA_SRC="if_lua.c" 489 LUA_SRC="if_lua.c"
490 LUA_OBJ="objects/if_lua.o" 490 LUA_OBJ="objects/if_lua.o"
491 LUA_PRO="if_lua.pro" 491 LUA_PRO="if_lua.pro"
492 AC_DEFINE(FEAT_LUA) 492 AC_DEFINE(FEAT_LUA)
493 if test "$enable_luainterp" = "dynamic"; then 493 if test "$enable_luainterp" = "dynamic"; then
494 dnl Determine the SONAME for the current version, but fallback to 494 if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
495 dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found. 495 vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
496 for i in 0 1 2 3 4 5 6 7 8 9; do 496 else
497 if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then 497 dnl Determine the SONAME for the current version, but fallback to
498 LUA_SONAME=".$i" 498 dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
499 break 499 for i in 0 1 2 3 4 5 6 7 8 9; do
500 fi 500 if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
501 done 501 LUA_SONAME=".$i"
502 break
503 fi
504 done
505 vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
506 fi
502 AC_DEFINE(DYNAMIC_LUA) 507 AC_DEFINE(DYNAMIC_LUA)
503 LUA_LIBS="" 508 LUA_LIBS=""
504 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS" 509 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
505 fi 510 fi
506 fi 511 fi
507 if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then 512 if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
508 AC_MSG_ERROR([could not configure lua]) 513 AC_MSG_ERROR([could not configure lua])
509 fi 514 fi