-AC_INIT([Conky],[1.3.0],[brenden1@users.sourceforge.net])
+AC_INIT([Conky],[1.3.6_CVS_20060105],[brenden1@users.sourceforge.net])
-AM_INIT_AUTOMAKE(conky, 1.3.0)
+AM_INIT_AUTOMAKE(conky, 1.3.6_CVS_20060105)
AM_CONFIG_HEADER(src/config.h)
AC_PROG_LIBTOOL
;;
FreeBSD*)
WANT_KVM=yes
+ WANT_DEVSTAT=yes
;;
- NetBSD*)
- WANT_KVM=yes
- WANT_OSSLIB=yes
- ;;
-# Solaris doesn't work at all right now
+# NetBSD*)
+# WANT_KVM=yes
+# WANT_OSSLIB=yes
+# ;;
+# Solaris doesn't work at all right now
# SunOS*)
# WANT_KSTAT=yes
# ;;
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
dah=yes
AC_ARG_ENABLE(own_window,
-[ --enable-own-window enable if you want support for creating own window [default=yes]],
+[ --enable-own-window enable if you want support for creating own window [[default=yes]]],
[dah="$enableval"])
if test $dah != "no"; then
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
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)
-if test x$want_seti == xyes; then
+AM_CONDITIONAL(BUILD_SETI, test x$want_seti = xyes)
+if test x$want_seti = xyes; then
AC_DEFINE(SETI, 1, [Define if you want SETI at Home stats])
fi
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)
-if test x$want_mpd == xyes; then
+AM_CONDITIONAL(BUILD_MPD, test x$want_mpd = xyes)
+if test x$want_mpd = xyes; then
AC_DEFINE(MPD, 1, [Define if you want MPD support])
fi
dnl
-dnl Cairo
+dnl INFOPIPE
dnl
-want_cairo=no
-AC_ARG_ENABLE(cairo,
-[ --enable-cairo enable if you want Cairo support [default=no]],
- [want_cairo="$enableval"])
+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_CAIRO, test x$want_cairo == xyes)
+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
-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
+want_portmon=yes
+AC_ARG_ENABLE(portmon,
+[ --enable-portmon enable if you want tcp (ip4) port monitoring [[default=yes]]],
+ [want_portmon="$enableval"])
- 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
+AM_CONDITIONAL(BUILD_PORT_MONITORS, test x$want_portmon = xyes)
+if test x$want_portmon = xyes; then
+ AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h sys/socket.h arpa/inet.h], [], [PORT_MONITORS_MISSING=yes])
+ if test "x$PORT_MONITORS_MISSING" = xyes; then
+ AC_MSG_ERROR([missing a needed network header for port monitoring])
fi
+ AC_DEFINE(TCP_PORT_MONITOR, 1, [Define if you want tcp port monitoring support])
fi
+dnl
+dnl Cairo
+dnl
dnl
dnl MLDonkey
want_mldonkey=no
AC_ARG_ENABLE(mldonkey,
-[ --enable-mldonkey enable if you want MLDonkey support [default=no]],
+[ --enable-mldonkey enable if you want MLDonkey support [[default=no]]],
[want_mldonkey="$enableval"])
-AM_CONDITIONAL(BUILD_MLDONKEY, test x$want_mldonkey == xyes)
-if test x$want_mldonkey == xyes; then
+AM_CONDITIONAL(BUILD_MLDONKEY, test x$want_mldonkey = xyes)
+if test x$want_mldonkey = xyes; then
AC_DEFINE(MLDONKEY, 1, [Define if you want MLDonkey support])
fi
dah=yes
AC_ARG_ENABLE(double_buffer,
-[ --enable-double-buffer enable if you want to support flicker-free operation [default=yes]],
+[ --enable-double-buffer enable if you want to support flicker-free operation [[default=yes]]],
[dah="$enableval"])
want_x11=yes
AC_ARG_ENABLE(x11,
-[ --enable-x11 enable if you want X11 support [default=yes]],
+[ --enable-x11 enable if you want X11 support [[default=yes]]],
[want_x11="$enableval"])
-AM_CONDITIONAL(BUILD_X11, test x$want_x11)
-if test x$want_x11 == xyes; then
+if test "x$want_x11" = "xyes"; then
AC_PATH_X
AC_PATH_XTRA
CFLAGS="$CFLAGS $X_CFLAGS"
fi
AC_DEFINE(X11, 1, [Define if you want to use X11])
AC_DEFINE(HAVE_X11, 1, [Define if you have X11])
+ AM_CONDITIONAL(BUILD_X11, true)
if test $dah != "no"; then
AC_DEFINE(DOUBLE_BUFFER, 1, [Define if you want support for the DBE extension])
AC_CHECK_LIB(Xext, XdbeQueryExtension, [AC_DEFINE([HAVE_XDBE], 1, [Xdbe]) LIBS="$LIBS -lXext"],
[AC_MSG_ERROR([something went wrong when checking for Xdbe (double buffer extension)])])
fi
+else
+ AM_CONDITIONAL(BUILD_X11, false)
fi
-AM_CONDITIONAL(HAVE_X11, test x$want_x11)
-
-
dnl
dnl Xft
fi
dnl
+dnl devstat
+dnl
+
+if test x$WANT_DEVSTAT = xyes; then
+ AC_CHECK_LIB(devstat, devstat_getversion,
+ LIBS="$LIBS -ldevstat",
+ AC_MSG_ERROR([Cound not find devstat_getversion in -ldevstat.])
+ )
+fi
+
+dnl
dnl OSSLIB for NetBSD
dnl
dnl
-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
+AC_CHECK_HEADERS([signal.h unistd.h sys/utsname.h sys/stat.h linux/soundcard.h dirent.h mcheck.h])
+AC_CHECK_HEADERS([sys/statfs.h sys/param.h])
+AC_CHECK_HEADERS([sys/mount.h], [], [],
+ [#ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+])
dnl
dnl Check doc stuff
projects / monky / blobdiff