remove bogus cairo junk

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@737 7f574dfc-610e-0410-a909-a81674777703

diff --git a/src/Makefile.am b/src/Makefile.am
index 924068f..8e5585e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,7 @@ conky_SOURCES =               \
        $(x11)                  \
        $(xmms2) 
 
-AM_LDFLAGS = $(CAIRO_LIBS) $(PTHREAD_LIBS) -lm
+AM_LDFLAGS = $(PTHREAD_LIBS) -lm
 
 EXTRA_DIST =                   \
        audacious.c             \

diff --git a/src/conky.h b/src/conky.h
index cc11852..31e3268 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -28,16 +28,6 @@
 #include <kvm.h>
 #endif /* __FreeBSD__ */
 
-#ifdef X11
-#if defined(HAVE_CAIRO_H) && defined(HAVE_CAIRO_XLIB_H) && defined(WANT_CAIRO)
-#define CAIRO
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <cairo.h>
-#include <cairo-xlib.h>
-#endif
-#endif /* X11 */
-
 #if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
 #include <machine/apm_bios.h>
 #endif /* __FreeBSD__ */
@@ -553,11 +543,6 @@ char *get_hddtemp_info(char *dev, char *addr, int port, char *unit);
 
 /* in linux.c */
 
-/* nothing to see here */
-
-/* in cairo.c */
-extern int do_it(void);
-
 #endif