changeset 1493:c5bb3813fbd8 trunk

[svn] - autodetect libnotify, and if found, build the notify plugin
author nenolod
date Fri, 04 Aug 2006 00:58:45 -0700
parents b2eac4a4a22c
children 0414e296c6cf
files ChangeLog configure.ac mk/rules.mk.in
diffstat 3 files changed, 31 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 04 00:49:40 2006 -0700
+++ b/ChangeLog	Fri Aug 04 00:58:45 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-04 07:49:40 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1898]
+  - oh return TRUE here (duh)
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/Plugins/General/notify/notify.c  
+
+
 2006-08-04 07:49:01 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1896]
   - don't crash if there's no available tuple
--- a/configure.ac	Fri Aug 04 00:49:40 2006 -0700
+++ b/configure.ac	Fri Aug 04 00:58:45 2006 -0700
@@ -318,6 +318,25 @@
 	GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
 fi
 
+dnl *** libnotify requirement
+
+AC_ARG_ENABLE(notify,
+    [  --disable-notify        disable libnotify plugin (default=enabled)],
+    [enable_libnotify=$enableval],
+    [enable_libnotify="yes"]
+)
+
+if test "$enable_libnotify" = "yes"; then
+    PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4.2],
+        [have_libnotify=yes
+         GENERAL_PLUGINS="$GENERAL_PLUGINS notify"],
+        [have_libnotify=no]
+    )
+else
+    AC_MSG_RESULT([*** libnotify plugin disabled per user request ***])
+    have_libnotify="no"
+fi
+
 dnl *** AdPlug requirement (libbinio)
 
 AC_ARG_ENABLE(adplug,
@@ -1082,6 +1101,7 @@
 echo "  Song Change:                            yes"
 echo "  LIRC:                                   $have_lirc"
 echo "  AudioScrobbler Client:                  $scrobbler"
+echo "  libnotify Plugin:                       $have_libnotify"
 echo
 echo "  Effect"
 echo "  ------"
--- a/mk/rules.mk.in	Fri Aug 04 00:49:40 2006 -0700
+++ b/mk/rules.mk.in	Fri Aug 04 00:58:45 2006 -0700
@@ -317,3 +317,5 @@
 MUSICBRAINZ_LIBS ?= @MUSICBRAINZ_LIBS@
 CHARDET_LIBS ?= @CHARDET_LIBS@
 SUBDIR_GUESS ?= @SUBDIR_GUESS@
+NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
+NOTIFY_LIBS ?= @NOTIFY_LIBS@