From 1a86405cd9c7a98bd18914bf4269731ea54616d1 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@rty.ca>
Date: Thu, 30 Jul 2009 22:21:09 -0600
Subject: [PATCH] Fix Lua extra compiler includes.

---
 configure.ac.in | 7 ++++++-
 lua/Makefile.am | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index a03d639f..aa3bb2c5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -484,11 +484,16 @@ if test x$want_lua = xyes; then
 		else
 			AC_SEARCH_LIBS(tolua_error,
 						   [tolua++ tolua++5.1],
-						   AC_SUBST(tolua_LIBS,"${LIBS}"),
+						   [
+							AC_SUBST(tolua_LIBS, "${LIBS}")
+							AC_SUBST(tolua_CFLAGS, "${CFLAGS}")
+							],
 						   AC_MSG_ERROR([tolua_error not found]),
 						   $LUA51_LIBS)
 		fi
 		conky_LIBS="$conky_LIBS $tolua_LIBS"
+		tolua_CFLAGS="$tolua_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS"
+		tolua_LIBS="$tolua_LIBS $LUA_LIBS $LUA51_LIBS"
 	fi
 	AC_DEFINE(HAVE_LUA, 1, [Define if you want Lua scripting support])
 fi
diff --git a/lua/Makefile.am b/lua/Makefile.am
index da8989c7..ca1ca351 100644
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -34,7 +34,7 @@ if BUILD_LUA_CAIRO
 
 libcairo = libcairo.la
 
-libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS) -I$(prefix)/include/lua5.1
+libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS) $(tolua_CFLAGS)
 libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) $(tolua_LIBS)
 
 libcairo.c: cairo.pkg
@@ -46,7 +46,7 @@ if BUILD_LUA_IMLIB2
 
 libimlib2 = libimlib2.la
 
-libimlib2_la_CFLAGS = $(Imlib2_CFLAGS) -I$(prefix)/include/lua5.1
+libimlib2_la_CFLAGS = $(Imlib2_CFLAGS) $(tolua_LIBS)
 libimlib2_la_LIBADD = $(Imlib2_LIBS) $(tolua_LIBS)
 
 libimlib2.c: imlib2.pkg