From 819debdce561fd5e81aad6901211dbc0db3d3172 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Thu, 15 Nov 2012 14:00:47 +0100 Subject: [PATCH] configure: use pkg-config for luajit If luajit includes or libs is not set in configure, we fallback to pkg-config output. --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 0c7fe9a389..e370e2e2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1279,12 +1279,18 @@ AC_INIT(configure.ac) if test "$enable_luajit" = "yes"; then if test "$with_libluajit_includes" != "no"; then CPPFLAGS="${CPPFLAGS} -I${with_libluajit_includes}" + else + PKG_CHECK_MODULES([LUAJIT], [luajit]) + CPPFLAGS="${CPPFLAGS} ${LUAJIT_CFLAGS}" fi AC_CHECK_HEADER(lualib.h,LUAJIT="yes",LUAJIT="no") if test "$LUAJIT" = "yes"; then if test "$with_libluajit_libraries" != "no"; then LDFLAGS="${LDFLAGS} -L${with_libluajit_libraries}" + else + PKG_CHECK_MODULES([LUAJIT], [luajit]) + LDFLAGS="${LDFLAGS} ${LUAJIT_LIBS}" fi AC_CHECK_LIB(luajit-5.1, luaL_openlibs,, LUAJIT="no")