Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity

Fix Lua extra compiler includes.

Browse Source
This commit is contained in:
Brenden Matthews 2009-07-30 22:21:09 -06:00
parent 985a72b444
commit 46effdcbc4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac.in
View File

@ -486,11 +486,16 @@ if test x$want_lua = xyes; then
else else
AC_SEARCH_LIBS(tolua_error, AC_SEARCH_LIBS(tolua_error,
[tolua++ tolua++5.1], [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]), AC_MSG_ERROR([tolua_error not found]),
$LUA51_LIBS) $LUA51_LIBS)
fi fi
conky_LIBS="$conky_LIBS $tolua_LIBS" conky_LIBS="$conky_LIBS $tolua_LIBS"
tolua_CFLAGS="$tolua_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS"
tolua_LIBS="$tolua_LIBS $LUA_LIBS $LUA51_LIBS"
fi fi
AC_DEFINE(HAVE_LUA, 1, [Define if you want Lua scripting support]) AC_DEFINE(HAVE_LUA, 1, [Define if you want Lua scripting support])
fi fi

4
lua/Makefile.am
View File

@ -36,7 +36,7 @@ if BUILD_LUA_CAIRO
libcairo = libcairo.la 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_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) $(tolua_LIBS)
libcairo.c: cairo.pkg libcairo.c: cairo.pkg
@ -48,7 +48,7 @@ if BUILD_LUA_IMLIB2
libimlib2 = libimlib2.la 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_la_LIBADD = $(Imlib2_LIBS) $(tolua_LIBS)
libimlib2.c: imlib2.pkg libimlib2.c: imlib2.pkg