diff --git a/Makefile.am b/Makefile.am
index 5608574fb..ae260c439 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -492,12 +492,12 @@ libpcm_a_SOURCES = \
 	src/pcm/PcmUtils.hxx
 libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(SOXR_CFLAGS) \
-	$(SAMPLERATE_CFLAGS)
+	$(LIBSAMPLERATE_CFLAGS)
 
 PCM_LIBS = \
 	libpcm.a \
 	$(SOXR_LIBS) \
-	$(SAMPLERATE_LIBS)
+	$(LIBSAMPLERATE_LIBS)
 
 if ENABLE_DSD
 libpcm_a_SOURCES += \
@@ -505,12 +505,12 @@ libpcm_a_SOURCES += \
 	src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h
 endif
 
-if HAVE_LIBSAMPLERATE
+if ENABLE_LIBSAMPLERATE
 libpcm_a_SOURCES += \
 	src/pcm/LibsamplerateResampler.cxx src/pcm/LibsamplerateResampler.hxx
 endif
 
-if HAVE_SOXR
+if ENABLE_SOXR
 libpcm_a_SOURCES += \
 	src/pcm/SoxrResampler.cxx src/pcm/SoxrResampler.hxx
 endif
@@ -542,7 +542,7 @@ libfs_a_SOURCES = \
 	src/fs/DirectoryReader.hxx
 libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
 
-if HAVE_ZLIB
+if ENABLE_ZLIB
 libfs_a_SOURCES += \
 	src/lib/zlib/Domain.cxx src/lib/zlib/Domain.hxx \
 	src/fs/io/GunzipReader.cxx src/fs/io/GunzipReader.hxx \
@@ -638,7 +638,7 @@ NEIGHBOR_LIBS = \
 	$(SMBCLIENT_LIBS) \
 	libneighbor.a
 
-if HAVE_LIBUPNP
+if ENABLE_UPNP
 libneighbor_a_SOURCES += \
 	$(UPNP_SOURCES) \
 	src/neighbor/plugins/UpnpNeighborPlugin.cxx src/neighbor/plugins/UpnpNeighborPlugin.hxx
@@ -677,7 +677,7 @@ libdb_plugins_a_SOURCES = \
 	src/db/plugins/simple/SimpleDatabasePlugin.cxx \
 	src/db/plugins/simple/SimpleDatabasePlugin.hxx
 
-if HAVE_LIBMPDCLIENT
+if ENABLE_LIBMPDCLIENT
 libdb_plugins_a_SOURCES += \
 	src/db/plugins/ProxyDatabasePlugin.cxx src/db/plugins/ProxyDatabasePlugin.hxx
 endif
@@ -686,7 +686,7 @@ DB_LIBS = \
 	libdb_plugins.a \
 	$(LIBMPDCLIENT_LIBS)
 
-if HAVE_LIBUPNP
+if ENABLE_UPNP
 libdb_plugins_a_SOURCES += \
 	$(UPNP_SOURCES) \
 	src/db/plugins/upnp/UpnpDatabasePlugin.cxx src/db/plugins/upnp/UpnpDatabasePlugin.hxx \
@@ -735,7 +735,7 @@ libarchive_a_SOURCES += \
 	src/archive/plugins/Bzip2ArchivePlugin.hxx
 endif
 
-if HAVE_ZZIP
+if ENABLE_ZZIP
 libarchive_a_SOURCES += \
 	src/archive/plugins/ZzipArchivePlugin.cxx \
 	src/archive/plugins/ZzipArchivePlugin.hxx
@@ -802,7 +802,7 @@ endif
 
 # ffmpeg
 
-if HAVE_FFMPEG
+if ENABLE_FFMPEG
 noinst_LIBRARIES += libffmpeg.a
 libffmpeg_a_SOURCES = \
 	src/lib/ffmpeg/Error.cxx src/lib/ffmpeg/Error.hxx \
@@ -876,7 +876,7 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/MadDecoderPlugin.hxx
 endif
 
-if HAVE_MPG123
+if ENABLE_MPG123
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/Mpg123DecoderPlugin.cxx \
 	src/decoder/plugins/Mpg123DecoderPlugin.hxx
@@ -888,7 +888,7 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/MpcdecDecoderPlugin.hxx
 endif
 
-if HAVE_OPUS
+if ENABLE_OPUS
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/OggUtil.cxx \
 	src/decoder/plugins/OggUtil.hxx \
@@ -904,13 +904,13 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/OpusDecoderPlugin.h
 endif
 
-if HAVE_WAVPACK
+if ENABLE_WAVPACK
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/WavpackDecoderPlugin.cxx \
 	src/decoder/plugins/WavpackDecoderPlugin.hxx
 endif
 
-if HAVE_ADPLUG
+if ENABLE_ADPLUG
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/AdPlugDecoderPlugin.cxx \
 	src/decoder/plugins/AdPlugDecoderPlugin.h
@@ -934,7 +934,7 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/VorbisDecoderPlugin.cxx src/decoder/plugins/VorbisDecoderPlugin.h
 endif
 
-if HAVE_FLAC
+if ENABLE_FLAC
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/FlacInput.cxx src/decoder/plugins/FlacInput.hxx \
 	src/decoder/plugins/FlacIOHandle.cxx src/decoder/plugins/FlacIOHandle.hxx \
@@ -946,7 +946,7 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/FlacDecoderPlugin.h
 endif
 
-if HAVE_AUDIOFILE
+if ENABLE_AUDIOFILE
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/AudiofileDecoderPlugin.cxx \
 	src/decoder/plugins/AudiofileDecoderPlugin.hxx
@@ -958,7 +958,7 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/MikmodDecoderPlugin.hxx
 endif
 
-if HAVE_MODPLUG
+if ENABLE_MODPLUG
 libmodplug_decoder_plugin_a_SOURCES = \
 	src/decoder/plugins/ModplugDecoderPlugin.cxx \
 	src/decoder/plugins/ModplugDecoderPlugin.hxx
@@ -992,7 +992,7 @@ libdecoder_a_SOURCES += \
 	src/decoder/plugins/WildmidiDecoderPlugin.hxx
 endif
 
-if HAVE_FFMPEG
+if ENABLE_FFMPEG
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/FfmpegMetaData.cxx \
 	src/decoder/plugins/FfmpegMetaData.hxx \
@@ -1055,13 +1055,13 @@ libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/WaveEncoderPlugin.hxx
 endif
 
-if ENABLE_VORBIS_ENCODER
+if ENABLE_VORBISENC
 libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/VorbisEncoderPlugin.cxx \
 	src/encoder/plugins/VorbisEncoderPlugin.hxx
 endif
 
-if HAVE_OPUS
+if ENABLE_OPUS
 libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/OpusEncoderPlugin.cxx \
 	src/encoder/plugins/OpusEncoderPlugin.hxx
@@ -1073,7 +1073,7 @@ libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/LameEncoderPlugin.hxx
 endif
 
-if ENABLE_TWOLAME_ENCODER
+if ENABLE_TWOLAME
 libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/TwolameEncoderPlugin.cxx \
 	src/encoder/plugins/TwolameEncoderPlugin.hxx
@@ -1085,7 +1085,7 @@ libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/FlacEncoderPlugin.hxx
 endif
 
-if ENABLE_SHINE_ENCODER
+if ENABLE_SHINE
 libencoder_plugins_a_SOURCES += \
 	src/encoder/plugins/ShineEncoderPlugin.cxx \
 	src/encoder/plugins/ShineEncoderPlugin.hxx
@@ -1151,7 +1151,7 @@ INPUT_LIBS = \
 	$(DESPOTIFY_LIBS) \
 	$(MMS_LIBS)
 
-if HAVE_ALSA
+if ENABLE_ALSA
 libinput_a_SOURCES += \
 	src/input/plugins/AlsaInputPlugin.cxx \
 	src/input/plugins/AlsaInputPlugin.hxx
@@ -1184,7 +1184,7 @@ libinput_a_SOURCES += \
 	src/input/plugins/CdioParanoiaInputPlugin.hxx
 endif
 
-if HAVE_FFMPEG
+if ENABLE_FFMPEG
 libinput_a_SOURCES += \
 	src/input/plugins/FfmpegInputPlugin.cxx src/input/plugins/FfmpegInputPlugin.hxx
 endif
@@ -1263,7 +1263,7 @@ libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ALSA_CFLAGS) \
 	$(PULSE_CFLAGS)
 
