changelog

[monky] / configure.in

diff --git a/configure.in b/configure.in
index 4280719..1222b67 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-AC_INIT([Conky],[1.3.3],[brenden1@users.sourceforge.net])
+AC_INIT([Conky],[1.3.6_CVS_20060105],[brenden1@users.sourceforge.net])
 
-AM_INIT_AUTOMAKE(conky, 1.3.3)
+AM_INIT_AUTOMAKE(conky, 1.3.6_CVS_20060105)
 AM_CONFIG_HEADER(src/config.h)
 AC_PROG_LIBTOOL
 
@@ -47,9 +47,9 @@ dnl
 dnl XFT option
 dnl
 
-want_xft=no
+want_xft=yes
 AC_ARG_ENABLE(xft,
-[  --enable-xft            enable if you want to use Xft [[default=no]]],
+[  --enable-xft            enable if you want to use Xft [[default=yes]]],
   [want_xft="$enableval"])
 
 dnl
@@ -69,9 +69,9 @@ dnl
 dnl PROC_UPTIME option
 dnl
 
-dah=no
+dah=yes
 AC_ARG_ENABLE(proc_uptime,
-[  --enable-proc-uptime    enable using /proc/uptime for uptime [[default=no]]],
+[  --enable-proc-uptime    enable using /proc/uptime for uptime [[default=yes]]],
   [dah="$enableval"])
 
 if test $dah = "yes"; then
@@ -79,12 +79,33 @@ if test $dah = "yes"; then
 fi
 
 dnl
+dnl BMPx
+dnl
+
+want_bmpx=no
+AC_ARG_ENABLE(bmpx,
+             [  --enable-bmpx           enable if you want BMPx support [[default=no]]],
+             [want_bmpx="$enableval"])
+
+AM_CONDITIONAL(BUILD_BMPX, test x$want_bmpx = xyes)
+if test x$want_bmpx = xyes; then
+       PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.35 dbus-glib-1 >= 0.35])
+       CFLAGS="$CFLAGS $DBUS_CFLAGS"
+       LIBS="$LIBS $DBUS_LIBS"
+       AC_CHECK_HEADERS([bmpx/dbus.h], [], [BMPX_MISSING=yes])
+       if test "x$BMPX_MISSING" = xyes; then
+               AC_MSG_ERROR([bmpx doesn't seem to be installed, or the headers aren't available])
+       fi
+       AC_DEFINE(BMPX, 1, [Define if you want BMPx support])
+fi
+
+dnl
 dnl Seti@Home
 dnl
 
-want_seti=no
+want_seti=yes
 AC_ARG_ENABLE(seti,
-[  --enable-seti           enable if you want SETI at Home stats [[default=no]]],
+[  --enable-seti           enable if you want SETI at Home stats [[default=yes]]],
   [want_seti="$enableval"])
 
 AM_CONDITIONAL(BUILD_SETI, test x$want_seti = xyes)
@@ -96,9 +117,9 @@ dnl
 dnl MPD
 dnl
 
-want_mpd=no
+want_mpd=yes
 AC_ARG_ENABLE(mpd,
-[  --enable-mpd            enable if you want MPD support [[default=no]]],
+[  --enable-mpd            enable if you want MPD support [[default=yes]]],
   [want_mpd="$enableval"])
 
 AM_CONDITIONAL(BUILD_MPD, test x$want_mpd = xyes)
@@ -107,12 +128,26 @@ if test x$want_mpd = xyes; then
 fi
 
 dnl
+dnl INFOPIPE
+dnl
+
+want_infopipe=yes
+AC_ARG_ENABLE(infopipe,
+[  --enable-infopipe       enable if you want XMMS/BMP InfoPipe support [[default=no]]],
+  [want_infopipe="$enableval"])
+
+AM_CONDITIONAL(BUILD_INFOPIPE, test x$want_infopipe = xyes)
+if test x$want_infopipe = xyes; then
+  AC_DEFINE(INFOPIPE, 1, [Define if you want XMMS/BMP InfoPipe support])
+fi
+
+dnl
 dnl PORT_MONITORS
 dnl
 
-want_portmon=no
+want_portmon=yes
 AC_ARG_ENABLE(portmon,
-[  --enable-portmon        enable if you want tcp (ip4) port monitoring [[default=no]]],
+[  --enable-portmon        enable if you want tcp (ip4) port monitoring [[default=yes]]],
   [want_portmon="$enableval"])
 
 AM_CONDITIONAL(BUILD_PORT_MONITORS, test x$want_portmon = xyes)
@@ -128,32 +163,6 @@ dnl
 dnl Cairo
 dnl
 
-want_cairo=no
-AC_ARG_ENABLE(cairo,
-[  --enable-cairo          enable if you want Cairo support [[default=no]]],
-  [want_cairo="$enableval"])
-
-AM_CONDITIONAL(BUILD_CAIRO, test x$want_cairo = xyes)
-
-
-if test "$want_cairo" = "yes"; then
-  AC_CHECK_HEADERS([cairo.h cairo-xlib.h], [], [CAIRO_MISSING=yes])
-    if test "x$CAIRO_MISSING" = xyes; then
-      AC_MSG_ERROR([something went wrong when checking for cairo, you're probably missing headers or it's not installed])
-  fi
-  AC_PATH_PROG(CAIROCONFIG, pkg-config)
-  if test x$CAIROCONFIG != x; then
-    dnl TODO: needs more checks
-
-    AC_DEFINE(CAIRO, 1, [Define if you are using Cairo])
-    CFLAGS="$CFLAGS `$CAIROCONFIG --cflags cairo` `$CAIROCONFIG --libs cairo` "
-    CAIRO_LIBS="`$CAIROCONFIG --libs cairo` `$CAIROCONFIG --cflags cairo`"
-  else
-    want_cairo=no
-  fi
-fi
-
-
 dnl
 dnl MLDonkey
 dnl
@@ -278,7 +287,6 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
                  #include <sys/param.h>
                  #endif
 ])
-dnl For cairo
 
 dnl
 dnl Check doc stuff