X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac.in;h=1904627a5fee39298bc48f804467a245fc38f66e;hb=fc1bd4cf0a46eb594789d5a5f72a7f9427e89431;hp=23c7723b592deebc10d1d9984f70c64b1aef81ae;hpb=e56aa03a8600072c7b599d3739a339dc4a32fb43;p=monky

diff --git a/configure.ac.in b/configure.ac.in
index 23c7723..1904627 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2,8 +2,8 @@
 #
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
-m4_define([conky_version_minor], [8])
-m4_define([conky_version_micro], [0])
+m4_define([conky_version_minor], [9])
+m4_define([conky_version_micro], [6])
 m4_define([conky_version_tag], [pre]) dnl [] for releases
 m4_define([conky_version_revision],[_pre@REVISION@])
 m4_define([conky_version],
@@ -49,6 +49,7 @@ AC_CONFIG_FILES(
   src/Makefile
   src/build.h
   lua/Makefile
+  src/dbus/Makefile
   )
 
 uname=`uname`
@@ -149,7 +150,7 @@ AC_ARG_ENABLE([audacious],
 
 AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy)
 if test x$want_audacious = xyes; then
-      PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
+      PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0])
       conky_CFLAGS="$conky_CFLAGS $Audacious_CFLAGS"
       conky_LIBS="$conky_LIBS $Audacious_LIBS"
       save_CPPFLAGS="$CPPFLAGS"
@@ -238,7 +239,7 @@ AC_ARG_ENABLE([apcupsd],
               [want_apcupsd="$enableval"], [want_apcupsd=yes])
 
 if test x$want_apcupsd = xyes; then
-  if test x"$uname" != xLinux; then
+  if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
       AC_MSG_NOTICE([apcupsd not supported on $uname... disabling])
       want_apcupsd="not supported on $uname"
   else
@@ -258,7 +259,7 @@ AC_ARG_ENABLE([iostats],
               [want_iostats="$enableval"], [want_iostats=yes])
 
 if test x$want_iostats = xyes; then
-  if test x"$uname" != xLinux; then
+  if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
       AC_MSG_NOTICE([iostats not supported on $uname... disabling])
       want_iostats="not supported on $uname"
   else
@@ -317,7 +318,7 @@ AC_ARG_ENABLE([xmms2],
 
 AM_CONDITIONAL(BUILD_XMMS2, test x$want_xmms2 = xyes)
 if test x$want_xmms2 = xyes; then
-  PKG_CHECK_MODULES([XMMS2], [xmms2-client])
+  PKG_CHECK_MODULES([XMMS2], [xmms2-client] >= [0.6])
     conky_CFLAGS="$conky_CFLAGS $XMMS2_CFLAGS"
     conky_LIBS="$conky_LIBS $XMMS2_LIBS"
     AC_DEFINE(XMMS2, 1, [Define if you want XMMS2 support])
@@ -423,6 +424,23 @@ if test "x$want_x11" = "xyes"; then
 fi
 
 dnl
+dnl ARGB
+dnl
+
+AC_ARG_ENABLE([argb],
+              AC_HELP_STRING([--disable-argb], [disable if you do not want a argb visual @<:@default=yes@:>@]),
+              [want_argb="$enableval"], [want_argb=yes])
+
+if test x$want_argb = xyes; then
+    if test "x$want_x11" != "xyes"; then
+	dnl silently disable if no x11
+	want_argb=no
+    else
+	AC_DEFINE(USE_ARGB, 1, [Define if you want argb visual support])
+    fi
+fi
+
+dnl
 dnl IMLIB2
 dnl
 
@@ -494,12 +512,12 @@ if test x$want_lua = xyes; then
 				AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
 			fi
 		fi
-		AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1], no)
+		AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1 tolua++-5.1], no)
 		if test x$toluapp = xno; then
-			AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.])
+			AC_MSG_ERROR([tolua++, tolua++5.1, or tolua++-5.1 is required for Lua extras.])
 		else
 			AC_SEARCH_LIBS(tolua_error,
-						   [tolua++ tolua++5.1],
+						   [tolua++-5.1 tolua++ tolua++5.1],
 						   [
 							AC_SUBST(tolua_LIBS, "${LIBS}")
 							AC_SUBST(tolua_CFLAGS, "${CFLAGS}")
@@ -527,8 +545,9 @@ AC_ARG_ENABLE([wlan],
 AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
 if test x$want_wlan = xyes; then
   AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found]))
-  AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="$conky_LIBS -liw"], AC_MSG_ERROR([iw_sockets_open not found]))
-	AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
+  AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="-liw $conky_LIBS"],
+               AC_MSG_ERROR([iw_sockets_open not found]), [$conky_LIBS])
+  AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
 fi
 
 dnl
@@ -749,9 +768,6 @@ fi
 if test x$want_alsa = xyes; then
     AC_CHECK_LIB(asound, snd_pcm_open,conky_LIBS="$conky_LIBS -lasound", want_alsa=no)
 fi
-if test x$want_alsa = xyes; then
-AC_DEFINE(MIXER_IS_ALSA, 1, [Define if the mixers use ALSA])
-fi
 dnl
 dnl Some headers
 dnl
@@ -764,7 +780,7 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
       #endif
       ])
 # check if we have inotify support
-AC_CHECK_HEADERS([sys/inotify.h])
+# DML #AC_CHECK_HEADERS([sys/inotify.h])
 
 dnl
 dnl Some defines
@@ -782,7 +798,7 @@ dnl Some functions
 dnl
 
 AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg memrchr strndup gethostbyname_r])
-AC_SEARCH_LIBS(clock_gettime, [rt], conky_LIBS="$conky_LIBS -lrt"
+AC_SEARCH_LIBS(clock_gettime, [rt], conky_LIBS="$conky_LIBS $LIBS"
                [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])],
                [AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([gettimeofday() not available!])])], [])
 
@@ -965,6 +981,7 @@ $PACKAGE $VERSION configured successfully:
   XDamage support:  $want_xdamage
   XDBE support:     $want_double_buffer
   Xft support:      $want_xft
+  ARGB support      $want_argb
 
  * Music detection:
   Audacious:        $want_audacious
@@ -992,6 +1009,7 @@ dnl  OpenMP:           $want_openmp
   ALSA mixer:       $want_alsa
   apcupsd:          $want_apcupsd
   I/O stats:        $want_iostats
+  ncurses:          $want_ncurses
 
  * Lua ($want_lua) bindings:
   Cairo:            $want_lua_cairo