diff --git a/configure.ac.in b/configure.ac.in index f0a7f2ba..b8e2d904 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -486,11 +486,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 a3064d6e..6f174287 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -36,7 +36,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 @@ -48,7 +48,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