-if HAVE_ALSA
+if ENABLE_ALSA
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/AlsaOutputPlugin.cxx \
 	src/output/plugins/AlsaOutputPlugin.hxx
@@ -1281,14 +1281,14 @@ liboutput_plugins_a_SOURCES += \
 OUTPUT_LIBS += -lOpenSLES
 endif
 
-if HAVE_ROAR
+if ENABLE_ROAR
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/RoarOutputPlugin.cxx \
 	src/output/plugins/RoarOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += src/mixer/plugins/RoarMixerPlugin.cxx
 endif
 
-if HAVE_AO
+if ENABLE_AO
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/AoOutputPlugin.cxx \
 	src/output/plugins/AoOutputPlugin.hxx
@@ -1306,7 +1306,7 @@ liboutput_plugins_a_SOURCES += \
 	src/output/plugins/PipeOutputPlugin.hxx
 endif
 
-if HAVE_JACK
+if ENABLE_JACK
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/JackOutputPlugin.cxx \
 	src/output/plugins/JackOutputPlugin.hxx
@@ -1331,7 +1331,7 @@ liboutput_plugins_a_SOURCES += \
 	src/output/plugins/OSXOutputPlugin.hxx
 endif
 
-if HAVE_PULSE
+if ENABLE_PULSE
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/PulseOutputPlugin.cxx \
 	src/output/plugins/PulseOutputPlugin.hxx
@@ -1422,7 +1422,7 @@ libplaylist_plugins_a_SOURCES += \
 PLAYLIST_LIBS += $(YAJL_LIBS)
 endif
 
-if HAVE_EXPAT
+if ENABLE_EXPAT
 libplaylist_plugins_a_SOURCES += \
 	src/lib/expat/ExpatParser.cxx src/lib/expat/ExpatParser.hxx \
 	src/playlist/plugins/XspfPlaylistPlugin.cxx \
@@ -1542,7 +1542,7 @@ if HAVE_ID3TAG
 noinst_PROGRAMS += test/dump_rva2
 endif
 
-if HAVE_ALSA
+if ENABLE_ALSA
 # this debug program is still ALSA specific
 noinst_PROGRAMS += test/read_mixer
 endif
@@ -1590,7 +1590,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/TagSave.cxx \
 	src/SongFilter.cxx
 
-if HAVE_LIBUPNP
+if ENABLE_UPNP
 test_DumpDatabase_SOURCES += src/lib/expat/ExpatParser.cxx
 endif
 
@@ -1647,7 +1647,7 @@ test_run_neighbor_explorer_LDADD = $(AM_LDADD) \
 	libthread.a \
 	libutil.a
 
-if HAVE_LIBUPNP
+if ENABLE_UPNP
 test_run_neighbor_explorer_SOURCES += src/lib/expat/ExpatParser.cxx
 endif
 
@@ -1680,7 +1680,7 @@ test_visit_archive_SOURCES = test/visit_archive.cxx \
 
 endif
 
-if HAVE_ZLIB
+if ENABLE_ZLIB
 
 noinst_PROGRAMS += test/run_gzip test/run_gunzip
 
@@ -1742,7 +1742,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	src/AudioFormat.cxx src/CheckAudioFormat.cxx \
 	src/DetachedSong.cxx
 
-if HAVE_FLAC
+if ENABLE_FLAC
 test_dump_playlist_SOURCES += \
 	src/ReplayGainInfo.cxx \
 	src/decoder/plugins/FlacMetadata.cxx
@@ -1843,7 +1843,7 @@ test_run_encoder_LDADD = \
 	$(GLIB_LIBS)
 endif
 
-if ENABLE_VORBIS_ENCODER
+if ENABLE_VORBISENC
 noinst_PROGRAMS += test/test_vorbis_encoder
 test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
 	test/stdbin.h \
diff --git a/configure.ac b/configure.ac
index f1986c40f..22072f4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,83 +301,16 @@ else
 	database_auto=no
 fi
 
-AC_ARG_ENABLE(libmpdclient,
-	AS_HELP_STRING([--enable-libmpdclient],
-		[enable support for the MPD client]),,
-	enable_libmpdclient=auto)
-MPD_DEPENDS([enable_libmpdclient], [enable_database],
-	[Cannot use --enable-libmpdclient with --disable-database])
-
-AC_ARG_ENABLE(expat,
-	AS_HELP_STRING([--enable-expat],
-		[enable the expat XML parser]),,
-	enable_expat=auto)
-
-AC_ARG_ENABLE(upnp,
-	AS_HELP_STRING([--enable-upnp],
-		[enable UPnP client support (default: auto)]),,
-	enable_upnp=auto)
-MPD_DEPENDS([enable_upnp], [enable_database],
-	[Cannot use --enable-upnp with --disable-database])
-
-AC_ARG_ENABLE(adplug,
-	AS_HELP_STRING([--enable-adplug],
-		[enable the AdPlug decoder plugin (default: auto)]),,
-	enable_adplug=auto)
-
-AC_ARG_ENABLE(alsa,
-	AS_HELP_STRING([--enable-alsa], [enable ALSA support]),,
-	[enable_alsa=$linux_auto])
-
-AC_ARG_ENABLE(roar,
-	AS_HELP_STRING([--enable-roar],
-		[enable support for RoarAudio]),,
-	[enable_roar=auto])
-
-AC_ARG_ENABLE(ao,
-	AS_HELP_STRING([--enable-ao],
-		[enable support for libao]),,
-	enable_ao=auto)
-MPD_DEPENDS([enable_ao], [enable_glib],
-	[Cannot use --enable-ao with --disable-glib])
-
-AC_ARG_ENABLE(audiofile,
-	AS_HELP_STRING([--enable-audiofile],
-		[enable audiofile support (WAV and others)]),,
-	enable_audiofile=auto)
-
-AC_ARG_ENABLE(zlib,
-	AS_HELP_STRING([--enable-zlib],
-		[enable zlib support (default: auto)]),,
-	enable_zlib=auto)
-
 AC_ARG_ENABLE(bzip2,
 	AS_HELP_STRING([--enable-bzip2],
 		[enable bzip2 archive support (default: auto)]),,
 	enable_bzip2=auto)
 
-AC_ARG_ENABLE(cdio-paranoia,
-	AS_HELP_STRING([--enable-cdio-paranoia],
-		[enable support for audio CD support]),,
-	enable_cdio_paranoia=auto)
-MPD_DEPENDS([enable_cdio_paranoia], [enable_glib],
-	[Cannot use --enable-cdio-paranoia with --disable-glib])
-
-AC_ARG_ENABLE(curl,
-	AS_HELP_STRING([--enable-curl],
-		[enable support for libcurl HTTP streaming (default: auto)]),,
-	[enable_curl=auto])
-
 AC_ARG_ENABLE(smbclient,
 	AS_HELP_STRING([--enable-smbclient],
 		[enable support for libsmbclient (default: auto)]),,
 	[enable_smbclient=auto])
 
-AC_ARG_ENABLE(nfs,
-	AS_HELP_STRING([--enable-nfs],
-		[enable support for libnfs (default: auto)]),,
-	[enable_nfs=auto])
-
 default_enable_daemon=yes
 if test x$host_is_android = xyes || test x$host_is_android = xyes; then
 	default_enable_daemon=no
@@ -406,26 +339,11 @@ AC_ARG_ENABLE(dsd,
 		[enable DSD decoder (default: enable)]),,
 	[enable_dsd=yes])
 
-AC_ARG_ENABLE(ffmpeg,
-	AS_HELP_STRING([--enable-ffmpeg],
-		[enable FFMPEG support]),,
-	enable_ffmpeg=auto)
-
 AC_ARG_ENABLE(fifo,
 	AS_HELP_STRING([--disable-fifo],
 		[disable support for writing audio to a FIFO (default: enable)]),,
 	enable_fifo=yes)
 
