Commit 0053cd0d authored by Max Kellermann's avatar Max Kellermann

Main: disable inotify check without database

Fix build failure.
parent c32477a2
...@@ -249,6 +249,7 @@ src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) ...@@ -249,6 +249,7 @@ src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
endif endif
if ENABLE_DATABASE
if ENABLE_INOTIFY if ENABLE_INOTIFY
src_mpd_SOURCES += \ src_mpd_SOURCES += \
src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \ src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \
...@@ -256,6 +257,7 @@ src_mpd_SOURCES += \ ...@@ -256,6 +257,7 @@ src_mpd_SOURCES += \
src/db/update/InotifyQueue.cxx src/db/update/InotifyQueue.hxx \ src/db/update/InotifyQueue.cxx src/db/update/InotifyQueue.hxx \
src/db/update/InotifyUpdate.cxx src/db/update/InotifyUpdate.hxx src/db/update/InotifyUpdate.cxx src/db/update/InotifyUpdate.hxx
endif endif
endif
if ENABLE_SQLITE if ENABLE_SQLITE
src_mpd_SOURCES += \ src_mpd_SOURCES += \
......
...@@ -71,16 +71,15 @@ ...@@ -71,16 +71,15 @@
#include "db/plugins/SimpleDatabasePlugin.hxx" #include "db/plugins/SimpleDatabasePlugin.hxx"
#include "storage/Configured.hxx" #include "storage/Configured.hxx"
#include "storage/CompositeStorage.hxx" #include "storage/CompositeStorage.hxx"
#ifdef ENABLE_INOTIFY
#include "db/update/InotifyUpdate.hxx"
#endif
#endif #endif
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
#include "neighbor/Glue.hxx" #include "neighbor/Glue.hxx"
#endif #endif
#ifdef ENABLE_INOTIFY
#include "db/update/InotifyUpdate.hxx"
#endif
#ifdef ENABLE_SQLITE #ifdef ENABLE_SQLITE
#include "sticker/StickerDatabase.hxx" #include "sticker/StickerDatabase.hxx"
#endif #endif
...@@ -519,6 +518,7 @@ int mpd_main(int argc, char *argv[]) ...@@ -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)); 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)) { if (config_get_bool(CONF_AUTO_UPDATE, false)) {
#ifdef ENABLE_INOTIFY #ifdef ENABLE_INOTIFY
if (instance->storage != nullptr && if (instance->storage != nullptr &&
...@@ -533,6 +533,7 @@ int mpd_main(int argc, char *argv[]) ...@@ -533,6 +533,7 @@ int mpd_main(int argc, char *argv[])
"inotify: auto_update was disabled. enable during compilation phase"); "inotify: auto_update was disabled. enable during compilation phase");
#endif #endif
} }
#endif
config_global_check(); config_global_check();
...@@ -557,7 +558,7 @@ int mpd_main(int argc, char *argv[]) ...@@ -557,7 +558,7 @@ int mpd_main(int argc, char *argv[])
/* cleanup */ /* cleanup */
#ifdef ENABLE_INOTIFY #if defined(ENABLE_DATABASE) && defined(ENABLE_INOTIFY)
mpd_inotify_finish(); mpd_inotify_finish();
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment