diff configure.ac @ 1005:2346d918470d trunk

[svn] Fixed rootvis' config to only declare stuff once; modified alarm.c to use dbus and made appropriate changes to the build system.

--- a/configure.ac	Sun May 06 22:53:19 2007 -0700
+++ b/configure.ac	Wed May 09 14:38:09 2007 -0700
@@ -107,7 +107,7 @@
     [AC_MSG_ERROR([Cannot find Audacious, have you installed audacious yet?])]
 )
 
-dnl Check for GTK/GLib/GThread/Pango
+dnl Check for GTK/GLib/GThread/Pango/DBus
 
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0 gthread-2.0],
     [ADD_PC_REQUIRES([glib-2.0 >= 2.6.0])],
@@ -124,6 +124,12 @@
     [AC_MSG_ERROR([Cannot find pango >= 1.8.0])]
 )
 
+PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60],
+    [ADD_PC_REQUIRES([dbus-1 >= 0.60 dbus-glib-1 >= 0.60])
+     AC_DEFINE(USE_DBUS, 1, [Define if D-Bus support enabled])],
+    [AC_MSG_ERROR([Cannot find dbus-glib >= 0.60])]
+])
+
 dnl IPv6 support
 dnl ========================
 AC_ARG_ENABLE(ipv6,
@@ -1015,8 +1021,8 @@
 AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes")
 AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")
 
-CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-CXXFLAGS="$CXXFLAGS $AUDACIOUS_CFLAGS"
+CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
+CXXFLAGS="$CXXFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
 
 AC_MSG_CHECKING(if __ELF__ is defined)
 AC_EGREP_CPP(yes,