dnl major, minor and micro version macros.
m4_define([conky_version_major], [1])
m4_define([conky_version_minor], [8])
-m4_define([conky_version_micro], [0])
+m4_define([conky_version_micro], [1])
m4_define([conky_version_tag], [pre]) dnl [] for releases
-m4_define([conky_version_revision],[_rc1])
+m4_define([conky_version_revision],[_pre@REVISION@])
m4_define([conky_version],
[conky_version_major().conky_version_minor().conky_version_micro()ifelse(
conky_version_tag(), [pre],
dnl
AC_ARG_ENABLE([argb],
- AC_HELP_STRING([--enable-argb], [enable if you want a argb visual [[default=no]]]),
- [want_argb="$enableval"], [want_argb=no])
+ 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
AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
if test x$want_wlan = xyes; then
AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found]))
- AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="$conky_LIBS -liw"], AC_MSG_ERROR([iw_sockets_open not found]))
- AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
+ AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="-liw $conky_LIBS"],
+ AC_MSG_ERROR([iw_sockets_open not found]), [$conky_LIBS])
+ AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
fi
dnl
ALSA mixer: $want_alsa
apcupsd: $want_apcupsd
I/O stats: $want_iostats
+ ncurses: $want_ncurses
* Lua ($want_lua) bindings:
Cairo: $want_lua_cairo