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 fd80e45..75b424c 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,7 +4,7 @@ dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [4])
 m4_define([conky_version_micro], [6])
-m4_define([conky_version_tag], [svn]) dnl [] for releases
+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(
@@ -184,18 +184,33 @@ dnl RSS
 dnl
 
 AC_ARG_ENABLE([rss],
-             AC_HELP_STRING([--enable-rss], [enable if you want rss support (requires libmrss) @<:@default=no@:>@]),
+             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
-       CFLAGS="$CFLAGS `xml2-config --cflags`"
-       LIBS="$LIBS `xml2-config --libs`"
+       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
 dnl
 
@@ -222,21 +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
        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
@@ -542,4 +557,5 @@ $PACKAGE $VERSION configured successfully:
   hddtemp:          $want_hddtemp
   portmon:          $want_portmon  
   RSS:             $want_rss
+  wireless:         $want_wlan
 EOF