From 1cc65f741a53ad608a9a150d4076a883002f0738 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <wakeroid@gmail.com>
Date: Mon, 1 Feb 2010 20:39:54 +0100
Subject: moved libnotify support into gtkui using --enable-libnotify

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 1276047a..26e75e20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ SUBDIRS = gme/Game_Music_Emu-0.5.2\
 		  plugins/nullout\
 		  plugins/vtx\
 		  plugins/adplug\
-		  plugins/notification\
 		  ${ALSA_DIR}\
 		  ${LFM_DIR}\
           ${MPGMAD_DIR}\
@@ -22,6 +21,7 @@ SUBDIRS = gme/Game_Music_Emu-0.5.2\
           ${GTKUI_DIR}\
           ${FFMPEG_DIR}\
           ${OSS_DIR}
+#          ${NOTIFY_DIR}
 
 dumbpath=@top_srcdir@/dumb
 sidpath=@top_srcdir@/sid/sidplay-libs-2.1.0
-- 
cgit v1.2.3


From f5399c2357d65fab38e42a526f9f49af4d326dea Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <wakeroid@gmail.com>
Date: Thu, 4 Feb 2010 20:51:32 +0100
Subject: added X11/Xlib check for global hotkeys plugin

---
 Makefile.am  | 2 +-
 README       | 1 +
 configure.ac | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 26e75e20..ff3363b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS = gme/Game_Music_Emu-0.5.2\
 		  dumb\
 		  pixmaps\
 		  icons\
-		  plugins/hotkeys\
 		  plugins/ffap\
 		  plugins/nullout\
 		  plugins/vtx\
 		  plugins/adplug\
+		  ${HOTKEYS_DIR}\
 		  ${ALSA_DIR}\
 		  ${LFM_DIR}\
           ${MPGMAD_DIR}\
diff --git a/README b/README
index ad212de1..b76dd10d 100644
--- a/README
+++ b/README
@@ -12,6 +12,7 @@ optional/build dependencies
     libsndfile: for sndfile plugin
     libcdio + libcddb: for cd audio plugin
     ffmpeg: for ffmpeg plugin
+    xlib: for global hotkeys
 
 if you want to build from git - install autotools, and run autoreconf
 
diff --git a/configure.ac b/configure.ac
index 4e2bd679..874fb020 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,12 @@ if test ${HAVE_NOTIFY}; then
     AC_SUBST(NOTIFY_DEPS_LIBS)
 fi
 
+AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes)
+if test "x$HAVE_XLIB_H" = "xyes"; then
+    HOTKEYS_DIR="plugins/hotkeys"
+    AC_SUBST(HOTKEYS_DIR)
+fi
+
 dnl *** OSS output (partly stolen from audacious)
 have_oss=no
 
@@ -276,6 +282,7 @@ PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test $HAVE_CURL])
 dnl PRINT_PLUGIN_INFO([faad2],[aac/mp4 player],[test $HAVE_FAAD && test $HAVE_MP4FF])
 PRINT_PLUGIN_INFO([cdda],[cd audio player],[test $HAVE_CDIO && test $HAVE_CDDB])
 PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test $HAVE_GTK])
+PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_XLIB_H" = "xyes"])
 PRINT_PLUGIN_INFO([libnotify],[Current track notification],[test $HAVE_NOTIFY])
 PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test $HAVE_FFMPEG])
 PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$have_oss" = "xyes"])
-- 
cgit v1.2.3