oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: disable inotify check without database

Browse Source 
Fix build failure.
This commit is contained in:
Max Kellermann 2014-02-18 21:05:04 +01:00
parent c32477a223
commit 0053cd0d0d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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 += \

11
src/Main.cxx
View File

@ -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