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

Fix up some lua configure stuff.

Browse Source
This commit is contained in:
Brenden Matthews 2009-07-20 17:16:48 -06:00
parent 5967d28511
commit 69a40ca866
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure.ac.in
View File

@ -440,6 +440,7 @@ AC_ARG_ENABLE([lua-cairo],
AC_HELP_STRING([--enable-lua-cairo], [enable if you want Lua Cairo bindings for Conky (requires lua-extras enabled) @<:@default=no@:>@]), AC_HELP_STRING([--enable-lua-cairo], [enable if you want Lua Cairo bindings for Conky (requires lua-extras enabled) @<:@default=no@:>@]),
[want_lua_cairo="$enableval"], [want_lua_cairo=no]) [want_lua_cairo="$enableval"], [want_lua_cairo=no])
want_lua_imlib2=no want_lua_imlib2=no
need_tolua=no
AM_CONDITIONAL(BUILD_LUA, test x$want_lua = xyes) AM_CONDITIONAL(BUILD_LUA, test x$want_lua = xyes)
if test x$want_lua = xyes; then if test x$want_lua = xyes; then
@ -456,7 +457,6 @@ if test x$want_lua = xyes; then
want_lua_cairo=no want_lua_cairo=no
want_lua_imlib2=no want_lua_imlib2=no
else else
AC_CHECK_PROGS(HAVE_TOLUAPP, [tolua++ tolua++5.1], no)
if test "x$want_x11" != "xyes"; then if test "x$want_x11" != "xyes"; then
dnl silently disable if no x11 dnl silently disable if no x11
want_lua_cairo=no want_lua_cairo=no
@ -464,33 +464,27 @@ if test x$want_lua = xyes; then
if test x$want_lua_cairo = xyes; then if test x$want_lua_cairo = xyes; then
PKG_CHECK_MODULES([cairo], cairo) PKG_CHECK_MODULES([cairo], cairo)
PKG_CHECK_MODULES([cairo_xlib], cairo-xlib) PKG_CHECK_MODULES([cairo_xlib], cairo-xlib)
if test x"$HAVE_TOLUAPP" = x"no"; then AC_DEFINE(HAVE_LUA_CAIRO, 1, [Define if you want Lua Cairo bindings for Conky])
AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua Cairo support.]) need_tolua=yes
else
AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1])
AC_SEARCH_LIBS(tolua_error,
tolua++ tolua++5.1,
AC_SUBST(tolua_LIBS,"${LIBS}"),
AC_MSG_ERROR([tolua_error not found]),
-llua5.1)
AC_DEFINE(HAVE_LUA_CAIRO, 1, [Define if you want Lua Cairo bindings for Conky])
fi
libcairo_CFLAGS="$libcairo_CFLAGS $cairo_CFLAGS $cairo_xlib_CFLAGS" libcairo_CFLAGS="$libcairo_CFLAGS $cairo_CFLAGS $cairo_xlib_CFLAGS"
libcairo_LIBS="$libcairo_LIBS $cairo_LIBS $cairo_xlib_LIBS" libcairo_LIBS="$libcairo_LIBS $cairo_LIBS $cairo_xlib_LIBS"
fi fi
if test x$want_imlib2 = xyes; then if test x$want_imlib2 = xyes; then
if test x"$HAVE_TOLUAPP" = x"no"; then need_tolua=yes
AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua Imlib2 support.]) want_lua_imlib2=yes
else AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
want_lua_imlib2=yes fi
AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1]) fi
AC_SEARCH_LIBS(tolua_error, if test x$need_tolua = xyes; then
tolua++ tolua++5.1, AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1], no)
AC_SUBST(tolua_LIBS,"${LIBS}"), if test x$toluapp = xno; then
AC_MSG_ERROR([tolua_error not found]), AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.])
-llua5.1) else
AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky]) AC_SEARCH_LIBS(tolua_error,
fi [tolua++ tolua++5.1],
AC_SUBST(tolua_LIBS,"${LIBS}"),
AC_MSG_ERROR([tolua_error not found]),
$LUA51_LIBS)
fi fi
fi fi
fi fi