# HG changeset patch # User nenolod # Date 1154678325 25200 # Node ID c5bb3813fbd812a846312acc66f84bbebbc21691 # Parent b2eac4a4a22c7437b01d9881907ba0fc83fa82be [svn] - autodetect libnotify, and if found, build the notify plugin diff -r b2eac4a4a22c -r c5bb3813fbd8 ChangeLog --- 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 + 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 revision [1896] - don't crash if there's no available tuple diff -r b2eac4a4a22c -r c5bb3813fbd8 configure.ac --- 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 " ------" diff -r b2eac4a4a22c -r c5bb3813fbd8 mk/rules.mk.in --- 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@