jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove needless Lua checking during configure

Browse source
This commit is contained in:
William S Fulton 2015-01-17 23:10:25 +00:00
commit 733851bdab
1 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

32
configure.ac
View file

@ -2092,13 +2092,12 @@ if test "$LUABIN"; then
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
fi fi
fi
# look for the header files & set LUAFLAGS accordingly # look for the header files & set LUAFLAGS accordingly
# will clear LUABIN if not present # will clear LUABIN if not present
if test -n "$LUAINCLUDE"; then if test -n "$LUAINCLUDE"; then
AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="$ISYSTEM$LUAINCLUDE"],[LUABIN=]) AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="$ISYSTEM$LUAINCLUDE"],[LUABIN=])
else else
LUA_OK="1" LUA_OK="1"
AC_CHECK_HEADER(lua.h,[LUAFLAGS=""],[LUA_OK=""]) AC_CHECK_HEADER(lua.h,[LUAFLAGS=""],[LUA_OK=""])
# if we didn't get it, going to have to look elsewhere (the hard way) # if we didn't get it, going to have to look elsewhere (the hard way)
@ -2122,24 +2121,25 @@ else
LUABIN="" # clear the bin LUABIN="" # clear the bin
fi fi
fi fi
fi fi
# look for the library files & set LUALINK accordingly # look for the library files & set LUALINK accordingly
# will clear LUABIN if not present # will clear LUABIN if not present
lua_save_LIBS=$LIBS # the code seems to disrupt LIBS, so saving lua_save_LIBS=$LIBS # the code seems to disrupt LIBS, so saving
if test -n "$LUALIB"; then if test -n "$LUALIB"; then
AC_CHECK_FILE($LUALIB/liblua.a,[LUALINK="-L$LUALIB -llua"],[LUABIN=]) AC_CHECK_FILE($LUALIB/liblua.a,[LUALINK="-L$LUALIB -llua"],[LUABIN=])
else else
AC_SEARCH_LIBS(lua_close, [lua lua5.2 lua5.1 lua51 lua5.0 lua50], [LUALINK="-l$ac_lib"],[LUABIN=]) AC_SEARCH_LIBS(lua_close, [lua lua5.2 lua5.1 lua51 lua5.0 lua50], [LUALINK="-l$ac_lib"],[LUABIN=])
fi fi
# adding lualib for lua 5.0 # adding lualib for lua 5.0
if test -z "$LUAV51"; then # extra for lua 5.0 if test -z "$LUAV51"; then # extra for lua 5.0
LUALINK="$LUALINK -llualib" LUALINK="$LUALINK -llualib"
fi fi
LIBS=$lua_save_LIBS # restore LIBS LIBS=$lua_save_LIBS # restore LIBS
fi
fi # if not disabled fi # if not disabled