diff options
| author | Li-Wen Hsu <lwhsu@lwhsu.org> | 2014-02-20 01:18:53 +0800 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-02-24 16:41:10 +0100 |
| commit | 0caa42ca6cbbbf9e18821d824e7a1422c0a6fb8e (patch) | |
| tree | 1dd6501f0a57dd024cb2e99a77d90e530e1a966a | |
| parent | 6745ad4069f2fab26d72f374079cb8b7a4cf350f (diff) | |
| download | autoconf-archive-0caa42ca6cbbbf9e18821d824e7a1422c0a6fb8e.tar.gz | |
AX_LUA: FreeBSD support
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | m4/ax_lua.m4 | 17 |
2 files changed, 14 insertions, 6 deletions
@@ -10,6 +10,9 @@ * Noteworthy changes in release ?.? (????-??-??) [?] + AX_LUA has improved support for FreeBSD. Further details can be found at + <https://savannah.gnu.org/patch/?8318>. + The new macros AX_CXX_HAVE_BAD_FUNCTION_CALL, AX_CXX_HAVE_BIND, AX_CXX_HAVE_BIT_AND, AX_CXX_HAVE_BIT_OR, AX_CXX_HAVE_BIT_XOR, AX_CXX_HAVE_CREF, AX_CXX_HAVE_FUNCTION, AX_CXX_HAVE_HASH, diff --git a/m4/ax_lua.m4 b/m4/ax_lua.m4 index c6f5974..4c995fa 100644 --- a/m4/ax_lua.m4 +++ b/m4/ax_lua.m4 @@ -182,7 +182,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 20 +#serial 21 dnl ========================================================================= dnl AX_PROG_LUA([MINIMUM-VERSION], [TOO-BIG-VERSION], @@ -195,7 +195,7 @@ AC_DEFUN([AX_PROG_LUA], dnl Find a Lua interpreter. m4_define_default([_AX_LUA_INTERPRETER_LIST], - [lua lua5.2 lua5.1 lua50]) + [lua lua5.2 lua52 lua5.1 lua51 lua50]) m4_if([$1], [], [ dnl No version check is needed. Find any Lua interpreter. @@ -575,10 +575,15 @@ AC_DEFUN([AX_LUA_LIBS], dnl Try to find the Lua libs. _ax_lua_saved_libs=$LIBS LIBS="$LIBS $LUA_LIB" - AC_SEARCH_LIBS([lua_load], [lua$LUA_VERSION lua$LUA_SHORT_VERSION lua], - [_ax_found_lua_libs='yes'], - [_ax_found_lua_libs='no'], - [$_ax_lua_extra_libs]) + AC_SEARCH_LIBS([lua_load], + [ lua$LUA_VERSION \ + lua$LUA_SHORT_VERSION \ + lua-$LUA_VERSION \ + lua-$LUA_SHORT_VERSION \ + lua], + [_ax_found_lua_libs='yes'], + [_ax_found_lua_libs='no'], + [$_ax_lua_extra_libs]) LIBS=$_ax_lua_saved_libs AS_IF([test "x$ac_cv_search_lua_load" != 'xno' && |