Index: configure.in
===================================================================
RCS file: /cvsroot/conky/conky/configure.in,v
retrieving revision 1.11
diff -u -r1.11 configure.in
--- configure.in	21 Aug 2005 23:09:31 -0000	1.11
+++ configure.in	22 Aug 2005 09:59:41 -0000
@@ -2,6 +2,7 @@
 
 AM_INIT_AUTOMAKE(conky, 1.3)
 AM_CONFIG_HEADER(src/config.h)
+AC_PROG_LIBTOOL
 
 AC_CONFIG_FILES(
 	Makefile
@@ -63,23 +64,6 @@
 fi
 
 dnl
-dnl DOUBLE_BUFFER option
-dnl
-
-dah=yes
-AC_ARG_ENABLE(double_buffer,
-[  --enable-double-buffer  enable if you want to support flicker-free operation [default=yes]],
-  [dah="$enableval"])
-
-if test $dah != "no"; then
-  AC_DEFINE(DOUBLE_BUFFER, 1, [Define if you want support for the DBE extension])
-  AC_CHECK_HEADERS([X11/extensions/Xdbe.h], [AC_DEFINE([HAVE_XDBE], 1, [Xdbe])], [XDBE_MISSING=yes])
-  if test "x$XDBE_MISSING" = xyes; then
-      AC_MSG_ERROR([something went wrong when checking for Xdbe (double buffer extension])
-  fi
-fi
-
-dnl
 dnl PROC_UPTIME option
 dnl
 
@@ -174,38 +158,20 @@
 dnl X
 dnl
 
-want_x11=yes
-AC_ARG_ENABLE(x11,
-[  --enable-x11       enable if you want X11 support [default=yes]],
-  [want_x11="$enableval"])
-
-
-AM_CONDITIONAL(BUILD_X11, test x$want_x11 == xyes)
-if test x$want_x11 == xyes; then
 AC_PATH_X
-AC_CHECK_HEADERS([X11/Xlib.h], [], [X11_MISSING=yes])
-AC_CHECK_LIB([X11], [XOpenDisplay], [X11_LIBS="-lX11"], [], [[-L$x_libraries]])
-AC_CHECK_LIB([Xext], [XdbeQueryExtension], [
-   X11_LIBS="$X11_LIBS -lXext"
-   AC_DEFINE(HAVE_LIBXEXT, 1, [Define if you have libXext])
- ], [], [[-L$x_libraries $X11_LIBS]])
-    if test "x$X11_MISSING" = xyes; then
-      AC_MSG_ERROR([something went wrong when checking for X11, you're probably missing headers or it's not installed, either re-run configure with --disable-x11, or fix this])
-  fi
-  AC_DEFINE(X11, 1, [Define if you want to use X11])
-  AC_DEFINE(HAVE_X11, 1, [Define if you have X11])
-fi
-dnl AC_PATH_X if test $have_x != "yes"; then
-dnl   echo "Sorry, X is very much needed"
-dnl   exit 1
-dnl fi
-dnl AC_DEFINE(HAVE_X11, 1, [Define if you have X11])
+if test $have_x != "yes"; then
+  echo "Sorry, X is very much needed"
+  exit 1
+fi
+AC_DEFINE(X11, 1, [Define if you want to use X11])
+AC_DEFINE(HAVE_X11, 1, [Define if you have X11])
+AM_CONDITIONAL(HAVE_X11, 1)
 
 AC_CHECK_LIB([X11], [XOpenDisplay], [X11_LIBS="-lX11"], [], [[-L$x_libraries]])
 AC_CHECK_LIB([Xext], [XdbeQueryExtension], [
-   X11_LIBS="$X11_LIBS -lXext"
-   AC_DEFINE(HAVE_LIBXEXT, 1, [Define if you have libXext])
- ], [], [[-L$x_libraries $X11_LIBS]])
+  X11_LIBS="$X11_LIBS -lXext"
+  AC_DEFINE(HAVE_LIBXEXT, 1, [Define if you have libXext])
+], [], [[-L$x_libraries $X11_LIBS]])
 
 if test "$x_libraries" != ""; then
   LDFLAGS="$LDFLAGS -L$x_libraries"
@@ -216,6 +182,20 @@
 fi
 
 dnl
+dnl DOUBLE_BUFFER option
+dnl
+
+dah=yes
+AC_ARG_ENABLE(double_buffer,
+[  --enable-double-buffer  enable if you want to support flicker-free operation [default=yes]],
+  [dah="$enableval"])
+
+if test $dah != "no"; then
+  AC_DEFINE(DOUBLE_BUFFER, 1, [Define if you want support for the DBE extension])
+fi
+
+
+dnl
 dnl Xft
 dnl
 
@@ -265,7 +245,7 @@
 dnl
 
 
