Only pause during startup, not after reload.

[monky] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index 23c7723..9dd375c 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -5,7 +5,7 @@ m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [8])
 m4_define([conky_version_micro], [0])
 m4_define([conky_version_tag], [pre]) dnl [] for releases
-m4_define([conky_version_revision],[_pre@REVISION@])
+m4_define([conky_version_revision],[_rc2])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
       conky_version_tag(), [pre],
@@ -317,7 +317,7 @@ AC_ARG_ENABLE([xmms2],
 
 AM_CONDITIONAL(BUILD_XMMS2, test x$want_xmms2 = xyes)
 if test x$want_xmms2 = xyes; then
-  PKG_CHECK_MODULES([XMMS2], [xmms2-client])
+  PKG_CHECK_MODULES([XMMS2], [xmms2-client] >= [0.6])
     conky_CFLAGS="$conky_CFLAGS $XMMS2_CFLAGS"
     conky_LIBS="$conky_LIBS $XMMS2_LIBS"
     AC_DEFINE(XMMS2, 1, [Define if you want XMMS2 support])
@@ -423,6 +423,23 @@ if test "x$want_x11" = "xyes"; then
 fi
 
 dnl
+dnl ARGB
+dnl
+
+AC_ARG_ENABLE([argb],
+              AC_HELP_STRING([--disable-argb], [disable if you do not want a argb visual @<:@default=yes@:>@]),
+              [want_argb="$enableval"], [want_argb=yes])
+
+if test x$want_argb = xyes; then
+    if test "x$want_x11" != "xyes"; then
+       dnl silently disable if no x11
+       want_argb=no
+    else
+       AC_DEFINE(USE_ARGB, 1, [Define if you want argb visual support])
+    fi
+fi
+
+dnl
 dnl IMLIB2
 dnl
 
@@ -494,12 +511,12 @@ if test x$want_lua = xyes; then
                                AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
                        fi
                fi
-               AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1], no)
+               AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1 tolua++-5.1], no)
                if test x$toluapp = xno; then
-                       AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.])
+                       AC_MSG_ERROR([tolua++, tolua++5.1, or tolua++-5.1 is required for Lua extras.])
                else
                        AC_SEARCH_LIBS(tolua_error,
-                                                  [tolua++ tolua++5.1],
+                                                  [tolua++-5.1 tolua++ tolua++5.1],
                                                   [
                                                        AC_SUBST(tolua_LIBS, "${LIBS}")
                                                        AC_SUBST(tolua_CFLAGS, "${CFLAGS}")
@@ -782,7 +799,7 @@ dnl Some functions
 dnl
 
 AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg memrchr strndup gethostbyname_r])
-AC_SEARCH_LIBS(clock_gettime, [rt], conky_LIBS="$conky_LIBS -lrt"
+AC_SEARCH_LIBS(clock_gettime, [rt], conky_LIBS="$conky_LIBS $LIBS"
                [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])],
                [AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([gettimeofday() not available!])])], [])
 
@@ -965,6 +982,7 @@ $PACKAGE $VERSION configured successfully:
   XDamage support:  $want_xdamage
   XDBE support:     $want_double_buffer
   Xft support:      $want_xft
+  ARGB support      $want_argb
 
  * Music detection:
   Audacious:        $want_audacious