X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac.in;h=5cda4b8cb1170c7c49731dc9db5129afb8af0160;hb=04fd11b631494e3985d6911dd5876c1860948ba3;hp=924727fe7993c6d1df4729aef6e9ab03c658cb1d;hpb=5c67c0dc97d7310a1d069c85af421accaab68d7f;p=monky diff --git a/configure.ac.in b/configure.ac.in index 924727f..5cda4b8 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -2,8 +2,8 @@ # dnl major, minor and micro version macros. m4_define([conky_version_major], [1]) -m4_define([conky_version_minor], [7]) -m4_define([conky_version_micro], [3]) +m4_define([conky_version_minor], [8]) +m4_define([conky_version_micro], [1]) m4_define([conky_version_tag], [pre]) dnl [] for releases m4_define([conky_version_revision],[_pre@REVISION@]) m4_define([conky_version], @@ -201,7 +201,7 @@ AM_CONDITIONAL(BUILD_IBM, test x$want_ibm = xyes) if test x$want_ibm = xyes; then if test x"$uname" != xLinux; then AC_MSG_NOTICE([support for IBM/Lenovo notebooks not supported on $uname... disabling]) - want_ibm=no + want_ibm="not supported on $uname" else AC_DEFINE(IBM, 1, [Define if you want support for IBM/Lenovo notebooks (SMAPI)]) fi @@ -221,7 +221,7 @@ AM_CONDITIONAL(BUILD_HDDTEMP, test x$want_hddtemp = xyes) if test x$want_hddtemp = xyes; then if test x"$uname" != xLinux; then AC_MSG_NOTICE([hddtemp not supported on $uname... disabling]) - want_hddtemp=no + want_hddtemp="not supported on $uname" else AC_DEFINE(HDDTEMP, 1, [Define if you want hddtemp support]) fi @@ -240,7 +240,7 @@ AC_ARG_ENABLE([apcupsd], if test x$want_apcupsd = xyes; then if test x"$uname" != xLinux; then AC_MSG_NOTICE([apcupsd not supported on $uname... disabling]) - want_apcupsd=no + want_apcupsd="not supported on $uname" else AC_DEFINE(APCUPSD, 1, [Define if you want apcupsd support]) fi @@ -260,7 +260,7 @@ AC_ARG_ENABLE([iostats], if test x$want_iostats = xyes; then if test x"$uname" != xLinux; then AC_MSG_NOTICE([iostats not supported on $uname... disabling]) - want_iostats=no + want_iostats="not supported on $uname" else AC_DEFINE(IOSTATS, 1, [Define if you want support for per-task I/O statistics]) fi @@ -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}") @@ -527,8 +544,9 @@ AC_ARG_ENABLE([wlan], 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 @@ -543,7 +561,7 @@ AC_ARG_ENABLE([portmon], if test x"$want_portmon" = xyes; then if test x"$uname" != xLinux; then AC_MSG_NOTICE([port monitors not supported on $uname... disabling]) - want_portmon=no + want_portmon="not supported on $uname" else AC_CHECK_FUNCS([getnameinfo], [], AC_MSG_ERROR([getnameinfo function not found])) AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h sys/socket.h arpa/inet.h], [], @@ -562,12 +580,14 @@ dnl dnl ICONV dnl +m4_pattern_allow([AM_ICONV]) AM_ICONV if test "$am_cv_func_iconv" != yes; then AC_MSG_WARN([Could not find libiconv]) else conky_LIBS="$conky_LIBS $LIBICONV" fi +AM_CONDITIONAL(BUILD_ICONV, test "$am_cv_func_iconv" = yes) dnl dnl Xext Double-buffering Extension @@ -773,13 +793,14 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc", [Configfile of the user]) AC_DEFINE(MAX_SPECIALS_DEFAULT, 512, [Default maximum number of special things, e.g. fonts, offsets, aligns, etc.]) AC_DEFINE(MAX_USER_TEXT_DEFAULT, 16384, [Default maximum size of config TEXT buffer, i.e. below TEXT line.]) AC_DEFINE(DEFAULT_TEXT_BUFFER_SIZE, 256, [Default size used for temporary, static text buffers]) +AC_DEFINE(MAX_NET_INTERFACES, 16, [Maximum number of network devices]) dnl 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!])])], []) @@ -899,7 +920,7 @@ AC_ARG_ENABLE([debug], [want_debug="$enableval"], [want_debug=no]) if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then - conky_CFLAGS="$conky_CFLAGS -g3" + conky_CFLAGS="$conky_CFLAGS -g3 -O0" AC_DEFINE([DEBUG], 1, [Define for debugging]) fi @@ -916,7 +937,7 @@ if test "x$want_testing" = "xyes" -a $ac_cv_c_compiler_gnu != no; then conky_CFLAGS="$conky_CFLAGS -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic -Werror" AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)]) else - conky_CFLAGS="$conky_CFLAGS -g3 -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic -Werror" + conky_CFLAGS="$conky_CFLAGS -O0 -g3 -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic -Werror" AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)]) fi fi @@ -962,6 +983,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 @@ -989,6 +1011,7 @@ dnl OpenMP: $want_openmp ALSA mixer: $want_alsa apcupsd: $want_apcupsd I/O stats: $want_iostats + ncurses: $want_ncurses * Lua ($want_lua) bindings: Cairo: $want_lua_cairo