-AC_CHECK_HEADERS([signal.h unistd.h X11/Xlib.h sys/utsname.h sys/stat.h linux/soundcard.h dirent.h])
+AC_CHECK_HEADERS([signal.h unistd.h X11/Xlib.h sys/utsname.h sys/stat.h linux/soundcard.h dirent.h mcheck.h])
 AC_CHECK_HEADERS([sys/statfs.h sys/param.h sys/mount.h])
 dnl For cairo
 
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/conky/conky/src/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- src/Makefile.am	21 Aug 2005 23:09:32 -0000	1.1
+++ src/Makefile.am	22 Aug 2005 09:59:41 -0000
@@ -10,6 +10,7 @@
 
 if BUILD_LINUX
 linux = linux.c
+PTHREAD_LIBS=	-lpthread
 endif
 
 if BUILD_SOLARIS
@@ -18,6 +19,7 @@
 
 if BUILD_FREEBSD
 freebsd = freebsd.c
+PTHREAD_LIBS=	-pthread
 endif
 
 if BUILD_NETBSD
@@ -32,17 +34,17 @@
 mldonkey = mldonkey.c
 endif
 
-if BUILD_X11
-x11 = x11.c
-endif
+#if HAVE_X11
+#x11 = x11.c
+#endif
 
-conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) $(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(mldonkey) remoted.c remoted.h remotec.c remotec.h
+conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) $(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(mldonkey) remoted.c remoted.h remotec.c remotec.h x11.c
 
-AM_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
+AM_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS) $(PTHREAD_LIBS) -lm
 
 LDADD = $(METAR_LIBS)
 
-LIBS = -lm -lpthread
+#LIBS = -lm -lpthread
 
 EXTRA_DIST = seti.c linux.c solaris.c freebsd.c netbsd.c mpd.c libmpdclient.c \
 cairo.c libmpdclient.h top.h mldonkey.c ftp.c ftp.h x11.c
Index: src/config.h.in
===================================================================
RCS file: /cvsroot/conky/conky/src/config.h.in,v
retrieving revision 1.1
diff -u -r1.1 config.h.in
--- src/config.h.in	21 Aug 2005 22:10:54 -0000	1.1
+++ src/config.h.in	22 Aug 2005 09:59:41 -0000
@@ -15,6 +15,9 @@
 /* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define if you have getloadavg */
 #undef HAVE_GETLOADAVG
 
@@ -30,6 +33,9 @@
 /* Define to 1 if you have the <linux/soundcard.h> header file. */
 #undef HAVE_LINUX_SOUNDCARD_H
 
+/* Define to 1 if you have the <mcheck.h> header file. */
#undef HAVE_MCHECK_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -78,15 +84,9 @@
 /* Define if you have X11 */
 #undef HAVE_X11
 
-/* Define to 1 if you have the <X11/extensions/Xdbe.h> header file. */
-#undef HAVE_X11_EXTENSIONS_XDBE_H
-
 /* Define to 1 if you have the <X11/Xlib.h> header file. */
 #undef HAVE_X11_XLIB_H
 
-/* Xdbe */
-#undef HAVE_XDBE
-
 /* Define if you want MLDonkey support */
 #undef MLDONKEY
 
Index: src/conky.c
===================================================================
RCS file: /cvsroot/conky/conky/src/conky.c,v
retrieving revision 1.1
diff -u -r1.1 conky.c
--- src/conky.c	21 Aug 2005 22:10:54 -0000	1.1
+++ src/conky.c	22 Aug 2005 09:59:49 -0000
@@ -3953,7 +3953,9 @@
 #ifdef OWN_WINDOW
 		CONF("own_window") {
 			own_window = string_to_bool(value);
+#ifdef XDBE
 			use_xdbe = 0;
+#endif
 		}
 #endif
 		CONF("stippled_borders") {
@@ -4192,7 +4194,9 @@
 #ifdef OWN_WINDOW
 		case 'o':
 			own_window = 1;
+#ifdef XDBE
 			use_xdbe = 0;
+#endif
 			break;
 #endif
 #ifdef XDBE
Index: src/conky.h
===================================================================
RCS file: /cvsroot/conky/conky/src/conky.h,v
retrieving revision 1.1
diff -u -r1.1 conky.h
--- src/conky.h	21 Aug 2005 22:10:54 -0000	1.1
+++ src/conky.h	22 Aug 2005 09:59:50 -0000
@@ -9,8 +9,9 @@
 #ifndef _conky_h_
 #define _conky_h_
 
-
+#if defined(HAS_MCHECK_H)
 #include <mcheck.h>
+#endif /* HAS_MCHECK_H */
 #include "config.h"
 #include <sys/utsname.h>
 #include <stdio.h>
Index: src/freebsd.c
===================================================================
RCS file: /cvsroot/conky/conky/src/freebsd.c,v
retrieving revision 1.1
diff -u -r1.1 freebsd.c
--- src/freebsd.c	21 Aug 2005 22:10:54 -0000	1.1
+++ src/freebsd.c	22 Aug 2005 09:59:51 -0000
@@ -331,7 +331,7 @@
 	oldtotal = total;
 }
 
-double get_i2c_info(int *fd, int div, char *devtype)
+double get_i2c_info(int *fd, int arg, char *devtype, char *type)
 {
 	return 0;
 }
@@ -449,3 +449,11 @@
 	return "";
 #endif
 }
+
+void update_top()
+{
+}
+
+void update_wifi_stats()
+{
+}