From 2dd13e7852c788efacab13cbdec0c7cd723f25a9 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 1 Sep 2014 10:50:27 +0300 Subject: [PATCH] Detect lua5.2 and improve the script --- m4/pdns_with_lua.m4 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/m4/pdns_with_lua.m4 b/m4/pdns_with_lua.m4 index 71edd4bf3..a08eba966 100644 --- a/m4/pdns_with_lua.m4 +++ b/m4/pdns_with_lua.m4 @@ -1,20 +1,21 @@ AC_DEFUN([PDNS_WITH_LUA],[ dnl Check for lua AC_ARG_WITH([lua], - [AS_HELP_STRING([--with-lua], [build Lua Bindings @<:@default=yes@:>@])], + [AS_HELP_STRING([--with-lua], [build Lua Bindings @<:@default=auto@:>@])], [with_lua=$withval], - [with_lua=yes]) + [with_lua=auto]) AS_IF([test "x$with_lua" != "xno"],[ - AS_IF([test "x$with_lua" = "xyes"], + AS_IF([test "x$with_lua" = "xyes" -o "x$with_lua" = "xauto"], [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]) - ], [with_lua=yes]) # otherwise pkg_check will fail + with_lua=yes + ], [LUAPC=""]) # otherwise pkg_check will fail done - ], + ], [LUAPC="$with_lua" PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ AC_DEFINE([HAVE_LUA], [1], [liblua]) @@ -23,6 +24,11 @@ AC_DEFUN([PDNS_WITH_LUA],[ ]) ]) AC_MSG_CHECKING([for chosen LUA]) - AC_MSG_RESULT([$LUAPC]) + AS_IF([test "x$LUAPC" = "x"], + AS_IF([test "x$with_lua" = "xyes"], + AC_MSG_ERROR([cannot find lua]), + AC_MSG_RESULT([not found]) + ), AC_MSG_RESULT([$LUAPC]) + ) ]) ]) -- 2.40.0