From b3d8785ab5540c846c123ab16556fb93965bb9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 26 Feb 2016 09:51:57 +0000 Subject: Lua configure.ac improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use PKG_WIRESHARK_CHECK_SYSTEM_MODULES for consistency with other system dependencies. Give slightly more informative configure messages other than multiple 'checking for LUA'. Check for headers using pkg-config to avoid undefined symbols in config.h. Change-Id: I8d3df9ccf6f718d7d055da4f713af60d46d89e33 Reviewed-on: https://code.wireshark.org/review/14173 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- acinclude.m4 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 95492f4b27..b432d4cea2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -720,10 +720,21 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ # work reliably (some package names are not searched for). for pkg in "lua < 5.3" lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50 do - PKG_CHECK_MODULES(LUA, $pkg, [have_lua=yes], [true]) + AC_MSG_CHECKING(if you have $pkg) + PKG_CHECK_EXISTS($pkg, + [ + AC_MSG_RESULT(yes) + have_lua=yes + ], + [ + AC_MSG_RESULT(no) + ]) if test "x$have_lua" = "xyes" then + PKG_WIRESHARK_CHECK_SYSTEM_MODULES(LUA, $pkg) + CPPFLAGS="$LUA_CFLAGS $CPPFLAGS" + AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h) break fi done -- cgit v1.2.1