From 05103cc6937b709192438eed8333aa1fbbb6af02 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@hilluzination.de>
Date: Thu, 13 Dec 2012 20:44:38 +0100
Subject: [PATCH] lua: Use pkg-config to determine Lua version, parameters

---
 configure.ac    | 19 +++++++++++--------
 lua/Makefile.am |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 00e7e4dc2..fc8f48ef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1295,26 +1295,29 @@ fi
 AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLANG" != "xno" && test "x$ERLC" != "xno"])
 
 dnl Lua
-LUA=no
 AC_ARG_ENABLE([lua],
     AS_HELP_STRING([--disable-lua], [disable Lua language bindings]),
         [],
         [enable_lua=yes])
 AS_IF([test "x$enable_lua" != "xno"],[
-        LUA=
         AC_CHECK_PROG([LUA],[lua],[lua],[no])
-        AC_CHECK_HEADER([lua.h],[have_lua_h=yes])
-        AC_CHECK_HEADER([lauxlib.h],[have_lauxlib_h=yes])
-        AC_CHECK_LIB([lua],[lua_checkstack],[have_lua_lib=yes])
-
         AS_IF([test "x$LUA" != "xno"],[
             AC_MSG_CHECKING([for Lua version])
             LUA_VERSION=`$LUA -e 'print(_VERSION)' | awk '{print $2}'`
             AC_MSG_RESULT([$LUA_VERSION])
-            AC_SUBST([LUA_VERSION])
+            PKG_CHECK_MODULES([LUA], [lua$LUA_VERSION],
+              [
+                AC_SUBST([LUA_CFLAGS])
+                AC_SUBST([LUA_LIBS])
+                AC_SUBST([LUA_VERSION])
+                AC_DEFINE([HAVE_LUA],[1],[Lua library found at compile time])
+              ],
+              [AC_MSG_WARN([pkg-info for lua$LUA_VERSION not found])]
+            )
         ])
 ])
-AM_CONDITIONAL([HAVE_LUA], [test "x$LUA" != "xno" && test "x$have_lua_h" = "xyes" && test "x$have_lauxlib_h" = "xyes" && test "x$have_lua_lib" = "xyes"])
+AM_CONDITIONAL([HAVE_LUA],
+               [test "x$LUA_LIBS" != "x"])
 
 dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
 AS_IF([test "x$PERL" != "xno"],
diff --git a/lua/Makefile.am b/lua/Makefile.am
index be78c6a3a..9b0f7de44 100644
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -40,7 +40,8 @@ libluaguestfs_la_SOURCES = lua-guestfs.c
 
 libluaguestfs_la_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
-	-I$(top_srcdir)/src -I$(top_builddir)/src
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(LUA_CFLAGS)
 libluaguestfs_la_LIBADD = $(top_builddir)/src/libguestfs.la
 libluaguestfs_la_LDFLAGS = -avoid-version -shared