RSS was not really disabled when it was supposed to be. Experimental wireless support.

[monky] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index 962b8b0..75b424c 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2,9 +2,9 @@ dnl $Id$
 
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
-m4_define([conky_version_minor], [5])
-m4_define([conky_version_micro], [0])
-m4_define([conky_version_tag], [svn]) dnl [] for releases
+m4_define([conky_version_minor], [4])
+m4_define([conky_version_micro], [6])
+m4_define([conky_version_tag], []) dnl [] for releases
 m4_define([conky_version_revision],[r@REVISION@])
 m4_define([conky_version], 
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
@@ -59,10 +59,10 @@ case $uname in
 #    WANT_OSSLIB=yes
 #    ;;
 
-#  OpenBSD*)
-#    WANT_KVM=yes
-#    WANT_OSSLIB=yes
-#    ;;
+  OpenBSD*)
+    WANT_KVM=yes
+    WANT_OSSLIB=yes
+    ;;
 
 # Solaris doesn't work at all right now
 #  SunOS*)
@@ -80,7 +80,7 @@ AM_CONDITIONAL(BUILD_LINUX, test x$uname = xLinux)
 #AM_CONDITIONAL(BUILD_SOLARIS, test x$uname = xSunOS)
 AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD)
 #AM_CONDITIONAL(BUILD_NETBSD, test x$uname = xNetBSD)
-# AM_CONDITIONAL(BUILD_OPENBSD, test x$uname = xOpenBSD)
+AM_CONDITIONAL(BUILD_OPENBSD, test x$uname = xOpenBSD)
 
 BUILD_DATE=$(LANG=en_US LC_ALL=en_US LOCALE=en_US date)
 BUILD_ARCH="$(uname -sr) ($(uname -m))"
@@ -179,6 +179,36 @@ if test x$want_xmms2 = xyes; then
     AC_DEFINE(XMMS2, 1, [Define if you want XMMS2 support])
 fi
 
+dnl
+dnl RSS
+dnl
+
+AC_ARG_ENABLE([rss],
+             AC_HELP_STRING([--enable-rss], [enable if you want rss support @<:@default=no@:>@]),
+             [want_rss="$enableval"], [want_rss=no])
+#
+AM_CONDITIONAL(BUILD_RSS, test x$want_rss = xyes)
+if test x$want_rss = xyes; then
+       WANT_GLIB=yes
+       PKG_CHECK_MODULES(RSS, libxml-2.0 libcurl,,exit)
+       CFLAGS="$CFLAGS $RSS_CFLAGS"
+       LIBS="$LIBS $RSS_LIBS"
+       AC_DEFINE(RSS, 1, [Define if you want rss support])
+fi
+
+dnl
+dnl Wireless extensions
+dnl
+
+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)
+if test x$want_wlan = xyes; then
+       LIBS="$LIBS -liw"
+       AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
+fi
 
 dnl
 dnl IMLIB2
@@ -207,47 +237,21 @@ AC_ARG_ENABLE([portmon],
                              [disable if you do not want tcp (ip4) port monitoring @<:@default=yes@:>@]),
               [want_portmon="$enableval"], [want_portmon=yes])
 
-AM_CONDITIONAL(BUILD_PORT_MONITORS, test x$want_portmon = xyes)
-if test x$want_portmon = xyes; then
-  if test "x$uname" != xLinux; then
+if test x"$want_portmon" = xyes; then
+  if test x"$uname" != xLinux; then
       AC_MSG_NOTICE([port monitors not supported on $uname... disabling])
       want_portmon=no
   else
         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
+        if test x"$PORT_MONITORS_MISSING" = xyes; then
               AC_MSG_ERROR([missing a needed network header for port monitoring])
         fi
-      PKG_CHECK_MODULES([GLIB], [glib-2.0])
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$LIBS $GLIB_LIBS"
-        AC_DEFINE(TCP_PORT_MONITOR, 1, [Define if you want tcp port monitoring support])
-  fi
-fi
-
-
-dnl
-dnl Network-based monitoring
-dnl
-
-AC_ARG_ENABLE([network],
-              AC_HELP_STRING([--disable-network], 
-                             [disable if you do not want distributed monitoring @<:@default=yes@:>@]),
-              [want_network="$enableval"], [want_network=yes])
-if test x"$want_network" = x"yes"; then
-  PKG_CHECK_MODULES([LIBDEXTER], [dexter], [], [AC_MSG_RESULT([no]); want_network=no])
-  if test x"$want_network" = x"yes"; then
-    dnl need GNU string stream extensions
-    AC_CHECK_FUNCS([fmemopen open_memstream flockfile funlockfile putc_unlocked], [], [want_network=no])
-    if test x"$want_network" = x"yes"; then
-      CFLAGS="$CFLAGS $LIBDEXTER_CFLAGS"
-      LIBS="$LIBS $LIBDEXTER_LIBS"
-      AC_DEFINE([HAVE_LIBDEXTER], 1, [Define if using Libdexter])
-      dnl _GNU_SOURCE needed for fmemopen, open_memstream
-      AC_DEFINE([_GNU_SOURCE], [], [Define for GNU source and extensions])
-    fi
+       WANT_GLIB=yes
+       AC_DEFINE(TCP_PORT_MONITOR, 1, [Define if you want tcp port monitoring support])
   fi
 fi
+AM_CONDITIONAL(BUILD_PORT_MONITORS, test x"$want_portmon" = xyes)
 
 
 dnl
@@ -380,6 +384,15 @@ if test x$want_xft = "xyes"; then
     fi
 fi
 
+dnl
+dnl GLIB
+dnl
+
+if test x$WANT_GLIB = xyes; then
+       PKG_CHECK_MODULES([GLIB], [glib-2.0])
+        CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$LIBS $GLIB_LIBS"
+fi
 
 dnl
 dnl KVM
@@ -425,12 +438,18 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
       #include <sys/param.h>
       #endif
       ])
+
+AC_DEFINE([_GNU_SOURCE], [], [Define for GNU source and extensions])
+
 dnl
 dnl Some functions
 dnl
 
-AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg])
-AC_SEARCH_LIBS(clock_gettime, [rt], [], AC_MSG_ERROR([clock_gettime() not found]))
+AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg memrchr])
+AC_SEARCH_LIBS(clock_gettime, [rt], 
+               [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])],
+               [AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([gettimeofday() not available!])])], [])
+
 
 dnl
 dnl Check for zlib
@@ -537,5 +556,6 @@ $PACKAGE $VERSION configured successfully:
  * general:
   hddtemp:          $want_hddtemp
   portmon:          $want_portmon  
-  network:          $want_network
+  RSS:             $want_rss
+  wireless:         $want_wlan
 EOF