configure.ac: add macro MPD_ENABLE_AUTO_PKG

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 \

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])])
+])

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

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

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,

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
 

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

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

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;

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
 

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

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

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

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

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

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,

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

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 &)