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

made configure output better; fixed small error in conky.conf

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1060 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-29 04:02:12 +00:00
parent d151828d23
commit fd2854c53e
4 changed files with 161 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -685,6 +685,11 @@ VARIABLES
as in diskio. as in diskio.
disk_protect device
Disk protection status, if supported (needs kernel-patch).
Prints either "frozen" or "free " (note the padding).
downspeed net downspeed net
Download speed in kilobytes Download speed in kilobytes

53
configure.ac.in
View File

@ -114,21 +114,21 @@ AC_ARG_ENABLE([audacious],
AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy) AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy)
if test x$want_audacious = xyes; then if test x$want_audacious = xyes; then
PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0]) PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS" CFLAGS="$CFLAGS $Audacious_CFLAGS"
LIBS="$LIBS $AUDACIOUS_LIBS" LIBS="$LIBS $Audacious_LIBS"
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$AUDACIOUS_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious" CPPFLAGS="$Audacious_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious"
AC_CHECK_HEADERS([audacious/audctrl.h audacious/dbus.h glib.h glib-object.h], AC_CHECK_HEADERS([audacious/audctrl.h audacious/dbus.h glib.h glib-object.h],
[], AC_MSG_ERROR([required header(s) not found])) [], AC_MSG_ERROR([required header(s) not found]))
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support]) AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support])
else if test x$want_audacious = xlegacy; then else if test x$want_audacious = xlegacy; then
PKG_CHECK_MODULES([AUDACIOUS], [audacious < 1.4.0 glib-2.0]) PKG_CHECK_MODULES([Audacious], [audacious < 1.4.0 glib-2.0])
CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS" CFLAGS="$CFLAGS $Audacious_CFLAGS"
LIBS="$LIBS $AUDACIOUS_LIBS" LIBS="$LIBS $Audacious_LIBS"
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$AUDACIOUS_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious" CPPFLAGS="$Audacious_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious"
AC_CHECK_HEADERS([audacious/beepctrl.h glib.h], [], AC_MSG_ERROR([required header(s) not found])) AC_CHECK_HEADERS([audacious/beepctrl.h glib.h], [], AC_MSG_ERROR([required header(s) not found]))
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support]) AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support])
@ -147,9 +147,9 @@ AC_ARG_ENABLE([bmpx],
AM_CONDITIONAL(BUILD_BMPX, test x$want_bmpx = xyes) AM_CONDITIONAL(BUILD_BMPX, test x$want_bmpx = xyes)
if test x$want_bmpx = xyes; then if test x$want_bmpx = xyes; then
PKG_CHECK_MODULES([BMPX], [bmp-2.0 >= 0.14.0]) PKG_CHECK_MODULES([BMPx], [bmp-2.0 >= 0.14.0])
CFLAGS="$CFLAGS $BMPX_CFLAGS" CFLAGS="$CFLAGS $BMPx_CFLAGS"
LIBS="$LIBS $BMPX_LIBS" LIBS="$LIBS $BMPx_LIBS"
AC_DEFINE(BMPX, 1, [Define if you want BMPx support]) AC_DEFINE(BMPX, 1, [Define if you want BMPx support])
fi fi
@ -213,9 +213,10 @@ AC_ARG_ENABLE([rss],
AM_CONDITIONAL(BUILD_RSS, test x$want_rss = xyes) AM_CONDITIONAL(BUILD_RSS, test x$want_rss = xyes)
if test x$want_rss = xyes; then if test x$want_rss = xyes; then
WANT_GLIB=yes WANT_GLIB=yes
PKG_CHECK_MODULES(RSS, libxml-2.0 libcurl,,exit) PKG_CHECK_MODULES([libxml2], libxml-2.0)
CFLAGS="$CFLAGS $RSS_CFLAGS" PKG_CHECK_MODULES([libcurl], libcurl)
LIBS="$LIBS $RSS_LIBS" CFLAGS="$CFLAGS $libxml2_CFLAGS $libcurl_CFLAGS"
LIBS="$LIBS $libxml2_LIBS $libcurl_LIBS"
AC_DEFINE(RSS, 1, [Define if you want rss support]) AC_DEFINE(RSS, 1, [Define if you want rss support])
fi fi
@ -360,9 +361,9 @@ if test "x$want_double_buffer" = "xyes"; then
want_double_buffer=no want_double_buffer=no
else else
if $PKG_CONFIG --exists xext; then if $PKG_CONFIG --exists xext; then
PKG_CHECK_MODULES([XEXT],[xext]) PKG_CHECK_MODULES([Xext],[xext])
CFLAGS="$CFLAGS $XEXT_CFLAGS" CFLAGS="$CFLAGS $Xext_CFLAGS"
LIBS="$LIBS $XEXT_LIBS" LIBS="$LIBS $Xext_LIBS"
else else
dnl non-modular X11 installation dnl non-modular X11 installation
AC_CHECK_LIB([Xext], [XdbeQueryExtension], [LIBS="$LIBS -lXext"], AC_CHECK_LIB([Xext], [XdbeQueryExtension], [LIBS="$LIBS -lXext"],
@ -388,9 +389,9 @@ if test "x$want_xdamage" = "xyes"; then
want_xdamage=no want_xdamage=no
else else
if $PKG_CONFIG --exists xdamage; then if $PKG_CONFIG --exists xdamage; then
PKG_CHECK_MODULES([XDAMAGE],[xdamage]) PKG_CHECK_MODULES([XDamage],[xdamage])
CFLAGS="$CFLAGS $XDAMAGE_CFLAGS" CFLAGS="$CFLAGS $XDamage_CFLAGS"
LIBS="$LIBS $XDAMAGE_LIBS" LIBS="$LIBS $XDamage_LIBS"
else else
dnl non-modular X11 installation dnl non-modular X11 installation
AC_CHECK_LIB([Xdamage], [XDamageQueryExtension], [LIBS="$LIBS -lXdamage"], AC_CHECK_LIB([Xdamage], [XDamageQueryExtension], [LIBS="$LIBS -lXdamage"],
@ -414,9 +415,9 @@ if test x$want_xft = "xyes"; then
dnl silently disable if no x11 dnl silently disable if no x11
want_xft=no want_xft=no
else else
PKG_CHECK_MODULES(XFT, [xft]) PKG_CHECK_MODULES([Xft], [xft])
CFLAGS="$CFLAGS $XFT_CFLAGS" CFLAGS="$CFLAGS $Xft_CFLAGS"
LIBS="$LIBS $XFT_LIBS" LIBS="$LIBS $Xft_LIBS"
AC_DEFINE(XFT, 1, [Define for Xft support]) AC_DEFINE(XFT, 1, [Define for Xft support])
fi fi
fi fi
@ -426,9 +427,9 @@ dnl GLIB
dnl dnl
if test x$WANT_GLIB = xyes; then if test x$WANT_GLIB = xyes; then
PKG_CHECK_MODULES([GLIB], [glib-2.0]) PKG_CHECK_MODULES([GLib2], [glib-2.0])
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GLib2_CFLAGS"
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GLib2_LIBS"
fi fi
dnl dnl

2
doc/conky.conf
View File

@ -123,7 +123,7 @@ net_avg_samples 2
override_utf8_locale no override_utf8_locale no
# Add spaces to keep things from moving about? This only affects certain objects. # Add spaces to keep things from moving about? This only affects certain objects.
use_spacer no use_spacer none
# Allow each port monitor to track at most this many connections (if 0 or not set, default is 256) # Allow each port monitor to track at most this many connections (if 0 or not set, default is 256)
#max_port_monitor_connections 256 #max_port_monitor_connections 256