Make configure opts for Lua extras more concise.

diff --git a/configure.ac.in b/configure.ac.in
index 9746cb2..9217508 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -411,8 +411,17 @@ dnl IMLIB2
 dnl
 
 AC_ARG_ENABLE([imlib2],
-                         AC_HELP_STRING([--enable-imlib2], [enable if you want Imlib2 support (also enables Lua Imlib2 support if lua-extras enabled) [[default=no]]]),
+                         AC_HELP_STRING([--enable-imlib2], [enable if you want Imlib2 support [[default=no]]]),
                          [want_imlib2="$enableval"], [want_imlib2=no])
+AC_ARG_ENABLE([lua-imlib2],
+             AC_HELP_STRING([--enable-lua-imlib2], [enable if you want Lua Imlib2 bindings for Conky @<:@default=no@:>@]),
+             [want_lua_imlib2="$enableval"], [want_lua_imlib2=no])
+
+# if lua-imlib2 is enabled, we must force imlib2
+if test x$want_lua_imlib2 = xyes; then
+       want_imlib2=yes
+fi
+
 if test x$want_imlib2 = xyes; then
        if test "x$want_x11" != "xyes"; then
                dnl silently disable if no x11
@@ -433,14 +442,14 @@ dnl
 AC_ARG_ENABLE([lua],
              AC_HELP_STRING([--enable-lua], [enable if you want Lua scripting support @<:@default=yes@:>@]),
              [want_lua="$enableval"], [want_lua=yes])
-AC_ARG_ENABLE([lua-extras],
-             AC_HELP_STRING([--enable-lua-extras], [enable if you want to install Lua extras (including bindings) @<:@default=no@:>@]),
-             [want_lua_extras="$enableval"], [want_lua_extras=no])
 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 @<:@default=no@:>@]),
              [want_lua_cairo="$enableval"], [want_lua_cairo=no])
-want_lua_imlib2=no
 need_tolua=no
+if test x$want_lua_cairo = xyes -o x$want_lua_imlib2 = xyes; then
+       need_tolua=yes
+       want_lua=yes
+fi
 
 AM_CONDITIONAL(BUILD_LUA, test x$want_lua = xyes)
 if test x$want_lua = xyes; then
@@ -452,11 +461,7 @@ if test x$want_lua = xyes; then
        conky_CFLAGS="$conky_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS"
        conky_LIBS="$conky_LIBS $LUA_LIBS $LUA51_LIBS"
 
-       want_lua_imlib2="$want_imlib2"
-       if test x$want_lua_extras != xyes; then
-               want_lua_cairo=no
-               want_lua_imlib2=no
-       else
+       if test x$need_tolua = xyes; then
                AC_DEFINE(LUA_EXTRAS, 1, [Define if you want Lua extras])
                if test "x$want_x11" != "xyes"; then
                        dnl silently disable if no x11
@@ -466,30 +471,24 @@ if test x$want_lua = xyes; then
                                PKG_CHECK_MODULES([cairo], cairo)
                                PKG_CHECK_MODULES([cairo_xlib], cairo-xlib)
                                AC_DEFINE(HAVE_LUA_CAIRO, 1, [Define if you want Lua Cairo bindings for Conky])
-                               need_tolua=yes
                                libcairo_CFLAGS="$libcairo_CFLAGS $cairo_CFLAGS $cairo_xlib_CFLAGS"
                                libcairo_LIBS="$libcairo_LIBS $cairo_LIBS $cairo_xlib_LIBS"
                        fi
                        if test x$want_imlib2 = xyes; then
-                               need_tolua=yes
-                               want_lua_imlib2=yes
                                AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
                        fi
                fi
-               if test x$need_tolua = xyes; then
-                       AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1], no)
-                       if test x$toluapp = xno; then
-                               AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.])
-                       else
-                               AC_SEARCH_LIBS(tolua_error,
-                                                          [tolua++ tolua++5.1],
-                                                          AC_SUBST(tolua_LIBS,"${LIBS}"),
-                                                          AC_MSG_ERROR([tolua_error not found]),
-                                                          $LUA51_LIBS)
-                       fi
-                       conky_LIBS="$conky_LIBS $tolua_LIBS"
+               AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1], no)
+               if test x$toluapp = xno; then
+                       AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.])
+               else
+                       AC_SEARCH_LIBS(tolua_error,
+                                                  [tolua++ tolua++5.1],
+                                                  AC_SUBST(tolua_LIBS,"${LIBS}"),
+                                                  AC_MSG_ERROR([tolua_error not found]),
+                                                  $LUA51_LIBS)
                fi
-
+               conky_LIBS="$conky_LIBS $tolua_LIBS"
        fi
        AC_DEFINE(HAVE_LUA, 1, [Define if you want Lua scripting support])
 fi