From fd2854c53e8386d63c0f770fc1473c938b8341cd Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 29 Mar 2008 04:02:12 +0000 Subject: [PATCH] made configure output better; fixed small error in conky.conf git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1060 7f574dfc-610e-0410-a909-a81674777703 --- README | 259 ++++++++++++++++++++++++++++--------------------------- configure.ac.in | 53 ++++++------ doc/conky.1 | 2 +- doc/conky.conf | 2 +- 4 files changed, 161 insertions(+), 155 deletions(-) diff --git a/README b/README index d5cf9ba..15b1740 100644 --- a/README +++ b/README @@ -685,6 +685,11 @@ VARIABLES as in diskio. + disk_protect device + Disk protection status, if supported (needs kernel-patch). + Prints either "frozen" or "free " (note the padding). + + downspeed net Download speed in kilobytes @@ -695,7 +700,7 @@ VARIABLES downspeedgraph net (height),(width) (gradient colour 1) (gradient colour 2) (scale) - Download speed graph, colours defined in hex, minus the #. If + Download speed graph, colours defined in hex, minus the #. If scale is non-zero, it becomes the scale for the graph. @@ -716,12 +721,12 @@ VARIABLES exec command Executes a shell command and displays the output in conky. warn- - ing: this takes a lot more resources than other variables. I'd + ing: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch. execbar command - Same as exec, except if the first value return is a value be- + Same as exec, except if the first value return is a value be- tween 0-100, it will use that number for a bar. The size for the bar is currently fixed, but that may change in the future. @@ -731,7 +736,7 @@ VARIABLES execi interval command - Same as exec but with specific interval. Interval can't be less + Same as exec but with specific interval. Interval can't be less than update_interval in configuration. See also $texeci @@ -745,14 +750,14 @@ VARIABLES execp command Executes a shell command and displays the output in conky. warn- - ing: this takes a lot more resources than other variables. I'd + ing: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch. This - differs from $exec in that it parses the output of the command, - so you can insert things like ${color red}hi!${color} in your - script and have it correctly parsed by Conky. Caveats: Conky - parses and evaluates the output of $execp every time Conky + differs from $exec in that it parses the output of the command, + so you can insert things like ${color red}hi!${color} in your + script and have it correctly parsed by Conky. Caveats: Conky + parses and evaluates the output of $execp every time Conky loops, and then destroys all the objects. If you try to use any- - thing like $execi within an $execp statement, it will function- + thing like $execi within an $execp statement, it will function- ally run at the same interval that the $execp statement runs, as it is created and destroyed at every interval. @@ -760,41 +765,41 @@ VARIABLES execpi interval command Same as execp but with specific interval. Interval can't be less than update_interval in configuration. Note that the output from - the $execpi command is still parsed and evaluated at every in- + the $execpi command is still parsed and evaluated at every in- terval. font (font) - Specify a different font. This new font will apply to the cur- - rent line and everything following. You can use a $font with no - arguments to change back to the default font (much like with + Specify a different font. This new font will apply to the cur- + rent line and everything following. You can use a $font with no + arguments to change back to the default font (much like with $color) freq (n) - Returns CPU #n's frequency in MHz. CPUs are counted from 1. If + Returns CPU #n's frequency in MHz. CPUs are counted from 1. If omitted, the parameter defaults to 1. freq_g (n) - Returns CPU #n's frequency in GHz. CPUs are counted from 1. If + Returns CPU #n's frequency in GHz. CPUs are counted from 1. If omitted, the parameter defaults to 1. freq_dyn - Returns CPU frequency in MHz, but is calculated by counting to - clock cycles to complete an instruction. Only available for + Returns CPU frequency in MHz, but is calculated by counting to + clock cycles to complete an instruction. Only available for x86/amd64. freq_dyn_g - Returns CPU frequency in GHz, but is calculated by counting to - clock cycles to complete an instruction. Only available for + Returns CPU frequency in GHz, but is calculated by counting to + clock cycles to complete an instruction. Only available for x86/amd64. fs_bar (height),(width) fs - Bar that shows how much space is used on a file system. height + Bar that shows how much space is used on a file system. height is the height in pixels. fs is any file on that file system. @@ -822,23 +827,23 @@ VARIABLES gw_iface - Displays the default route's interface or "multiple"/"none" ac- + Displays the default route's interface or "multiple"/"none" ac- cordingly. - gw_ip Displays the default gateway's IP or "multiple"/"none" accord- + gw_ip Displays the default gateway's IP or "multiple"/"none" accord- ingly. hddtemp dev, (host,(port)) - Displays temperature of a selected hard disk drive as reported - by the hddtemp daemon running on host:port. Default host is + Displays temperature of a selected hard disk drive as reported + by the hddtemp daemon running on host:port. Default host is 127.0.0.1, default port is 7634. head logfile lines (interval) - Displays first N lines of supplied text text file. If interval - is not supplied, Conky assumes 2x Conky's interval. Max of 30 + Displays first N lines of supplied text text file. If interval + is not supplied, Conky assumes 2x Conky's interval. Max of 30 lines can be displayed, or until the text buffer is filled. @@ -847,16 +852,16 @@ VARIABLES hwmon (dev) type n - Hwmon sensor from sysfs (Linux 2.6). Parameter dev may be omit- - ted if you have only one hwmon device. Parameter type is either - 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Cel- - sius) or 'tempf' (Fahrenheit) meaning temperature. Parameter n - is number of the sensor. See /sys/class/hwmon/ on your local + Hwmon sensor from sysfs (Linux 2.6). Parameter dev may be omit- + ted if you have only one hwmon device. Parameter type is either + 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Cel- + sius) or 'tempf' (Fahrenheit) meaning temperature. Parameter n + is number of the sensor. See /sys/class/hwmon/ on your local computer. iconv_start codeset_from codeset_to - Convert text from one codeset to another using GNU iconv. Needs + Convert text from one codeset to another using GNU iconv. Needs to be stopped with iconv_stop. @@ -865,75 +870,75 @@ VARIABLES i2c (dev) type n - I2C sensor from sysfs (Linux 2.6). Parameter dev may be omitted - if you have only one I2C device. Parameter type is either 'in' + I2C sensor from sysfs (Linux 2.6). Parameter dev may be omitted + if you have only one I2C device. Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or - 'tempf' (Fahrenheit) meaning temperature. Parameter n is number + 'tempf' (Fahrenheit) meaning temperature. Parameter n is number of the sensor. See /sys/bus/i2c/devices/ on your local computer. i8k_ac_status - If running the i8k kernel driver for Inspiron laptops, displays - whether ac power is on, as listed in /proc/i8k (translated to - human-readable). Beware that this is by default not enabled by + If running the i8k kernel driver for Inspiron laptops, displays + whether ac power is on, as listed in /proc/i8k (translated to + human-readable). Beware that this is by default not enabled by i8k itself. i8k_bios - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the bios version as listed in /proc/i8k. i8k_buttons_status - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the volume buttons status as listed in /proc/i8k. i8k_cpu_temp - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Celsius, as reported by /proc/i8k. i8k_cpu_tempf - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Fahrenheit, as reported by /proc/i8k. i8k_left_fan_rpm - If running the i8k kernel driver for Inspiron laptops, displays - the left fan's rate of rotation, in revolutions per minute as + If running the i8k kernel driver for Inspiron laptops, displays + the left fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order. i8k_left_fan_status - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the left fan status as listed in /proc/i8k (translated to human- - readable). Beware, some laptops i8k reports these fans in re- + readable). Beware, some laptops i8k reports these fans in re- verse order. i8k_right_fan_rpm - If running the i8k kernel driver for Inspiron laptops, displays - the right fan's rate of rotation, in revolutions per minute as + If running the i8k kernel driver for Inspiron laptops, displays + the right fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order. i8k_right_fan_status - If running the i8k kernel driver for Inspiron laptops, displays - the right fan status as listed in /proc/i8k (translated to hu- - man-readable). Beware, some laptops i8k reports these fans in + If running the i8k kernel driver for Inspiron laptops, displays + the right fan status as listed in /proc/i8k (translated to hu- + man-readable). Beware, some laptops i8k reports these fans in reverse order. i8k_serial - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays your laptop serial number as listed in /proc/i8k. i8k_version - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the version formatting of /proc/i8k. @@ -942,13 +947,13 @@ VARIABLES ibm_temps N - If running the IBM ACPI, displays the temperatures from the IBM + If running the IBM ACPI, displays the temperatures from the IBM temperature sensors (N=0..7) Sensor 0 is on the CPU, 3 is on the GPU. ibm_volume - If running the IBM ACPI, displays the "master" volume, con- + If running the IBM ACPI, displays the "master" volume, con- trolled by the volume keys (0-14). @@ -958,7 +963,7 @@ VARIABLES if_empty (var) - if conky variable VAR is empty, display everything between + if conky variable VAR is empty, display everything between $if_empty and the matching $endif @@ -967,14 +972,14 @@ VARIABLES if_running (process) - if PROCESS is running, display everything $if_running and the + if PROCESS is running, display everything $if_running and the matching $endif if_existing file (string) - if FILE exists, display everything between if_existing and the - matching $endif. The optional second paramater checks for FILE - containing the specified string and prints everything between + if FILE exists, display everything between if_existing and the + matching $endif. The optional second paramater checks for FILE + containing the specified string and prints everything between $if_existing and the matching $endif. @@ -984,8 +989,8 @@ VARIABLES if_smapi_bat_installed (INDEX) - when using smapi, if the battery with index INDEX is installed, - display everything between $if_smapi_bat_installed and the + when using smapi, if the battery with index INDEX is installed, + display everything between $if_smapi_bat_installed and the matching $endif @@ -996,9 +1001,9 @@ VARIABLES imap_messages (args) Displays the number of messages in your global IMAP inbox by de- - fault. You can define individual IMAP inboxes seperately by + fault. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass - [-i interval] [-p port] [-e command]". Default port is 143, de- + [-i interval] [-p port] [-e command]". Default port is 143, de- fault interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. @@ -1007,13 +1012,13 @@ VARIABLES Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass - [-i interval] [-p port] [-e command]". Default port is 143, de- + [-i interval] [-p port] [-e command]". Default port is 143, de- fault interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. ioscheduler - Prints the current ioscheduler used for the given disk name + Prints the current ioscheduler used for the given disk name (i.e. e.g. "hda" or "sdb") @@ -1034,16 +1039,16 @@ VARIABLES mails (mailbox) (interval) - Mail count in the specified mailbox or your mail spool if not. - Both mbox and maildir type mailboxes are supported. You can use - a program like fetchmail to get mails from some server using + Mail count in the specified mailbox or your mail spool if not. + Both mbox and maildir type mailboxes are supported. You can use + a program like fetchmail to get mails from some server using your favourite protocol. See also new_mails. mboxscan (-n number of messages to print) (-fw from width) (-sw subject width) mbox - Print a summary of recent messages in an mbox format mailbox. - mbox parameter is the filename of the mailbox (can be encapsu- + Print a summary of recent messages in an mbox format mailbox. + mbox parameter is the filename of the mailbox (can be encapsu- lated using '"', ie. ${mboxscan -n 10 "/home/brenden/some box"} @@ -1127,7 +1132,7 @@ VARIABLES nameserver (index) - Print a nameserver from /etc/resolv.conf. Index starts at and + Print a nameserver from /etc/resolv.conf. Index starts at and defaults to 0. @@ -1146,26 +1151,26 @@ VARIABLES pb_battery item If running on Apple powerbook/ibook, display information on bat- - tery status. The item parameter specifies, what information to + tery status. The item parameter specifies, what information to display. Exactly one item must be specified. Valid items are: status: Display if battery is fully charged, charging, discharg- ing or absent (running on AC) - percent: Display charge of battery in percent, if charging or - discharging. Nothing will be displayed, if battery is fully + percent: Display charge of battery in percent, if charging or + discharging. Nothing will be displayed, if battery is fully charged or absent. time: Display the time remaining until the battery will be fully - charged or discharged at current rate. Nothing is displayed, if - battery is absent or if it's present but fully charged and not + charged or discharged at current rate. Nothing is displayed, if + battery is absent or if it's present but fully charged and not discharging. platform (dev) type n - Platform sensor from sysfs (Linux 2.6). Parameter dev may be - omitted if you have only one platform device. Platform type is - either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' + Platform sensor from sysfs (Linux 2.6). Parameter dev may be + omitted if you have only one platform device. Platform type is + either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature. Parameter - n is number of the sensor. See /sys/bus/platform/devices/ on + n is number of the sensor. See /sys/bus/platform/devices/ on your local computer. @@ -1173,17 +1178,17 @@ VARIABLES Displays the number of unseen messages in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass - [-i interval] [-p port] [-e command]". Default port is 110, de- + [-i interval] [-p port] [-e command]". Default port is 110, de- fault interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. pop3_used (args) - Displays the amount of space (in MiB, 2^20) used in your global - POP3 inbox by default. You can define individual POP3 inboxes - seperately by passing arguments to this object. Arguments are: - "host user pass [-i interval] [-p port] [-e command]". Default - port is 110, default interval is 5 minutes. If the password is + Displays the amount of space (in MiB, 2^20) used in your global + POP3 inbox by default. You can define individual POP3 inboxes + seperately by passing arguments to this object. Arguments are: + "host user pass [-i interval] [-p port] [-e command]". Default + port is 110, default interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. @@ -1206,21 +1211,21 @@ VARIABLES smapi (ARGS) - when using smapi, display contents of the /sys/devices/plat- - form/smapi directory. ARGS are either '(FILENAME)' or 'bat (IN- - DEX) (FILENAME)' to display the corresponding files' content. - This is a very raw method of accessing the smapi values. When + when using smapi, display contents of the /sys/devices/plat- + form/smapi directory. ARGS are either '(FILENAME)' or 'bat (IN- + DEX) (FILENAME)' to display the corresponding files' content. + This is a very raw method of accessing the smapi values. When available, better use one of the smapi_* variables instead. smapi_bat_perc (INDEX) - when using smapi, display the remaining capacity in percent of - the battery with index INDEX. This is a separate variable be- + when using smapi, display the remaining capacity in percent of + the battery with index INDEX. This is a separate variable be- cause it supports the 'use_spacer' configuration option. smapi_bat_bar (INDEX),(height),(width) - when using smapi, display the remaining capacity of the battery + when using smapi, display the remaining capacity of the battery with index INDEX as a bar. @@ -1264,36 +1269,36 @@ VARIABLES The connection index provides you with access to each connection in the port monitor. The monitor will return information for in- dex values from 0 to n-1 connections. Values higher than n-1 are - simply ignored. For the "count" item, the connection index must + simply ignored. For the "count" item, the connection index must be omitted. It is required for all other items. Examples: - ${tcp_portmon 6881 6999 count} - displays the number of connec- + ${tcp_portmon 6881 6999 count} - displays the number of connec- tions in the bittorrent port range - ${tcp_portmon 22 22 rip 0} - displays the remote host ip of the + ${tcp_portmon 22 22 rip 0} - displays the remote host ip of the first sshd connection - ${tcp_portmon 22 22 rip 9} - displays the remote host ip of the + ${tcp_portmon 22 22 rip 9} - displays the remote host ip of the tenth sshd connection ${tcp_portmon 1 1024 rhost 0} - displays the remote host name of the first connection on a privileged port ${tcp_portmon 1 1024 rport 4} - displays the remote host port of the fifth connection on a privileged port - ${tcp_portmon 1 65535 lservice 14} - displays the local service + ${tcp_portmon 1 65535 lservice 14} - displays the local service name of the fifteenth connection in the range of all ports Note that port monitor variables which share the same port range actually refer to the same monitor, so many references to a sin- gle port range for different items and different indexes all use - the same monitor internally. In other words, the program avoids + the same monitor internally. In other words, the program avoids creating redundant monitors. texeci interval command - Runs a command at an interval inside a thread and displays the - output. Same as $execi, except the command is run inside a - thread. Use this if you have a slow script to keep Conky updat- - ing. You should make the interval slightly longer then the time - it takes your script to execute. For example, if you have a - script that take 5 seconds to execute, you should make the in- + Runs a command at an interval inside a thread and displays the + output. Same as $execi, except the command is run inside a + thread. Use this if you have a slow script to keep Conky updat- + ing. You should make the interval slightly longer then the time + it takes your script to execute. For example, if you have a + script that take 5 seconds to execute, you should make the in- terval at least 6 seconds. See also $execi. @@ -1302,8 +1307,8 @@ VARIABLES rss url delay_in_minutes action item_num - Download and parse RSS feeds. Action may be one of the follow- - ing: feed_title, item_title (with num par), item_desc (with num + Download and parse RSS feeds. Action may be one of the follow- + ing: feed_title, item_title (with num par), item_desc (with num par) and item_titles. @@ -1318,7 +1323,7 @@ VARIABLES time (format) - Local time, see man strftime to get more information about for- + Local time, see man strftime to get more information about for- mat @@ -1327,23 +1332,23 @@ VARIABLES tztime (timezone) (format) - Local time for specified timezone, see man strftime to get more - information about format. The timezone argument is specified in - similar fashion as TZ environment variable. For hints, look in + Local time for specified timezone, see man strftime to get more + information about format. The timezone argument is specified in + similar fashion as TZ environment variable. For hints, look in /usr/share/zoneinfo. e.g. US/Pacific, Europe/Zurich, etc. totaldown net - Total download, overflows at 4 GB on Linux with 32-bit arch and + Total download, overflows at 4 GB on Linux with 32-bit arch and there doesn't seem to be a way to know how many times it has al- ready done that before conky has started. top type, num - This takes arguments in the form:top (name) (number) Basically, - processes are ranked from highest to lowest in terms of cpu us- - age, which is what (num) represents. The types are: "name", - "pid", "cpu", "mem", and "time". There can be a max of 10 pro- + This takes arguments in the form:top (name) (number) Basically, + processes are ranked from highest to lowest in terms of cpu us- + age, which is what (num) represents. The types are: "name", + "pid", "cpu", "mem", and "time". There can be a max of 10 pro- cesses listed. @@ -1367,9 +1372,9 @@ VARIABLES Upload speed in kilobytes with one decimal - upspeedgraph net (height),(width) (gradient colour 1) (gradient colour + upspeedgraph net (height),(width) (gradient colour 1) (gradient colour 2) (scale) - Upload speed graph, colours defined in hex, minus the #. If + Upload speed graph, colours defined in hex, minus the #. If scale is non-zero, it becomes the scale for the graph. @@ -1397,12 +1402,12 @@ VARIABLES voffset (pixels) - Change vertical offset by N pixels. Negative values will cause + Change vertical offset by N pixels. Negative values will cause text to overlap. See also $offset. voltage_mv (n) - Returns CPU #n's voltage in mV. CPUs are counted from 1. If + Returns CPU #n's voltage in mV. CPUs are counted from 1. If omitted, the parameter defaults to 1. @@ -1530,11 +1535,11 @@ FILES BUGS Drawing to root or some other desktop window directly doesn't work with all window managers. Especially doesn't work well with Gnome and it has - been reported that it doesn't work with KDE either. Nautilus can be - disabled from drawing to desktop with program gconf-editor. Uncheck - show_desktop in /apps/nautilus/preferences/. There is -w switch in - Conky to set some specific window id. You might find xwininfo -tree - useful to find the window to draw to. You can also use -o argument + been reported that it doesn't work with KDE either. Nautilus can be + disabled from drawing to desktop with program gconf-editor. Uncheck + show_desktop in /apps/nautilus/preferences/. There is -w switch in + Conky to set some specific window id. You might find xwininfo -tree + useful to find the window to draw to. You can also use -o argument which makes Conky to create its own window. SEE ALSO diff --git a/configure.ac.in b/configure.ac.in index 5a4331c..d4d8e44 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -114,21 +114,21 @@ AC_ARG_ENABLE([audacious], AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy) if test x$want_audacious = xyes; then - PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0]) - CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS" - LIBS="$LIBS $AUDACIOUS_LIBS" + PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0]) + CFLAGS="$CFLAGS $Audacious_CFLAGS" + LIBS="$LIBS $Audacious_LIBS" 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_MSG_ERROR([required header(s) not found])) CPPFLAGS="$save_CPPFLAGS" AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support]) else if test x$want_audacious = xlegacy; then - PKG_CHECK_MODULES([AUDACIOUS], [audacious < 1.4.0 glib-2.0]) - CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS" - LIBS="$LIBS $AUDACIOUS_LIBS" + PKG_CHECK_MODULES([Audacious], [audacious < 1.4.0 glib-2.0]) + CFLAGS="$CFLAGS $Audacious_CFLAGS" + LIBS="$LIBS $Audacious_LIBS" 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])) CPPFLAGS="$save_CPPFLAGS" 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) if test x$want_bmpx = xyes; then - PKG_CHECK_MODULES([BMPX], [bmp-2.0 >= 0.14.0]) - CFLAGS="$CFLAGS $BMPX_CFLAGS" - LIBS="$LIBS $BMPX_LIBS" + PKG_CHECK_MODULES([BMPx], [bmp-2.0 >= 0.14.0]) + CFLAGS="$CFLAGS $BMPx_CFLAGS" + LIBS="$LIBS $BMPx_LIBS" AC_DEFINE(BMPX, 1, [Define if you want BMPx support]) fi @@ -213,9 +213,10 @@ AC_ARG_ENABLE([rss], AM_CONDITIONAL(BUILD_RSS, test x$want_rss = xyes) if test x$want_rss = xyes; then WANT_GLIB=yes - PKG_CHECK_MODULES(RSS, libxml-2.0 libcurl,,exit) - CFLAGS="$CFLAGS $RSS_CFLAGS" - LIBS="$LIBS $RSS_LIBS" + PKG_CHECK_MODULES([libxml2], libxml-2.0) + PKG_CHECK_MODULES([libcurl], libcurl) + CFLAGS="$CFLAGS $libxml2_CFLAGS $libcurl_CFLAGS" + LIBS="$LIBS $libxml2_LIBS $libcurl_LIBS" AC_DEFINE(RSS, 1, [Define if you want rss support]) fi @@ -360,9 +361,9 @@ if test "x$want_double_buffer" = "xyes"; then want_double_buffer=no else if $PKG_CONFIG --exists xext; then - PKG_CHECK_MODULES([XEXT],[xext]) - CFLAGS="$CFLAGS $XEXT_CFLAGS" - LIBS="$LIBS $XEXT_LIBS" + PKG_CHECK_MODULES([Xext],[xext]) + CFLAGS="$CFLAGS $Xext_CFLAGS" + LIBS="$LIBS $Xext_LIBS" else dnl non-modular X11 installation AC_CHECK_LIB([Xext], [XdbeQueryExtension], [LIBS="$LIBS -lXext"], @@ -388,9 +389,9 @@ if test "x$want_xdamage" = "xyes"; then want_xdamage=no else if $PKG_CONFIG --exists xdamage; then - PKG_CHECK_MODULES([XDAMAGE],[xdamage]) - CFLAGS="$CFLAGS $XDAMAGE_CFLAGS" - LIBS="$LIBS $XDAMAGE_LIBS" + PKG_CHECK_MODULES([XDamage],[xdamage]) + CFLAGS="$CFLAGS $XDamage_CFLAGS" + LIBS="$LIBS $XDamage_LIBS" else dnl non-modular X11 installation 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 want_xft=no else - PKG_CHECK_MODULES(XFT, [xft]) - CFLAGS="$CFLAGS $XFT_CFLAGS" - LIBS="$LIBS $XFT_LIBS" + PKG_CHECK_MODULES([Xft], [xft]) + CFLAGS="$CFLAGS $Xft_CFLAGS" + LIBS="$LIBS $Xft_LIBS" AC_DEFINE(XFT, 1, [Define for Xft support]) fi fi @@ -426,9 +427,9 @@ dnl GLIB dnl if test x$WANT_GLIB = xyes; then - PKG_CHECK_MODULES([GLIB], [glib-2.0]) - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" + PKG_CHECK_MODULES([GLib2], [glib-2.0]) + CFLAGS="$CFLAGS $GLib2_CFLAGS" + LIBS="$LIBS $GLib2_LIBS" fi dnl diff --git a/doc/conky.1 b/doc/conky.1 index a472576..c031a97 100644 --- a/doc/conky.1 +++ b/doc/conky.1 @@ -645,7 +645,7 @@ Disk IO graph for writes, colours defined in hex, minus the #. If scale is non-z .TP \fB\*(T<\fBdisk_protect\fR\*(T>\fR \*(T<\fBdevice\fR\*(T> -Disk protection status, if supported (needs kernel-patch). Prints either "frozen" or "free " (note the padding). +Disk protection status, if supported (needs kernel-patch). Prints either "frozen" or "free " (note the padding). .TP \fB\*(T<\fBdownspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T> diff --git a/doc/conky.conf b/doc/conky.conf index bb1d3da..204567b 100644 --- a/doc/conky.conf +++ b/doc/conky.conf @@ -123,7 +123,7 @@ net_avg_samples 2 override_utf8_locale no # 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) #max_port_monitor_connections 256 -- 1.7.9.5