mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-25 12:10:03 +00:00
Incorrectly pasted stuff in configure.ac.in screwed the build process. Updated ChangeLog.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@902 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
4d4eb2420b
commit
b8b4694fca
@ -1,5 +1,9 @@
|
||||
# $Id$
|
||||
|
||||
2007-08-08
|
||||
* RSS support
|
||||
* Wireless support for Linux
|
||||
|
||||
2007-08-05
|
||||
* Conky 1.4.6 released
|
||||
* Updated to libmpdclient 0.13.0
|
||||
|
@ -204,7 +204,7 @@ AC_ARG_ENABLE([wlan],
|
||||
AC_HELP_STRING([--enable-wlan], [enable if you want wireless support @<:@default=no@:>@]),
|
||||
[want_wlan="$enableval"], [want_wlan=no])
|
||||
#
|
||||
AM_CONDITIONAL(BUILD_RSS, test x$want_wlan = xyes)
|
||||
AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
|
||||
if test x$want_wlan = xyes; then
|
||||
LIBS="$LIBS -liw"
|
||||
AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
|
||||
|
@ -15,15 +15,13 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#ifdef RSS
|
||||
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/tree.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include "prss.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifndef PARSE_OPTIONS
|
||||
#define PARSE_OPTIONS 0
|
||||
@ -223,5 +221,3 @@ PRSS* prss_parse_doc(xmlDocPtr doc)
|
||||
free(result);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -6,10 +6,6 @@
|
||||
* new rss.c written by hifi (Toni Spets)
|
||||
*/
|
||||
|
||||
#include "conky.h"
|
||||
|
||||
#ifdef RSS
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
@ -18,6 +14,7 @@
|
||||
#include <curl/curl.h>
|
||||
#include <curl/types.h>
|
||||
#include <curl/easy.h>
|
||||
#include "conky.h"
|
||||
|
||||
#define MAX_FEEDS 16
|
||||
|
||||
@ -156,5 +153,3 @@ get_rss_info(char *uri, int delay)
|
||||
|
||||
return curdata;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user