From: Aki Tuomi Date: Mon, 1 Sep 2014 07:50:27 +0000 (+0300) Subject: Detect lua5.2 X-Git-Tag: auth-3.4.0-rc2~27^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29c1b9c38b8358c2547583862413cf129d9ccd54;p=thirdparty%2Fpdns.git Detect lua5.2 --- diff --git a/m4/pdns_with_lua.m4 b/m4/pdns_with_lua.m4 index 71e75905d3..116c267b75 100644 --- a/m4/pdns_with_lua.m4 +++ b/m4/pdns_with_lua.m4 @@ -7,29 +7,22 @@ AC_DEFUN([PDNS_WITH_LUA],[ AS_IF([test "x$with_lua" != "xno"],[ AS_IF([test "x$with_lua" = "xyes"], - [LUAPC=lua], - [LUAPC=$with_lua]) - - PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - with_lua=yes - ],[ - LUAPC=lua5.1 - PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - with_lua=yes - ],[ - LUAPC=lua-5.1 + [for LUAPC in lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do + if test "x$LUA_LIBS" != "x"; then break; fi + PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + ]) + done + ], + [LUAPC="$with_lua" PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ AC_DEFINE([HAVE_LUA], [1], [liblua]) AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) with_lua=yes - ],[ - with_lua=no ]) - ]) ]) + AC_MSG_CHECKING([for chosen LUA]) + AC_MSG_RESULT([$LUAPC]) ]) ])