-AC_ARG_ENABLE(flac,
-	AS_HELP_STRING([--enable-flac],
-		[enable FLAC decoder]),,
-	enable_flac=auto)
-
-AC_ARG_ENABLE(fluidsynth,
-	AS_HELP_STRING([--enable-fluidsynth],
-		[enable MIDI support via fluidsynth (default: auto)]),,
-	enable_fluidsynth=auto)
-
 AC_ARG_ENABLE(gme,
 	AS_HELP_STRING([--enable-gme],
 		[enable Blargg's game music emulator plugin]),,
@@ -455,25 +373,8 @@ AC_ARG_ENABLE(ipv6,
 		[disable IPv6 support (default: enable)]),,
 	[enable_ipv6=yes])
 
-AC_ARG_ENABLE(iso9660,
-	AS_HELP_STRING([--enable-iso9660],
-		[enable iso9660 archive support (default: disabled)]),,
-	enable_iso9660=no)
-
-AC_ARG_ENABLE(jack,
-	AS_HELP_STRING([--enable-jack],
-		[enable jack support]),,
-	enable_jack=auto)
-MPD_DEPENDS([enable_jack], [enable_glib],
-	[Cannot use --enable-jack with --disable-glib])
-
 AC_SYS_LARGEFILE
 
-AC_ARG_ENABLE(despotify,
-	AS_HELP_STRING([--enable-despotify],
-		[enable support for despotify (default: disable)]),,
-	[enable_despotify=no])
-
 AC_ARG_ENABLE(soundcloud,
 	AS_HELP_STRING([--enable-soundcloud],
 		[enable support for soundcloud.com]),,
@@ -488,16 +389,6 @@ AC_ARG_ENABLE([libwrap],
 	AS_HELP_STRING([--enable-libwrap], [use libwrap]),,
 	[enable_libwrap=auto])
 
-AC_ARG_ENABLE(lsr,
-	AS_HELP_STRING([--enable-lsr],
-		[enable libsamplerate support]),,
-	enable_lsr=auto)
-
-AC_ARG_ENABLE(soxr,
-	AS_HELP_STRING([--enable-soxr],
-		[enable the libsoxr resampler]),,
-	enable_soxr=auto)
-
 AC_ARG_ENABLE(mad,
 	AS_HELP_STRING([--enable-mad],
 		[enable libmad mp3 decoder plugin]),,
@@ -508,16 +399,6 @@ AC_ARG_ENABLE(mikmod,
 		[enable the mikmod decoder (default: disable)]),,
 	enable_mikmod=no)
 
-AC_ARG_ENABLE(mms,
-	AS_HELP_STRING([--enable-mms],
-		[enable the MMS protocol with libmms]),,
-	[enable_mms=auto])
-
-AC_ARG_ENABLE(modplug,
-	AS_HELP_STRING([--enable-modplug],
-		[enable modplug decoder plugin]),,
-	enable_modplug=auto)
-
 AC_ARG_ENABLE(mp4v2,
 	AS_HELP_STRING([--enable-mp4v2],
 		[enable libmp4v2 decoder plugin]),,
@@ -528,21 +409,11 @@ AC_ARG_ENABLE(mpc,
 		[disable musepack (MPC) support (default: auto)]),,
 	enable_mpc=auto)
 
-AC_ARG_ENABLE(mpg123,
-	AS_HELP_STRING([--enable-mpg123],
-		[enable libmpg123 decoder plugin]),,
-	enable_mpg123=auto)
-
 AC_ARG_ENABLE(openal,
 	AS_HELP_STRING([--enable-openal],
 		[enable OpenAL support (default: auto)]),,
 	enable_openal=auto)
 
-AC_ARG_ENABLE(opus,
-	AS_HELP_STRING([--enable-opus],
-		[enable Opus codec support (default: auto)]),,
-	enable_opus=auto)
-
 AC_ARG_ENABLE(oss,
 	AS_HELP_STRING([--disable-oss],
 		[disable OSS support (default: enable)]),,
@@ -558,11 +429,6 @@ AC_ARG_ENABLE(pipe-output,
 		[enable support for writing audio to a pipe (default: disable)]),,
 	enable_pipe_output=no)
 
-AC_ARG_ENABLE(pulse,
-	AS_HELP_STRING([--enable-pulse],
-		[enable support for the PulseAudio sound server]),,
-	enable_pulse=auto)
-
 AC_ARG_ENABLE(recorder-output,
 	AS_HELP_STRING([--enable-recorder-output],
 		[enables the recorder file output plugin (default: disable)]),,
@@ -575,36 +441,16 @@ AC_ARG_ENABLE(sidplay,
 MPD_DEPENDS([enable_sidplay], [enable_glib],
 	[Cannot use --enable-sidplay with --disable-glib])
 
-AC_ARG_ENABLE(shine-encoder,
-	AS_HELP_STRING([--enable-shine-encoder],
-		[enables shine encoder]),,
-	[enable_shine_encoder=auto])
-
 AC_ARG_ENABLE(shout,
 	AS_HELP_STRING([--enable-shout],
 		[enables the shoutcast streaming output]),,
 	[enable_shout=auto])
 
-AC_ARG_ENABLE(sndfile,
-	AS_HELP_STRING([--enable-sndfile],
-		[enable sndfile support]),,
-	enable_sndfile=auto)
-
 AC_ARG_ENABLE(solaris_output,
 	AS_HELP_STRING([--enable-solaris-output],
 		[enables the Solaris /dev/audio output]),,
 	[enable_solaris_output=$host_is_solaris])
 
-AC_ARG_ENABLE(sqlite,
-	AS_HELP_STRING([--enable-sqlite],
-		[enable support for the SQLite database]),,
-	[enable_sqlite=$database_auto])
-
-AC_ARG_ENABLE(systemd-daemon,
-	AS_HELP_STRING([--enable-systemd-daemon],
-		[use the systemd daemon library (default=auto)]),,
-	[enable_systemd_daemon=$linux_auto])
-
 AC_ARG_ENABLE(tcp,
 	AS_HELP_STRING([--disable-tcp],
 		[disable support for clients connecting via TCP (default: enable)]),,
@@ -620,11 +466,6 @@ AC_ARG_WITH(tremor,
 		[use Tremor (vorbisidec) integer Ogg Vorbis decoder (with optional prefix)]),,
 	with_tremor=no)
 
-AC_ARG_ENABLE(twolame-encoder,
-	AS_HELP_STRING([--enable-twolame-encoder],
-		[enable the TwoLAME mp2 encoder]),,
-	enable_twolame_encoder=auto)
-
 AC_ARG_ENABLE(un,
 	AS_HELP_STRING([--disable-un],
 		[disable support for clients connecting via unix domain sockets (default: enable)]),,
@@ -635,23 +476,11 @@ AC_ARG_ENABLE(vorbis,
 		[enable Ogg Vorbis decoder]),,
 	enable_vorbis=auto)
 
-AC_ARG_ENABLE(vorbis-encoder,
-	AS_HELP_STRING([--enable-vorbis-encoder],
-		[enable the Ogg Vorbis encoder]),,
-	[enable_vorbis_encoder=auto])
-MPD_DEPENDS([enable_vorbis_encoder], [enable_glib],
-	[Cannot use --enable-vorbis-encoder with --disable-glib])
-
 AC_ARG_ENABLE(wave-encoder,
 	AS_HELP_STRING([--enable-wave-encoder],
 		[enable the PCM wave encoder]),,
 	enable_wave_encoder=yes)
 
-AC_ARG_ENABLE(wavpack,
-	AS_HELP_STRING([--enable-wavpack],
-		[enable WavPack support]),,
-	enable_wavpack=auto)
-
 AC_ARG_ENABLE(werror,
 	AS_HELP_STRING([--enable-werror],
 		[treat warnings as errors (default: disabled)]),,
@@ -667,12 +496,6 @@ AC_ARG_WITH(zeroconf,
 		[enable zeroconf backend (default=auto)]),,
 	with_zeroconf="auto")
 
-AC_ARG_ENABLE(zzip,
-	AS_HELP_STRING([--enable-zzip],
-		[enable zip archive support (default: disabled)]),,
-	enable_zzip=no)
-
-
 AC_ARG_WITH(tremor-libraries,
 	AS_HELP_STRING([--with-tremor-libraries=DIR],
 		[directory where Tremor library is installed (optional)]),,
@@ -788,12 +611,9 @@ if
 	AC_MSG_ERROR([No client interfaces configured!])
 fi
 
-MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
-	[systemd activation], [libsystemd-daemon not found])
-AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes)
-if test x$enable_systemd_daemon = xyes; then
-	AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library])
-fi
+MPD_ENABLE_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
+	[systemd socket activation], [libsystemd-daemon not found],
+	[$linux_auto])
 
 dnl ---------------------------------------------------------------------------
 dnl LIBC Features
@@ -807,22 +627,14 @@ dnl Miscellaneous Libraries
 dnl ---------------------------------------------------------------------------
 
 dnl -------------------------------- libmpdclient --------------------------------
-MPD_AUTO_PKG(libmpdclient, LIBMPDCLIENT, [libmpdclient >= 2.2],
-	[MPD client library], [libmpdclient not found])
-if test x$enable_libmpdclient = xyes; then
-	AC_DEFINE(HAVE_LIBMPDCLIENT, 1, [Define to use libmpdclient])
-fi
-
-AM_CONDITIONAL(HAVE_LIBMPDCLIENT, test x$enable_libmpdclient = xyes)
+MPD_ENABLE_AUTO_PKG_DEPENDS(libmpdclient, LIBMPDCLIENT,
+	[libmpdclient >= 2.2],
+	[MPD client library], [libmpdclient not found], [],
+	[enable_database], [Cannot use --enable-libmpdclient with --disable-database])
 
 dnl -------------------------------- expat --------------------------------
-MPD_AUTO_PKG(expat, EXPAT, [expat],
+MPD_ENABLE_AUTO_PKG(expat, EXPAT, [expat],
 	[expat XML parser], [expat not found])
-if test x$enable_expat = xyes; then
-	AC_DEFINE(HAVE_EXPAT, 1, [Define to use the expat XML parser])
-fi
-
-AM_CONDITIONAL(HAVE_EXPAT, test x$enable_expat = xyes)
 
 dnl --------------------------------- inotify ---------------------------------
 AC_CHECK_FUNCS(inotify_init inotify_init1)
@@ -943,47 +755,29 @@ dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------- sqlite ---------------------------------
 
-MPD_AUTO_PKG(sqlite, SQLITE, [sqlite3],
-	[SQLite database support], [sqlite not found])
-if test x$enable_sqlite = xyes; then
-	AC_DEFINE([ENABLE_SQLITE], 1, [Define to enable sqlite database support])
-fi
-
-AM_CONDITIONAL(ENABLE_SQLITE, test x$enable_sqlite = xyes)
+MPD_ENABLE_AUTO_PKG(sqlite, SQLITE, [sqlite3],
+	[SQLite database support], [sqlite not found],
+	[$database_auto])
 
 dnl ---------------------------------------------------------------------------
 dnl Converter Plugins
 dnl ---------------------------------------------------------------------------
 
 dnl ------------------------------ libsamplerate ------------------------------
-MPD_AUTO_PKG(lsr, SAMPLERATE, [samplerate >= 0.1.3],
+MPD_ENABLE_AUTO_PKG(lsr, LIBSAMPLERATE, [samplerate >= 0.1.3],
 	[libsamplerate resampling], [libsamplerate not found])
-if test x$enable_lsr = xyes; then
-	AC_DEFINE([HAVE_LIBSAMPLERATE], 1,
-		[Define to enable libsamplerate])
-fi
-AM_CONDITIONAL(HAVE_LIBSAMPLERATE, test x$enable_lsr = xyes)
 
 dnl ------------------------------ libsoxr ------------------------------------
-MPD_AUTO_PKG(soxr, SOXR, [soxr],
+MPD_ENABLE_AUTO_PKG(soxr, SOXR, [soxr],
 	[libsoxr resampler], [libsoxr not found])
-if test x$enable_soxr = xyes; then
-	AC_DEFINE([HAVE_SOXR], 1, [Define to enable libsoxr])
-fi
-
-AM_CONDITIONAL(HAVE_SOXR, test x$enable_soxr = xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl Input Plugins
 dnl ---------------------------------------------------------------------------
 
 dnl ----------------------------------- CURL ----------------------------------
-MPD_AUTO_PKG(curl, CURL, [libcurl >= 7.18],
+MPD_ENABLE_AUTO_PKG(curl, CURL, [libcurl >= 7.18],
 	[libcurl HTTP streaming], [libcurl not found])
-if test x$enable_curl = xyes; then
-	AC_DEFINE(ENABLE_CURL, 1, [Define when libcurl is used for HTTP streaming])
-fi
-AM_CONDITIONAL(ENABLE_CURL, test x$enable_curl = xyes)
 
 dnl ----------------------------------- smbclient -----------------------------
 MPD_AUTO_PKG_LIB(smbclient, SMBCLIENT, [smbclient >= 0.2],
@@ -995,20 +789,12 @@ fi
 AM_CONDITIONAL(ENABLE_SMBCLIENT, test x$enable_smbclient = xyes)
 
 dnl ----------------------------------- NFS -----------------------------
-MPD_AUTO_PKG(nfs, NFS, [libnfs],
+MPD_ENABLE_AUTO_PKG(nfs, NFS, [libnfs],
 	[NFS input plugin], [libnfs not found])
-if test x$enable_nfs = xyes; then
-	AC_DEFINE(ENABLE_NFS, 1, [Define when libnfs is used])
-fi
-AM_CONDITIONAL(ENABLE_NFS, test x$enable_nfs = xyes)
 
 dnl --------------------------------- Despotify ---------------------------------
-MPD_AUTO_PKG(despotify, DESPOTIFY, [despotify],
+MPD_ENABLE_AUTO_PKG(despotify, DESPOTIFY, [despotify],
 	[Despotify support], [despotify not found])
-if test x$enable_despotify = xyes; then
-	AC_DEFINE(ENABLE_DESPOTIFY, 1, [Define when despotify is enabled])
-fi
-AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes)
 
 dnl --------------------------------- Soundcloud ------------------------------
 if test x$enable_soundcloud != xno; then
@@ -1026,24 +812,15 @@ AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes)
 AC_SUBST(YAJL_LIBS)
 
 dnl ---------------------------------- cdio ---------------------------------
-MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
-	[libcdio_paranoia audio CD library], [libcdio_paranoia not found])
+MPD_ENABLE_AUTO_PKG_DEPENDS(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
+	[libcdio_paranoia input plugin], [libcdio_paranoia not found], [],
+	[enable_glib], [Cannot use --enable-cdio-paranoia with --disable-glib])
 if test x$enable_cdio_paranoia = xyes; then
-	AC_DEFINE([ENABLE_CDIO_PARANOIA], 1,
-		[Define to enable libcdio_paranoia support])
 	AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
 fi
 
-AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes)
-
-dnl ---------------------------------- libmms ---------------------------------
-MPD_AUTO_PKG(mms, MMS, [libmms >= 0.4],
+MPD_ENABLE_AUTO_PKG(mms, MMS, [libmms >= 0.4],
 	[libmms mms:// protocol support], [libmms not found])
-if test x$enable_mms = xyes; then
-	AC_DEFINE(ENABLE_MMS, 1,
-		[Define when libmms is used for the MMS protocol])
-fi
-AM_CONDITIONAL(ENABLE_MMS, test x$enable_mms = xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl Neighbor Plugins
@@ -1074,8 +851,8 @@ dnl Archive Plugins
 dnl ---------------------------------------------------------------------------
 
 dnl --------------------------------- iso9660 ---------------------------------
-MPD_AUTO_PKG(iso9660, ISO9660, [libiso9660],
-	[libiso9660 archive library], [libiso9660 not found])
+MPD_ENABLE_AUTO_PKG(iso9660, ISO9660, [libiso9660],
+	[libiso9660 archive plugin], [libiso9660 not found])
 
 AM_CONDITIONAL(HAVE_ISO9660, test x$enable_iso9660 = xyes)
 if test x$enable_iso9660 = xyes; then
@@ -1090,14 +867,9 @@ AM_CONDITIONAL(ENABLE_ISO9660_TEST, test x$MKISOFS != xno)
 
 dnl ---------------------------------- zlib ---------------------------------
 
-MPD_AUTO_PKG(zlib, ZLIB, [zlib],
+MPD_ENABLE_AUTO_PKG(zlib, ZLIB, [zlib],
 	[zlib support], [zlib not found])
 
-AM_CONDITIONAL(HAVE_ZLIB, test x$enable_zlib = xyes)
-if test x$enable_zlib = xyes; then
-	AC_DEFINE(HAVE_ZLIB, 1, [Define to enable zlib support])
-fi
-
 dnl ---------------------------------- libbz2 ---------------------------------
 
 MPD_AUTO_LIB(bzip2, BZ2, bz2, BZ2_bzDecompressInit, [-lbz2], [],
@@ -1125,21 +897,16 @@ if test x$enable_expat = xno; then
 	fi
 fi
 
-MPD_AUTO_PKG(upnp, UPNP, [libupnp],
-	[UPnP client support], [libupnp not found])
-if test x$enable_upnp = xyes; then
-	AC_DEFINE(HAVE_LIBUPNP, 1, [Define when libupnp is used])
-fi
-AM_CONDITIONAL(HAVE_LIBUPNP, test x$enable_upnp = xyes)
+MPD_ENABLE_AUTO_PKG_DEPENDS(upnp, UPNP, [libupnp],
+	[UPnP client support], [libupnp not found], [],
+	[enable_database], [Cannot use --enable-upnp with --disable-database])
 
 dnl --------------------------------- libzzip ---------------------------------
-MPD_AUTO_PKG(zzip, ZZIP, [zziplib >= 0.13],
-	[libzzip archive library], [libzzip not found])
+MPD_ENABLE_AUTO_PKG(zzip, ZZIP, [zziplib >= 0.13],
+	[libzzip archive library], [libzzip not found],
+	[no])
 
-AM_CONDITIONAL(HAVE_ZZIP, test x$enable_zzip = xyes)
 if test x$enable_zzip = xyes; then
-	AC_DEFINE(HAVE_ZZIP, 1, [Define to have zip archive support])
-
 	AC_PATH_PROG(ZIP, zip, no)
 else
 	ZIP="no"
@@ -1165,20 +932,12 @@ dnl Decoder Plugins
 dnl ---------------------------------------------------------------------------
 
 dnl -------------------------------- libadplug --------------------------------
-MPD_AUTO_PKG(adplug, ADPLUG, [adplug],
+MPD_ENABLE_AUTO_PKG(adplug, ADPLUG, [adplug],
 	[AdPlug decoder plugin], [libadplug not found])
-if test x$enable_adplug = xyes; then
-	AC_DEFINE(HAVE_ADPLUG, 1, [Define to use libadplug])
-fi
-AM_CONDITIONAL(HAVE_ADPLUG, test x$enable_adplug = xyes)
 
 dnl -------------------------------- audiofile --------------------------------
-MPD_AUTO_PKG(audiofile, AUDIOFILE, [audiofile >= 0.3],
+MPD_ENABLE_AUTO_PKG(audiofile, AUDIOFILE, [audiofile >= 0.3],
 	[audiofile decoder plugin], [libaudiofile not found])
-AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
-if test x$enable_audiofile = xyes; then
-	AC_DEFINE(HAVE_AUDIOFILE, 1, [Define for audiofile support])
-fi
 
 dnl ----------------------------------- DSD -----------------------------------
 
@@ -1194,38 +953,21 @@ AM_PATH_FAAD()
 AM_CONDITIONAL(HAVE_FAAD, test x$enable_aac = xyes)
 
 dnl ---------------------------------- ffmpeg ---------------------------------
-MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat >= 53.17 libavcodec >= 53.25 libavutil >= 51.17],
+MPD_ENABLE_AUTO_PKG(ffmpeg, FFMPEG,
+	[libavformat >= 53.17 libavcodec >= 53.25 libavutil >= 51.17],
 	[ffmpeg decoder library], [libavformat+libavcodec+libavutil not found])
 
-if test x$enable_ffmpeg = xyes; then
-	AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support])
-fi
-
-AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes)
-
 dnl ----------------------------------- FLAC ----------------------------------
 
-MPD_AUTO_PKG(flac, FLAC, [flac >= 1.2],
+MPD_ENABLE_AUTO_PKG(flac, FLAC, [flac >= 1.2],
 	[FLAC decoder], [libFLAC not found])
 
-if test x$enable_flac = xyes; then
-	AC_DEFINE(HAVE_FLAC, 1, [Define for FLAC support])
-fi
-
-AM_CONDITIONAL(HAVE_FLAC, test x$enable_flac = xyes)
-
 enable_flac_encoder=$enable_flac
 
 dnl -------------------------------- FluidSynth -------------------------------
 
-MPD_AUTO_PKG(fluidsynth, FLUIDSYNTH, [fluidsynth >= 1.1],
-	[fluidsynth decoder], [fluidsynth not found])
-
-if test x$enable_fluidsynth = xyes; then
-	AC_DEFINE(ENABLE_FLUIDSYNTH, 1, [Define for fluidsynth support])
-fi
-
-AM_CONDITIONAL(ENABLE_FLUIDSYNTH, test x$enable_fluidsynth = xyes)
+MPD_ENABLE_AUTO_PKG(fluidsynth, FLUIDSYNTH, [fluidsynth >= 1.1],
+	[fluidsynth MIDI decoder plugin], [fluidsynth not found])
 
 dnl ---------------------------------- libgme ---------------------------------
 MPD_AUTO_PKG_LIB(gme, GME, [libgme], gme, gme_open_file, [-lgme -lstdc++], [],
@@ -1252,12 +994,8 @@ if test x$enable_shout = xyes && test x$enable_shout2 = xauto; then
 fi
 
 dnl -------------------------------- libmpg123 --------------------------------
-MPD_AUTO_PKG(mpg123, MPG123, [libmpg123],
+MPD_ENABLE_AUTO_PKG(mpg123, MPG123, [libmpg123],
 	[libmpg123 decoder plugin], [libmpg123 not found])
-if test x$enable_mpg123 = xyes; then
-	AC_DEFINE(HAVE_MPG123, 1, [Define to use libmpg123])
-fi
-AM_CONDITIONAL(HAVE_MPG123, test x$enable_mpg123 = xyes)
 
 dnl -------------------------------- libmikmod --------------------------------
 if test x$enable_mikmod = xyes; then
@@ -1274,14 +1012,9 @@ fi
 AM_CONDITIONAL(ENABLE_MIKMOD_DECODER, test x$enable_mikmod = xyes)
 
 dnl -------------------------------- libmodplug -------------------------------
-MPD_AUTO_PKG(modplug, MODPLUG, [libmodplug],
+MPD_ENABLE_AUTO_PKG(modplug, MODPLUG, [libmodplug],
 	[modplug decoder plugin], [libmodplug not found])
 
-if test x$enable_modplug = xyes; then
-	AC_DEFINE(HAVE_MODPLUG, 1, [Define for modplug support])
-fi
-AM_CONDITIONAL(HAVE_MODPLUG, test x$enable_modplug = xyes)
-
 dnl -------------------------------- libmp4v2 ---------------------------------
 if test x$enable_aac = xyes; then
         MPD_AUTO_LIB(mp4v2, MP4V2, mp4v2, MP4Create, [-lmp4v2], [],
@@ -1301,23 +1034,14 @@ fi
 AM_CONDITIONAL(HAVE_MP4V2, test x$enable_mp4v2 = xyes)
 
 dnl -------------------------------- libopus ----------------------------------
-MPD_AUTO_PKG(opus, OPUS, [opus ogg],
+MPD_ENABLE_AUTO_PKG(opus, OPUS, [opus ogg],
 	[opus decoder plugin], [libopus not found])
-if test x$enable_opus = xyes; then
-	AC_DEFINE(HAVE_OPUS, 1, [Define to use libopus])
-fi
-AM_CONDITIONAL(HAVE_OPUS, test x$enable_opus = xyes)
 
 dnl -------------------------------- libsndfile -------------------------------
 dnl See above test, which may disable this.
-MPD_AUTO_PKG(sndfile, SNDFILE, [sndfile],
+MPD_ENABLE_AUTO_PKG(sndfile, SNDFILE, [sndfile],
 	[libsndfile decoder plugin], [libsndfile not found])
 
-if test x$enable_sndfile = xyes; then
-	AC_DEFINE(ENABLE_SNDFILE, 1, [Define to enable the sndfile decoder plugin])
-fi
-AM_CONDITIONAL(ENABLE_SNDFILE, test x$enable_sndfile = xyes)
-
 dnl --------------------------------- musepack --------------------------------
 
 MPD_AUTO_LIB(mpc, MPCDEC, mpcdec, mpc_demux_init, [-lmpcdec], [],
@@ -1423,12 +1147,8 @@ fi
 AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes)
 
 dnl --------------------------------- wavpack ---------------------------------
-MPD_AUTO_PKG(wavpack, WAVPACK, [wavpack],
+MPD_ENABLE_AUTO_PKG(wavpack, WAVPACK, [wavpack],
 	[WavPack decoder plugin], [libwavpack not found])
-AM_CONDITIONAL(HAVE_WAVPACK, test x$enable_wavpack = xyes)
-if test x$enable_wavpack = xyes; then
-	AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])
-fi
 
 dnl --------------------------------- WildMidi --------------------------------
 MPD_AUTO_LIB(wildmidi, WILDMIDI, WildMidi, WildMidi_Init, [-lWildMidi], [],
@@ -1480,24 +1200,13 @@ AM_CONDITIONAL(ENABLE_FLAC_ENCODER, test x$enable_flac_encoder = xyes)
 
 dnl ------------------------------- Shine Encoder ------------------------------
 
-MPD_AUTO_PKG(shine_encoder, SHINE, [shine >= 3.1],
+MPD_ENABLE_AUTO_PKG(shine_encoder, SHINE, [shine >= 3.1],
 	[shine encoder], [libshine not found])
 
-if test x$enable_shine_encoder = xyes; then
-	AC_DEFINE(ENABLE_SHINE_ENCODER, 1,
-		[Define to enable the shine encoder plugin])
-fi
-AM_CONDITIONAL(ENABLE_SHINE_ENCODER, test x$enable_shine_encoder = xyes)
-
 dnl ---------------------------- Ogg Vorbis Encoder ---------------------------
-MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg],
-	[Ogg Vorbis encoder], [libvorbisenc not found])
-
-if test x$enable_vorbis_encoder = xyes; then
-	AC_DEFINE(ENABLE_VORBIS_ENCODER, 1,
-		[Define to enable the vorbis encoder plugin])
-fi
-AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_vorbis_encoder = xyes)
+MPD_ENABLE_AUTO_PKG_DEPENDS(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg],
+	[Ogg Vorbis encoder], [libvorbisenc not found], [],
+	[enable_glib], [Cannot use --enable-vorbis-encoder with --disable-glib])
 
 dnl ------------------------------- LAME Encoder ------------------------------
 
@@ -1510,14 +1219,8 @@ fi
 AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame_encoder = xyes)
 
 dnl ----------------------------- TwoLAME Encoder -----------------------------
-MPD_AUTO_PKG(twolame_encoder, TWOLAME, [twolame],
-	[TwoLAME encoder], [libtwolame not found])
-
-if test x$enable_twolame_encoder = xyes; then
-	AC_DEFINE(ENABLE_TWOLAME_ENCODER, 1,
-		[Define to enable the TwoLAME encoder plugin])
-fi
-AM_CONDITIONAL(ENABLE_TWOLAME_ENCODER, test x$enable_twolame_encoder = xyes)
+MPD_ENABLE_AUTO_PKG(twolame_encoder, TWOLAME, [twolame],
+	[TwoLAME encoder plugin], [libtwolame not found])
 
 dnl ------------------------------- WAVE Encoder ------------------------------
 AM_CONDITIONAL(ENABLE_WAVE_ENCODER, test x$enable_wave_encoder = xyes)
@@ -1557,24 +1260,13 @@ dnl Audio Output Plugins
 dnl ---------------------------------------------------------------------------
 
 dnl ----------------------------------- ALSA ----------------------------------
-MPD_AUTO_PKG(alsa, ALSA, [alsa >= 0.9.0],
-	[ALSA output plugin], [libasound not found])
-
-if test x$enable_alsa = xyes; then
-	AC_DEFINE(HAVE_ALSA, 1, [Define to enable ALSA support])
-fi
-
-AM_CONDITIONAL(HAVE_ALSA, test x$enable_alsa = xyes)
+MPD_ENABLE_AUTO_PKG(alsa, ALSA, [alsa >= 0.9.0],
+	[ALSA output plugin], [libasound not found],
+	[$linux_auto])
 
 dnl ----------------------------------- ROAR ----------------------------------
-MPD_AUTO_PKG(roar, ROAR, [libroar >= 0.4.0],
-	[ROAR output plugin], [libroar not found])
-
-if test x$enable_roar = xyes; then
-	AC_DEFINE(HAVE_ROAR, 1, [Define to enable ROAR support])
-fi
-
-AM_CONDITIONAL(HAVE_ROAR, test x$enable_roar = xyes)
+MPD_ENABLE_AUTO_PKG(roar, ROAR, [libroar >= 0.4.0],
+	[RoarAudio output plugin], [libroar not found])
 
 dnl ----------------------------------- FIFO ----------------------------------
 if test x$enable_fifo = xyes; then
@@ -1604,11 +1296,9 @@ fi
 AM_CONDITIONAL(ENABLE_HTTPD_OUTPUT, test x$enable_httpd_output = xyes)
 
 dnl ----------------------------------- JACK ----------------------------------
-MPD_AUTO_PKG(jack, JACK, [jack >= 0.100],
-	[JACK output plugin], [libjack not found])
-if test x$enable_jack = xyes; then
-	AC_DEFINE([HAVE_JACK], 1, [Define to enable JACK support])
-fi
+MPD_ENABLE_AUTO_PKG_DEPENDS(jack, JACK, [jack >= 0.100],
+	[JACK output plugin], [libjack not found], [],
+	[enable_glib], [Cannot use --enable-jack with --disable-glib])
 
 if test x$enable_jack = xyes; then
 	# check whether jack_set_info_function() is available
@@ -1620,16 +1310,10 @@ if test x$enable_jack = xyes; then
 	LIBS=$old_LIBS
 fi
 
-AM_CONDITIONAL(HAVE_JACK, test x$enable_jack = xyes)
-
 dnl ---------------------------------- libao ----------------------------------
-MPD_AUTO_PKG(ao, AO, [ao],
-	[libao output plugin], [libao not found])
-if test x$enable_ao = xyes; then
-	AC_DEFINE(HAVE_AO, 1, [Define to play with ao])
-fi
-
-AM_CONDITIONAL(HAVE_AO, test x$enable_ao = xyes)
+MPD_ENABLE_AUTO_PKG_DEPENDS(ao, AO, [ao],
+	[libao output plugin], [libao not found], [],
+	[enable_glib], [Cannot use --enable-ao with --disable-glib])
 
 dnl ---------------------------------- OpenAL ---------------------------------
 AC_SUBST(OPENAL_CFLAGS,"")
@@ -1683,14 +1367,8 @@ fi
 AM_CONDITIONAL(ENABLE_PIPE_OUTPUT, test x$enable_pipe_output = xyes)
 
 dnl -------------------------------- PulseAudio -------------------------------
-MPD_AUTO_PKG(pulse, PULSE, [libpulse >= 0.9.16],
+MPD_ENABLE_AUTO_PKG(pulse, PULSE, [libpulse >= 0.9.16],
 	[PulseAudio output plugin], [libpulse not found])
-if test x$enable_pulse = xyes; then
-	AC_DEFINE([HAVE_PULSE], 1,
-		[Define to enable PulseAudio support])
-fi
-
-AM_CONDITIONAL(HAVE_PULSE, test x$enable_pulse = xyes)
 
 dnl --------------------------------- Recorder --------------------------------
 if test x$enable_recorder_output = xauto; then
diff --git a/m4/mpd_auto.m4 b/m4/mpd_auto.m4
index ad379498c..041affc65 100644
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -77,3 +77,30 @@ AC_DEFUN([MPD_AUTO_LIB], [
 
 	MPD_AUTO_RESULT([$1], [$7], [$8])
 ])
+
+dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG
+dnl
+dnl Parameters: varname1, varname2, pkg, description, errmsg, default, pre
+AC_DEFUN([MPD_ENABLE_AUTO_PKG], [
+	AC_ARG_ENABLE(translit([$1], [_], [-]),
+		AS_HELP_STRING([--enable-]translit([$1], [_], [-]),
+			[enable $4 (default: auto)]),,
+		[enable_$1=]ifelse([$6], [], [auto], [$6]))
+
+	$7
+
+	MPD_AUTO_PKG($1, $2, $3, $4, $5)
+	if test x$[]enable_$1 = xyes; then
+		AC_DEFINE(ENABLE_$2, 1,
+			[Define to enable $4])
+	fi
+	AM_CONDITIONAL(ENABLE_$2, test x$[]enable_$1 = xyes)
+])
+
+dnl Wrapper for MPD_ENABLE_AUTO_PKG and MPD_DEPENDS
+dnl
+dnl Parameters: varname1, varname2, pkg, description, errmsg, default, dep_variable, dep_errmsg
+AC_DEFUN([MPD_ENABLE_AUTO_PKG_DEPENDS], [
+	MPD_ENABLE_AUTO_PKG([$1], [$2], [$3], [$4], [$5], [$6],
+		[MPD_DEPENDS([enable_$1], [$7], [$8])])
+])
diff --git a/src/archive/ArchiveList.cxx b/src/archive/ArchiveList.cxx
index 79c3a16fe..4a39ea8a5 100644
--- a/src/archive/ArchiveList.cxx
+++ b/src/archive/ArchiveList.cxx
@@ -32,7 +32,7 @@ const ArchivePlugin *const archive_plugins[] = {
 #ifdef HAVE_BZ2
 	&bz2_archive_plugin,
 #endif
-#ifdef HAVE_ZZIP
+#ifdef ENABLE_ZZIP
 	&zzip_archive_plugin,
 #endif
 #ifdef HAVE_ISO9660
diff --git a/src/db/Registry.cxx b/src/db/Registry.cxx
index 5681a9b82..a7d6dc05e 100644
--- a/src/db/Registry.cxx
+++ b/src/db/Registry.cxx
@@ -28,10 +28,10 @@
 
 const DatabasePlugin *const database_plugins[] = {
 	&simple_db_plugin,
-#ifdef HAVE_LIBMPDCLIENT
+#ifdef ENABLE_LIBMPDCLIENT
 	&proxy_db_plugin,
 #endif
-#ifdef HAVE_LIBUPNP
+#ifdef ENABLE_UPNP
 	&upnp_db_plugin,
 #endif
 	nullptr
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
index 7b1886f1c..bc9c42d2d 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -41,7 +41,7 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 #include "fs/io/GzipOutputStream.hxx"
 #endif
 
@@ -52,21 +52,21 @@ static constexpr Domain simple_db_domain("simple_db");
 inline SimpleDatabase::SimpleDatabase()
 	:Database(simple_db_plugin),
 	 path(AllocatedPath::Null()),
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	 compress(true),
 #endif
 	 cache_path(AllocatedPath::Null()),
 	 prefixed_light_song(nullptr) {}
 
 inline SimpleDatabase::SimpleDatabase(AllocatedPath &&_path,
-#ifndef HAVE_ZLIB
+#ifndef ENABLE_ZLIB
 				      gcc_unused
 #endif
 				      bool _compress)
 	:Database(simple_db_plugin),
 	 path(std::move(_path)),
 	 path_utf8(path.ToUTF8()),
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	 compress(_compress),
 #endif
 	 cache_path(AllocatedPath::Null()),
@@ -104,7 +104,7 @@ SimpleDatabase::Configure(const config_param &param, Error &error)
 	if (path.IsNull() && error.IsDefined())
 		return false;
 
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	compress = param.GetBlockValue("compress", compress);
 #endif
 
@@ -389,7 +389,7 @@ SimpleDatabase::Save(Error &error)
 
 	OutputStream *os = &fos;
 
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	GzipOutputStream *gzip = nullptr;
 	if (compress) {
 		gzip = new GzipOutputStream(*os, error);
@@ -407,13 +407,13 @@ SimpleDatabase::Save(Error &error)
 	db_save_internal(bos, *root);
 
 	if (!bos.Flush(error)) {
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 		delete gzip;
 #endif
 		return false;
 	}
 
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	if (gzip != nullptr) {
 		bool success = gzip->Flush(error);
 		delete gzip;
@@ -484,7 +484,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri,
 	std::string name(storage_uri);
 	std::replace_if(name.begin(), name.end(), IsUnsafeChar, '_');
 
-#ifndef HAVE_ZLIB
+#ifndef ENABLE_ZLIB
 	constexpr bool compress = false;
 #endif
 	auto db = new SimpleDatabase(AllocatedPath::Build(cache_path,
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.hxx b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
index 7ba71e272..eb225b2c8 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
@@ -39,7 +39,7 @@ class SimpleDatabase : public Database {
 	AllocatedPath path;
 	std::string path_utf8;
 
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	bool compress;
 #endif
 
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index 0a31d9eac..bfcf31435 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -52,7 +52,7 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef HAVE_MAD
 	&mad_decoder_plugin,
 #endif
-#ifdef HAVE_MPG123
+#ifdef ENABLE_MPG123
 	&mpg123_decoder_plugin,
 #endif
 #ifdef HAVE_MP4V2
@@ -61,19 +61,17 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef ENABLE_VORBIS_DECODER
 	&vorbis_decoder_plugin,
 #endif
-#if defined(HAVE_FLAC)
+#ifdef ENABLE_FLAC
 	&oggflac_decoder_plugin,
-#endif
-#ifdef HAVE_FLAC
 	&flac_decoder_plugin,
 #endif
-#ifdef HAVE_OPUS
+#ifdef ENABLE_OPUS
 	&opus_decoder_plugin,
 #endif
 #ifdef ENABLE_SNDFILE
 	&sndfile_decoder_plugin,
 #endif
-#ifdef HAVE_AUDIOFILE
+#ifdef ENABLE_AUDIOFILE
 	&audiofile_decoder_plugin,
 #endif
 #ifdef ENABLE_DSD
@@ -86,10 +84,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef HAVE_MPCDEC
 	&mpcdec_decoder_plugin,
 #endif
-#ifdef HAVE_WAVPACK
+#ifdef ENABLE_WAVPACK
 	&wavpack_decoder_plugin,
 #endif
-#ifdef HAVE_MODPLUG
+#ifdef ENABLE_MODPLUG
 	&modplug_decoder_plugin,
 #endif
 #ifdef ENABLE_MIKMOD_DECODER
@@ -104,10 +102,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef ENABLE_FLUIDSYNTH
 	&fluidsynth_decoder_plugin,
 #endif
-#ifdef HAVE_ADPLUG
+#ifdef ENABLE_ADPLUG
 	&adplug_decoder_plugin,
 #endif
-#ifdef HAVE_FFMPEG
+#ifdef ENABLE_FFMPEG
 	&ffmpeg_decoder_plugin,
 #endif
 #ifdef HAVE_GME
diff --git a/src/encoder/EncoderList.cxx b/src/encoder/EncoderList.cxx
index 4bca5a4fe..f3e3ffa64 100644
--- a/src/encoder/EncoderList.cxx
+++ b/src/encoder/EncoderList.cxx
@@ -33,16 +33,16 @@
 
 const EncoderPlugin *const encoder_plugins[] = {
 	&null_encoder_plugin,
-#ifdef ENABLE_VORBIS_ENCODER
+#ifdef ENABLE_VORBISENC
 	&vorbis_encoder_plugin,
 #endif
-#ifdef HAVE_OPUS
+#ifdef ENABLE_OPUS
 	&opus_encoder_plugin,
 #endif
 #ifdef ENABLE_LAME_ENCODER
 	&lame_encoder_plugin,
 #endif
-#ifdef ENABLE_TWOLAME_ENCODER
+#ifdef ENABLE_TWOLAME
 	&twolame_encoder_plugin,
 #endif
 #ifdef ENABLE_WAVE_ENCODER
@@ -51,7 +51,7 @@ const EncoderPlugin *const encoder_plugins[] = {
 #ifdef ENABLE_FLAC_ENCODER
 	&flac_encoder_plugin,
 #endif
-#ifdef ENABLE_SHINE_ENCODER
+#ifdef ENABLE_SHINE
 	&shine_encoder_plugin,
 #endif
 	nullptr
diff --git a/src/fs/io/TextFile.cxx b/src/fs/io/TextFile.cxx
index 28d6dabcb..1710e0e89 100644
--- a/src/fs/io/TextFile.cxx
+++ b/src/fs/io/TextFile.cxx
@@ -28,14 +28,14 @@
 
 TextFile::TextFile(Path path_fs, Error &error)
 	:file_reader(new FileReader(path_fs, error)),
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	 gunzip_reader(file_reader->IsDefined()
 		       ? new AutoGunzipReader(*file_reader)
 		       : nullptr),
 #endif
 	 buffered_reader(file_reader->IsDefined()
 			 ? new BufferedReader(*
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 					      gunzip_reader
 #else
 					      file_reader
@@ -48,7 +48,7 @@ TextFile::TextFile(Path path_fs, Error &error)
 TextFile::~TextFile()
 {
 	delete buffered_reader;
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	delete gunzip_reader;
 #endif
 	delete file_reader;
diff --git a/src/fs/io/TextFile.hxx b/src/fs/io/TextFile.hxx
index 5577363e7..425797ce7 100644
--- a/src/fs/io/TextFile.hxx
+++ b/src/fs/io/TextFile.hxx
@@ -34,7 +34,7 @@ class BufferedReader;
 class TextFile {
 	FileReader *const file_reader;
 
-#ifdef HAVE_ZLIB
+#ifdef ENABLE_ZLIB
 	AutoGunzipReader *const gunzip_reader;
 #endif
 
diff --git a/src/input/Registry.cxx b/src/input/Registry.cxx
index 2b981df1c..6be3233e4 100644
--- a/src/input/Registry.cxx
+++ b/src/input/Registry.cxx
@@ -22,7 +22,7 @@
 #include "util/Macros.hxx"
 #include "plugins/FileInputPlugin.hxx"
 
-#ifdef HAVE_ALSA
+#ifdef ENABLE_ALSA
 #include "plugins/AlsaInputPlugin.hxx"
 #endif
 
@@ -34,7 +34,7 @@
 #include "plugins/CurlInputPlugin.hxx"
 #endif
 
-#ifdef HAVE_FFMPEG
+#ifdef ENABLE_FFMPEG
 #include "plugins/FfmpegInputPlugin.hxx"
 #endif
 
@@ -60,7 +60,7 @@
 
 const InputPlugin *const input_plugins[] = {
 	&input_plugin_file,
-#ifdef HAVE_ALSA
+#ifdef ENABLE_ALSA
 	&input_plugin_alsa,
 #endif
 #ifdef ENABLE_ARCHIVE
@@ -69,7 +69,7 @@ const InputPlugin *const input_plugins[] = {
 #ifdef ENABLE_CURL
 	&input_plugin_curl,
 #endif
-#ifdef HAVE_FFMPEG
+#ifdef ENABLE_FFMPEG
 	&input_plugin_ffmpeg,
 #endif
 #ifdef ENABLE_SMBCLIENT
diff --git a/src/ls.cxx b/src/ls.cxx
index 96c9f60e5..4e8fc88ab 100644
--- a/src/ls.cxx
+++ b/src/ls.cxx
@@ -41,7 +41,7 @@ static const char *remoteUrlPrefixes[] = {
 	"mmst://",
 	"mmsu://",
 #endif
-#ifdef HAVE_FFMPEG
+#ifdef ENABLE_FFMPEG
 	"gopher://",
 	"rtp://",
 	"rtsp://",
@@ -61,7 +61,7 @@ static const char *remoteUrlPrefixes[] = {
 #ifdef ENABLE_DESPOTIFY
 	"spt://",
 #endif
-#ifdef HAVE_ALSA
+#ifdef ENABLE_ALSA
 	"alsa://",
 #endif
 	NULL
diff --git a/src/neighbor/Registry.cxx b/src/neighbor/Registry.cxx
index f6d1f97b3..6f0651423 100644
--- a/src/neighbor/Registry.cxx
+++ b/src/neighbor/Registry.cxx
@@ -29,7 +29,7 @@ const NeighborPlugin *const neighbor_plugins[] = {
 #ifdef ENABLE_SMBCLIENT
 	&smbclient_neighbor_plugin,
 #endif
-#ifdef HAVE_LIBUPNP
+#ifdef ENABLE_UPNP
 	&upnp_neighbor_plugin,
 #endif
 	nullptr
diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx
index 566f6b6a8..2ce844179 100644
--- a/src/output/Registry.cxx
+++ b/src/output/Registry.cxx
@@ -54,13 +54,13 @@ const AudioOutputPlugin *const audio_output_plugins[] = {
 #ifdef ENABLE_PIPE_OUTPUT
 	&pipe_output_plugin,
 #endif
-#ifdef HAVE_ALSA
+#ifdef ENABLE_ALSA
 	&alsa_output_plugin,
 #endif
-#ifdef HAVE_ROAR
+#ifdef ENABLE_ROAR
 	&roar_output_plugin,
 #endif
-#ifdef HAVE_AO
+#ifdef ENABLE_AO
 	&ao_output_plugin,
 #endif
 #ifdef HAVE_OSS
@@ -75,10 +75,10 @@ const AudioOutputPlugin *const audio_output_plugins[] = {
 #ifdef ENABLE_SOLARIS_OUTPUT
 	&solaris_output_plugin,
 #endif
-#ifdef HAVE_PULSE
+#ifdef ENABLE_PULSE
 	&pulse_output_plugin,
 #endif
-#ifdef HAVE_JACK
+#ifdef ENABLE_JACK
 	&jack_output_plugin,
 #endif
 #ifdef ENABLE_HTTPD_OUTPUT
diff --git a/src/pcm/ConfiguredResampler.cxx b/src/pcm/ConfiguredResampler.cxx
index f6aec3f95..a65ec8702 100644
--- a/src/pcm/ConfiguredResampler.cxx
+++ b/src/pcm/ConfiguredResampler.cxx
@@ -25,11 +25,11 @@
 #include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 
-#ifdef HAVE_LIBSAMPLERATE
+#ifdef ENABLE_LIBSAMPLERATE
 #include "LibsamplerateResampler.hxx"
 #endif
 
-#ifdef HAVE_SOXR
+#ifdef ENABLE_SOXR
 #include "SoxrResampler.hxx"
 #endif
 
@@ -38,11 +38,11 @@
 enum class SelectedResampler {
 	FALLBACK,
 
-#ifdef HAVE_LIBSAMPLERATE
+#ifdef ENABLE_LIBSAMPLERATE
 	LIBSAMPLERATE,
 #endif
 
-#ifdef HAVE_SOXR
+#ifdef ENABLE_SOXR
 	SOXR,
 #endif
 };
@@ -58,14 +58,14 @@ pcm_resampler_global_init(Error &error)
 	if (strcmp(converter, "internal") == 0)
 		return true;
 
-#ifdef HAVE_SOXR
+#ifdef ENABLE_SOXR
 	if (memcmp(converter, "soxr", 4) == 0) {
 		selected_resampler = SelectedResampler::SOXR;
 		return pcm_resample_soxr_global_init(converter, error);
 	}
 #endif
 
-#ifdef HAVE_LIBSAMPLERATE
+#ifdef ENABLE_LIBSAMPLERATE
 	selected_resampler = SelectedResampler::LIBSAMPLERATE;
 	return pcm_resample_lsr_global_init(converter, error);
 #endif
@@ -86,12 +86,12 @@ pcm_resampler_create()
 	case SelectedResampler::FALLBACK:
 		return new FallbackPcmResampler();
 
-#ifdef HAVE_LIBSAMPLERATE
+#ifdef ENABLE_LIBSAMPLERATE
 	case SelectedResampler::LIBSAMPLERATE:
 		return new LibsampleratePcmResampler();
 #endif
 
-#ifdef HAVE_SOXR
+#ifdef ENABLE_SOXR
 	case SelectedResampler::SOXR:
 		return new SoxrPcmResampler();
 #endif
diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx
index 4e9ef890e..aed8e1567 100644
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
@@ -49,7 +49,7 @@ const struct playlist_plugin *const playlist_plugins[] = {
 	// TODO: enable without GLib
 	&pls_playlist_plugin,
 #endif
-#ifdef HAVE_EXPAT
+#ifdef ENABLE_EXPAT
 	&xspf_playlist_plugin,
 	&asx_playlist_plugin,
 	&rss_playlist_plugin,
diff --git a/src/system/fd_util.h b/src/system/fd_util.h
index f4a940e91..6d6fe1e69 100644
--- a/src/system/fd_util.h
+++ b/src/system/fd_util.h
@@ -103,7 +103,7 @@ socketpair_cloexec_nonblock(int domain, int type, int protocol, int sv[2]);
 
 #endif
 
-#ifdef HAVE_LIBMPDCLIENT
+#ifdef ENABLE_LIBMPDCLIENT
 /* Avoid symbol conflict with statically linked libmpdclient */
 #define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict
 #endif
diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index 07f342319..a4d3e6407 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -44,7 +44,7 @@ using std::endl;
 
 #include <stdlib.h>
 
-#ifdef HAVE_LIBUPNP
+#ifdef ENABLE_UPNP
 #include "input/InputStream.hxx"
 size_t
 InputStream::LockRead(void *, size_t, Error &)