From 0053cd0d0d5a9b5ef54d604d2c650ee3803a04e5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 18 Feb 2014 21:05:04 +0100
Subject: Main: disable inotify check without database

Fix build failure.
---
 Makefile.am  |  2 ++
 src/Main.cxx | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b84a67316..2decacbd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,6 +249,7 @@ src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
 src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
 endif
 
+if ENABLE_DATABASE
 if ENABLE_INOTIFY
 src_mpd_SOURCES += \
 	src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \
@@ -256,6 +257,7 @@ src_mpd_SOURCES += \
 	src/db/update/InotifyQueue.cxx src/db/update/InotifyQueue.hxx \
 	src/db/update/InotifyUpdate.cxx src/db/update/InotifyUpdate.hxx
 endif
+endif
 
 if ENABLE_SQLITE
 src_mpd_SOURCES += \
diff --git a/src/Main.cxx b/src/Main.cxx
index 2657d54f1..de74925e5 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -71,16 +71,15 @@
 #include "db/plugins/SimpleDatabasePlugin.hxx"
 #include "storage/Configured.hxx"
 #include "storage/CompositeStorage.hxx"
+#ifdef ENABLE_INOTIFY
+#include "db/update/InotifyUpdate.hxx"
+#endif
 #endif
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
 #include "neighbor/Glue.hxx"
 #endif
 
-#ifdef ENABLE_INOTIFY
-#include "db/update/InotifyUpdate.hxx"
-#endif
-
 #ifdef ENABLE_SQLITE
 #include "sticker/StickerDatabase.hxx"
 #endif
@@ -519,6 +518,7 @@ int mpd_main(int argc, char *argv[])
 
 	instance->partition->outputs.SetReplayGainMode(replay_gain_get_real_mode(instance->partition->playlist.queue.random));
 
+#ifdef ENABLE_DATABASE
 	if (config_get_bool(CONF_AUTO_UPDATE, false)) {
 #ifdef ENABLE_INOTIFY
 		if (instance->storage != nullptr &&
@@ -533,6 +533,7 @@ int mpd_main(int argc, char *argv[])
 			      "inotify: auto_update was disabled. enable during compilation phase");
 #endif
 	}
+#endif
 
 	config_global_check();
 
@@ -557,7 +558,7 @@ int mpd_main(int argc, char *argv[])
 
 	/* cleanup */
 
-#ifdef ENABLE_INOTIFY
+#if defined(ENABLE_DATABASE) && defined(ENABLE_INOTIFY)
 	mpd_inotify_finish();
 #endif
 
-- 
cgit v1.2.3