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

configure.ac: add macro MPD_ENABLE_AUTO_PKG 

Simplify the definition of many build options.
This commit is contained in:
Max Kellermann 2014-11-21 22:19:57 +01:00
parent b3f5f2f75f
commit b3f5b4932c
19 changed files with 174 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Makefile.am
View File

@ -492,12 +492,12 @@ libpcm_a_SOURCES = \
src/pcm/PcmUtils.hxx src/pcm/PcmUtils.hxx
libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \ libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(SOXR_CFLAGS) \ $(SOXR_CFLAGS) \
$(SAMPLERATE_CFLAGS) $(LIBSAMPLERATE_CFLAGS)
PCM_LIBS = \ PCM_LIBS = \
libpcm.a \ libpcm.a \
$(SOXR_LIBS) \ $(SOXR_LIBS) \
$(SAMPLERATE_LIBS) $(LIBSAMPLERATE_LIBS)
if ENABLE_DSD if ENABLE_DSD
libpcm_a_SOURCES += \ libpcm_a_SOURCES += \
@ -505,12 +505,12 @@ libpcm_a_SOURCES += \
src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h
endif endif
if HAVE_LIBSAMPLERATE if ENABLE_LIBSAMPLERATE
libpcm_a_SOURCES += \ libpcm_a_SOURCES += \
src/pcm/LibsamplerateResampler.cxx src/pcm/LibsamplerateResampler.hxx src/pcm/LibsamplerateResampler.cxx src/pcm/LibsamplerateResampler.hxx
endif endif
if HAVE_SOXR if ENABLE_SOXR
libpcm_a_SOURCES += \ libpcm_a_SOURCES += \
src/pcm/SoxrResampler.cxx src/pcm/SoxrResampler.hxx src/pcm/SoxrResampler.cxx src/pcm/SoxrResampler.hxx
endif endif
@ -542,7 +542,7 @@ libfs_a_SOURCES = \
src/fs/DirectoryReader.hxx src/fs/DirectoryReader.hxx
libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
if HAVE_ZLIB if ENABLE_ZLIB
libfs_a_SOURCES += \ libfs_a_SOURCES += \
src/lib/zlib/Domain.cxx src/lib/zlib/Domain.hxx \ src/lib/zlib/Domain.cxx src/lib/zlib/Domain.hxx \
src/fs/io/GunzipReader.cxx src/fs/io/GunzipReader.hxx \ src/fs/io/GunzipReader.cxx src/fs/io/GunzipReader.hxx \
@ -638,7 +638,7 @@ NEIGHBOR_LIBS = \
$(SMBCLIENT_LIBS) \ $(SMBCLIENT_LIBS) \
libneighbor.a libneighbor.a
if HAVE_LIBUPNP if ENABLE_UPNP
libneighbor_a_SOURCES += \ libneighbor_a_SOURCES += \
$(UPNP_SOURCES) \ $(UPNP_SOURCES) \
src/neighbor/plugins/UpnpNeighborPlugin.cxx src/neighbor/plugins/UpnpNeighborPlugin.hxx 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.cxx \
src/db/plugins/simple/SimpleDatabasePlugin.hxx src/db/plugins/simple/SimpleDatabasePlugin.hxx
if HAVE_LIBMPDCLIENT if ENABLE_LIBMPDCLIENT
libdb_plugins_a_SOURCES += \ libdb_plugins_a_SOURCES += \
src/db/plugins/ProxyDatabasePlugin.cxx src/db/plugins/ProxyDatabasePlugin.hxx src/db/plugins/ProxyDatabasePlugin.cxx src/db/plugins/ProxyDatabasePlugin.hxx
endif endif
@ -686,7 +686,7 @@ DB_LIBS = \
libdb_plugins.a \ libdb_plugins.a \
$(LIBMPDCLIENT_LIBS) $(LIBMPDCLIENT_LIBS)
if HAVE_LIBUPNP if ENABLE_UPNP
libdb_plugins_a_SOURCES += \ libdb_plugins_a_SOURCES += \
$(UPNP_SOURCES) \ $(UPNP_SOURCES) \
src/db/plugins/upnp/UpnpDatabasePlugin.cxx src/db/plugins/upnp/UpnpDatabasePlugin.hxx \ src/db/plugins/upnp/UpnpDatabasePlugin.cxx src/db/plugins/upnp/UpnpDatabasePlugin.hxx \
@ -735,7 +735,7 @@ libarchive_a_SOURCES += \
src/archive/plugins/Bzip2ArchivePlugin.hxx src/archive/plugins/Bzip2ArchivePlugin.hxx
endif endif
if HAVE_ZZIP if ENABLE_ZZIP
libarchive_a_SOURCES += \ libarchive_a_SOURCES += \
src/archive/plugins/ZzipArchivePlugin.cxx \ src/archive/plugins/ZzipArchivePlugin.cxx \
src/archive/plugins/ZzipArchivePlugin.hxx src/archive/plugins/ZzipArchivePlugin.hxx
@ -802,7 +802,7 @@ endif
# ffmpeg # ffmpeg
if HAVE_FFMPEG if ENABLE_FFMPEG
noinst_LIBRARIES += libffmpeg.a noinst_LIBRARIES += libffmpeg.a
libffmpeg_a_SOURCES = \ libffmpeg_a_SOURCES = \
src/lib/ffmpeg/Error.cxx src/lib/ffmpeg/Error.hxx \ src/lib/ffmpeg/Error.cxx src/lib/ffmpeg/Error.hxx \
@ -876,7 +876,7 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/MadDecoderPlugin.hxx src/decoder/plugins/MadDecoderPlugin.hxx
endif endif
if HAVE_MPG123 if ENABLE_MPG123
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/Mpg123DecoderPlugin.cxx \ src/decoder/plugins/Mpg123DecoderPlugin.cxx \
src/decoder/plugins/Mpg123DecoderPlugin.hxx src/decoder/plugins/Mpg123DecoderPlugin.hxx
@ -888,7 +888,7 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/MpcdecDecoderPlugin.hxx src/decoder/plugins/MpcdecDecoderPlugin.hxx
endif endif
if HAVE_OPUS if ENABLE_OPUS
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/OggUtil.cxx \ src/decoder/plugins/OggUtil.cxx \
src/decoder/plugins/OggUtil.hxx \ src/decoder/plugins/OggUtil.hxx \
@ -904,13 +904,13 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/OpusDecoderPlugin.h src/decoder/plugins/OpusDecoderPlugin.h
endif endif
if HAVE_WAVPACK if ENABLE_WAVPACK
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/WavpackDecoderPlugin.cxx \ src/decoder/plugins/WavpackDecoderPlugin.cxx \
src/decoder/plugins/WavpackDecoderPlugin.hxx src/decoder/plugins/WavpackDecoderPlugin.hxx
endif endif
if HAVE_ADPLUG if ENABLE_ADPLUG
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/AdPlugDecoderPlugin.cxx \ src/decoder/plugins/AdPlugDecoderPlugin.cxx \
src/decoder/plugins/AdPlugDecoderPlugin.h src/decoder/plugins/AdPlugDecoderPlugin.h
@ -934,7 +934,7 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/VorbisDecoderPlugin.cxx src/decoder/plugins/VorbisDecoderPlugin.h src/decoder/plugins/VorbisDecoderPlugin.cxx src/decoder/plugins/VorbisDecoderPlugin.h
endif endif
if HAVE_FLAC if ENABLE_FLAC
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/FlacInput.cxx src/decoder/plugins/FlacInput.hxx \ src/decoder/plugins/FlacInput.cxx src/decoder/plugins/FlacInput.hxx \
src/decoder/plugins/FlacIOHandle.cxx src/decoder/plugins/FlacIOHandle.hxx \ src/decoder/plugins/FlacIOHandle.cxx src/decoder/plugins/FlacIOHandle.hxx \
@ -946,7 +946,7 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/FlacDecoderPlugin.h src/decoder/plugins/FlacDecoderPlugin.h
endif endif
if HAVE_AUDIOFILE if ENABLE_AUDIOFILE
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/AudiofileDecoderPlugin.cxx \ src/decoder/plugins/AudiofileDecoderPlugin.cxx \
src/decoder/plugins/AudiofileDecoderPlugin.hxx src/decoder/plugins/AudiofileDecoderPlugin.hxx
@ -958,7 +958,7 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/MikmodDecoderPlugin.hxx src/decoder/plugins/MikmodDecoderPlugin.hxx
endif endif
if HAVE_MODPLUG if ENABLE_MODPLUG
libmodplug_decoder_plugin_a_SOURCES = \ libmodplug_decoder_plugin_a_SOURCES = \
src/decoder/plugins/ModplugDecoderPlugin.cxx \ src/decoder/plugins/ModplugDecoderPlugin.cxx \
src/decoder/plugins/ModplugDecoderPlugin.hxx src/decoder/plugins/ModplugDecoderPlugin.hxx
@ -992,7 +992,7 @@ libdecoder_a_SOURCES += \
src/decoder/plugins/WildmidiDecoderPlugin.hxx src/decoder/plugins/WildmidiDecoderPlugin.hxx
endif endif
if HAVE_FFMPEG if ENABLE_FFMPEG
libdecoder_a_SOURCES += \ libdecoder_a_SOURCES += \
src/decoder/plugins/FfmpegMetaData.cxx \ src/decoder/plugins/FfmpegMetaData.cxx \
src/decoder/plugins/FfmpegMetaData.hxx \ src/decoder/plugins/FfmpegMetaData.hxx \
@ -1055,13 +1055,13 @@ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/WaveEncoderPlugin.hxx src/encoder/plugins/WaveEncoderPlugin.hxx
endif endif
if ENABLE_VORBIS_ENCODER if ENABLE_VORBISENC
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/VorbisEncoderPlugin.cxx \ src/encoder/plugins/VorbisEncoderPlugin.cxx \
src/encoder/plugins/VorbisEncoderPlugin.hxx src/encoder/plugins/VorbisEncoderPlugin.hxx
endif endif
if HAVE_OPUS if ENABLE_OPUS
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/OpusEncoderPlugin.cxx \ src/encoder/plugins/OpusEncoderPlugin.cxx \
src/encoder/plugins/OpusEncoderPlugin.hxx src/encoder/plugins/OpusEncoderPlugin.hxx
@ -1073,7 +1073,7 @@ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/LameEncoderPlugin.hxx src/encoder/plugins/LameEncoderPlugin.hxx
endif endif
if ENABLE_TWOLAME_ENCODER if ENABLE_TWOLAME
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/TwolameEncoderPlugin.cxx \ src/encoder/plugins/TwolameEncoderPlugin.cxx \
src/encoder/plugins/TwolameEncoderPlugin.hxx src/encoder/plugins/TwolameEncoderPlugin.hxx
@ -1085,7 +1085,7 @@ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/FlacEncoderPlugin.hxx src/encoder/plugins/FlacEncoderPlugin.hxx
endif endif
if ENABLE_SHINE_ENCODER if ENABLE_SHINE
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/plugins/ShineEncoderPlugin.cxx \ src/encoder/plugins/ShineEncoderPlugin.cxx \
src/encoder/plugins/ShineEncoderPlugin.hxx src/encoder/plugins/ShineEncoderPlugin.hxx
@ -1151,7 +1151,7 @@ INPUT_LIBS = \
$(DESPOTIFY_LIBS) \ $(DESPOTIFY_LIBS) \
$(MMS_LIBS) $(MMS_LIBS)
if HAVE_ALSA if ENABLE_ALSA
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/plugins/AlsaInputPlugin.cxx \ src/input/plugins/AlsaInputPlugin.cxx \
src/input/plugins/AlsaInputPlugin.hxx src/input/plugins/AlsaInputPlugin.hxx
@ -1184,7 +1184,7 @@ libinput_a_SOURCES += \
src/input/plugins/CdioParanoiaInputPlugin.hxx src/input/plugins/CdioParanoiaInputPlugin.hxx
endif endif
if HAVE_FFMPEG if ENABLE_FFMPEG
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/plugins/FfmpegInputPlugin.cxx src/input/plugins/FfmpegInputPlugin.hxx src/input/plugins/FfmpegInputPlugin.cxx src/input/plugins/FfmpegInputPlugin.hxx
endif endif
@ -1263,7 +1263,7 @@ libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(ALSA_CFLAGS) \ $(ALSA_CFLAGS) \
$(PULSE_CFLAGS) $(PULSE_CFLAGS)
if HAVE_ALSA if ENABLE_ALSA
liboutput_plugins_a_SOURCES += \ liboutput_plugins_a_SOURCES += \
src/output/plugins/AlsaOutputPlugin.cxx \ src/output/plugins/AlsaOutputPlugin.cxx \
src/output/plugins/AlsaOutputPlugin.hxx src/output/plugins/AlsaOutputPlugin.hxx
@ -1281,14 +1281,14 @@ liboutput_plugins_a_SOURCES += \
OUTPUT_LIBS += -lOpenSLES OUTPUT_LIBS += -lOpenSLES
endif endif
if HAVE_ROAR if ENABLE_ROAR
liboutput_plugins_a_SOURCES += \ liboutput_plugins_a_SOURCES += \
src/output/plugins/RoarOutputPlugin.cxx \ src/output/plugins/RoarOutputPlugin.cxx \
src/output/plugins/RoarOutputPlugin.hxx src/output/plugins/RoarOutputPlugin.hxx
libmixer_plugins_a_SOURCES += src/mixer/plugins/RoarMixerPlugin.cxx libmixer_plugins_a_SOURCES += src/mixer/plugins/RoarMixerPlugin.cxx
endif endif
if HAVE_AO if ENABLE_AO
liboutput_plugins_a_SOURCES += \ liboutput_plugins_a_SOURCES += \
src/output/plugins/AoOutputPlugin.cxx \ src/output/plugins/AoOutputPlugin.cxx \
src/output/plugins/AoOutputPlugin.hxx src/output/plugins/AoOutputPlugin.hxx
@ -1306,7 +1306,7 @@ liboutput_plugins_a_SOURCES += \
src/output/plugins/PipeOutputPlugin.hxx src/output/plugins/PipeOutputPlugin.hxx
endif endif
if HAVE_JACK if ENABLE_JACK
liboutput_plugins_a_SOURCES += \ liboutput_plugins_a_SOURCES += \
src/output/plugins/JackOutputPlugin.cxx \ src/output/plugins/JackOutputPlugin.cxx \
src/output/plugins/JackOutputPlugin.hxx src/output/plugins/JackOutputPlugin.hxx
@ -1331,7 +1331,7 @@ liboutput_plugins_a_SOURCES += \
src/output/plugins/OSXOutputPlugin.hxx src/output/plugins/OSXOutputPlugin.hxx
endif endif
if HAVE_PULSE if ENABLE_PULSE
liboutput_plugins_a_SOURCES += \ liboutput_plugins_a_SOURCES += \
src/output/plugins/PulseOutputPlugin.cxx \ src/output/plugins/PulseOutputPlugin.cxx \
src/output/plugins/PulseOutputPlugin.hxx src/output/plugins/PulseOutputPlugin.hxx
@ -1422,7 +1422,7 @@ libplaylist_plugins_a_SOURCES += \
PLAYLIST_LIBS += $(YAJL_LIBS) PLAYLIST_LIBS += $(YAJL_LIBS)
endif endif
if HAVE_EXPAT if ENABLE_EXPAT
libplaylist_plugins_a_SOURCES += \ libplaylist_plugins_a_SOURCES += \
src/lib/expat/ExpatParser.cxx src/lib/expat/ExpatParser.hxx \ src/lib/expat/ExpatParser.cxx src/lib/expat/ExpatParser.hxx \
src/playlist/plugins/XspfPlaylistPlugin.cxx \ src/playlist/plugins/XspfPlaylistPlugin.cxx \
@ -1542,7 +1542,7 @@ if HAVE_ID3TAG
noinst_PROGRAMS += test/dump_rva2 noinst_PROGRAMS += test/dump_rva2
endif endif
if HAVE_ALSA if ENABLE_ALSA
# this debug program is still ALSA specific # this debug program is still ALSA specific
noinst_PROGRAMS += test/read_mixer noinst_PROGRAMS += test/read_mixer
endif endif
@ -1590,7 +1590,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/TagSave.cxx \ src/TagSave.cxx \
src/SongFilter.cxx src/SongFilter.cxx
if HAVE_LIBUPNP if ENABLE_UPNP
test_DumpDatabase_SOURCES += src/lib/expat/ExpatParser.cxx test_DumpDatabase_SOURCES += src/lib/expat/ExpatParser.cxx
endif endif
@ -1647,7 +1647,7 @@ test_run_neighbor_explorer_LDADD = $(AM_LDADD) \
libthread.a \ libthread.a \
libutil.a libutil.a
if HAVE_LIBUPNP if ENABLE_UPNP
test_run_neighbor_explorer_SOURCES += src/lib/expat/ExpatParser.cxx test_run_neighbor_explorer_SOURCES += src/lib/expat/ExpatParser.cxx
endif endif
@ -1680,7 +1680,7 @@ test_visit_archive_SOURCES = test/visit_archive.cxx \
endif endif
if HAVE_ZLIB if ENABLE_ZLIB
noinst_PROGRAMS += test/run_gzip test/run_gunzip 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/AudioFormat.cxx src/CheckAudioFormat.cxx \
src/DetachedSong.cxx src/DetachedSong.cxx
if HAVE_FLAC if ENABLE_FLAC
test_dump_playlist_SOURCES += \ test_dump_playlist_SOURCES += \
src/ReplayGainInfo.cxx \ src/ReplayGainInfo.cxx \
src/decoder/plugins/FlacMetadata.cxx src/decoder/plugins/FlacMetadata.cxx
@ -1843,7 +1843,7 @@ test_run_encoder_LDADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
endif endif
if ENABLE_VORBIS_ENCODER if ENABLE_VORBISENC
noinst_PROGRAMS += test/test_vorbis_encoder noinst_PROGRAMS += test/test_vorbis_encoder
test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \ test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
test/stdbin.h \ test/stdbin.h \

440
configure.ac
View File

@ -301,83 +301,16 @@ else
database_auto=no database_auto=no
fi 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, AC_ARG_ENABLE(bzip2,
AS_HELP_STRING([--enable-bzip2], AS_HELP_STRING([--enable-bzip2],
[enable bzip2 archive support (default: auto)]),, [enable bzip2 archive support (default: auto)]),,
enable_bzip2=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, AC_ARG_ENABLE(smbclient,
AS_HELP_STRING([--enable-smbclient], AS_HELP_STRING([--enable-smbclient],
[enable support for libsmbclient (default: auto)]),, [enable support for libsmbclient (default: auto)]),,
[enable_smbclient=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 default_enable_daemon=yes
if test x$host_is_android = xyes || test x$host_is_android = xyes; then if test x$host_is_android = xyes || test x$host_is_android = xyes; then
default_enable_daemon=no default_enable_daemon=no
@ -406,26 +339,11 @@ AC_ARG_ENABLE(dsd,
[enable DSD decoder (default: enable)]),, [enable DSD decoder (default: enable)]),,
[enable_dsd=yes]) [enable_dsd=yes])
AC_ARG_ENABLE(ffmpeg,
AS_HELP_STRING([--enable-ffmpeg],
[enable FFMPEG support]),,
enable_ffmpeg=auto)
AC_ARG_ENABLE(fifo, AC_ARG_ENABLE(fifo,
AS_HELP_STRING([--disable-fifo], AS_HELP_STRING([--disable-fifo],
[disable support for writing audio to a FIFO (default: enable)]),, [disable support for writing audio to a FIFO (default: enable)]),,
enable_fifo=yes) 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, AC_ARG_ENABLE(gme,
AS_HELP_STRING([--enable-gme], AS_HELP_STRING([--enable-gme],
[enable Blargg's game music emulator plugin]),, [enable Blargg's game music emulator plugin]),,
@ -455,25 +373,8 @@ AC_ARG_ENABLE(ipv6,
[disable IPv6 support (default: enable)]),, [disable IPv6 support (default: enable)]),,
[enable_ipv6=yes]) [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_SYS_LARGEFILE
AC_ARG_ENABLE(despotify,
AS_HELP_STRING([--enable-despotify],
[enable support for despotify (default: disable)]),,
[enable_despotify=no])
AC_ARG_ENABLE(soundcloud, AC_ARG_ENABLE(soundcloud,
AS_HELP_STRING([--enable-soundcloud], AS_HELP_STRING([--enable-soundcloud],
[enable support for soundcloud.com]),, [enable support for soundcloud.com]),,
@ -488,16 +389,6 @@ AC_ARG_ENABLE([libwrap],
AS_HELP_STRING([--enable-libwrap], [use libwrap]),, AS_HELP_STRING([--enable-libwrap], [use libwrap]),,
[enable_libwrap=auto]) [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, AC_ARG_ENABLE(mad,
AS_HELP_STRING([--enable-mad], AS_HELP_STRING([--enable-mad],
[enable libmad mp3 decoder plugin]),, [enable libmad mp3 decoder plugin]),,
@ -508,16 +399,6 @@ AC_ARG_ENABLE(mikmod,
[enable the mikmod decoder (default: disable)]),, [enable the mikmod decoder (default: disable)]),,
enable_mikmod=no) 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, AC_ARG_ENABLE(mp4v2,
AS_HELP_STRING([--enable-mp4v2], AS_HELP_STRING([--enable-mp4v2],
[enable libmp4v2 decoder plugin]),, [enable libmp4v2 decoder plugin]),,
@ -528,21 +409,11 @@ AC_ARG_ENABLE(mpc,
[disable musepack (MPC) support (default: auto)]),, [disable musepack (MPC) support (default: auto)]),,
enable_mpc=auto) enable_mpc=auto)
AC_ARG_ENABLE(mpg123,
AS_HELP_STRING([--enable-mpg123],
[enable libmpg123 decoder plugin]),,
enable_mpg123=auto)
AC_ARG_ENABLE(openal, AC_ARG_ENABLE(openal,
AS_HELP_STRING([--enable-openal], AS_HELP_STRING([--enable-openal],
[enable OpenAL support (default: auto)]),, [enable OpenAL support (default: auto)]),,
enable_openal=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, AC_ARG_ENABLE(oss,
AS_HELP_STRING([--disable-oss], AS_HELP_STRING([--disable-oss],
[disable OSS support (default: enable)]),, [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 support for writing audio to a pipe (default: disable)]),,
enable_pipe_output=no) 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, AC_ARG_ENABLE(recorder-output,
AS_HELP_STRING([--enable-recorder-output], AS_HELP_STRING([--enable-recorder-output],
[enables the recorder file output plugin (default: disable)]),, [enables the recorder file output plugin (default: disable)]),,
@ -575,36 +441,16 @@ AC_ARG_ENABLE(sidplay,
MPD_DEPENDS([enable_sidplay], [enable_glib], MPD_DEPENDS([enable_sidplay], [enable_glib],
[Cannot use --enable-sidplay with --disable-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, AC_ARG_ENABLE(shout,
AS_HELP_STRING([--enable-shout], AS_HELP_STRING([--enable-shout],
[enables the shoutcast streaming output]),, [enables the shoutcast streaming output]),,
[enable_shout=auto]) [enable_shout=auto])
AC_ARG_ENABLE(sndfile,
AS_HELP_STRING([--enable-sndfile],
[enable sndfile support]),,
enable_sndfile=auto)
AC_ARG_ENABLE(solaris_output, AC_ARG_ENABLE(solaris_output,
AS_HELP_STRING([--enable-solaris-output], AS_HELP_STRING([--enable-solaris-output],
[enables the Solaris /dev/audio output]),, [enables the Solaris /dev/audio output]),,
[enable_solaris_output=$host_is_solaris]) [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, AC_ARG_ENABLE(tcp,
AS_HELP_STRING([--disable-tcp], AS_HELP_STRING([--disable-tcp],
[disable support for clients connecting via TCP (default: enable)]),, [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)]),, [use Tremor (vorbisidec) integer Ogg Vorbis decoder (with optional prefix)]),,
with_tremor=no) 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, AC_ARG_ENABLE(un,
AS_HELP_STRING([--disable-un], AS_HELP_STRING([--disable-un],
[disable support for clients connecting via unix domain sockets (default: enable)]),, [disable support for clients connecting via unix domain sockets (default: enable)]),,
@ -635,23 +476,11 @@ AC_ARG_ENABLE(vorbis,
[enable Ogg Vorbis decoder]),, [enable Ogg Vorbis decoder]),,
enable_vorbis=auto) 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, AC_ARG_ENABLE(wave-encoder,
AS_HELP_STRING([--enable-wave-encoder], AS_HELP_STRING([--enable-wave-encoder],
[enable the PCM wave encoder]),, [enable the PCM wave encoder]),,
enable_wave_encoder=yes) enable_wave_encoder=yes)
AC_ARG_ENABLE(wavpack,
AS_HELP_STRING([--enable-wavpack],
[enable WavPack support]),,
enable_wavpack=auto)
AC_ARG_ENABLE(werror, AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror], AS_HELP_STRING([--enable-werror],
[treat warnings as errors (default: disabled)]),, [treat warnings as errors (default: disabled)]),,
@ -667,12 +496,6 @@ AC_ARG_WITH(zeroconf,
[enable zeroconf backend (default=auto)]),, [enable zeroconf backend (default=auto)]),,
with_zeroconf="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, AC_ARG_WITH(tremor-libraries,
AS_HELP_STRING([--with-tremor-libraries=DIR], AS_HELP_STRING([--with-tremor-libraries=DIR],
[directory where Tremor library is installed (optional)]),, [directory where Tremor library is installed (optional)]),,
@ -788,12 +611,9 @@ if
AC_MSG_ERROR([No client interfaces configured!]) AC_MSG_ERROR([No client interfaces configured!])
fi fi
MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon, MPD_ENABLE_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
[systemd activation], [libsystemd-daemon not found]) [systemd socket activation], [libsystemd-daemon not found],
AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes) [$linux_auto])
if test x$enable_systemd_daemon = xyes; then
AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library])
fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl LIBC Features dnl LIBC Features
@ -807,22 +627,14 @@ dnl Miscellaneous Libraries
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl -------------------------------- libmpdclient -------------------------------- dnl -------------------------------- libmpdclient --------------------------------
MPD_AUTO_PKG(libmpdclient, LIBMPDCLIENT, [libmpdclient >= 2.2], MPD_ENABLE_AUTO_PKG_DEPENDS(libmpdclient, LIBMPDCLIENT,
[MPD client library], [libmpdclient not found]) [libmpdclient >= 2.2],
if test x$enable_libmpdclient = xyes; then [MPD client library], [libmpdclient not found], [],
AC_DEFINE(HAVE_LIBMPDCLIENT, 1, [Define to use libmpdclient]) [enable_database], [Cannot use --enable-libmpdclient with --disable-database])
fi
AM_CONDITIONAL(HAVE_LIBMPDCLIENT, test x$enable_libmpdclient = xyes)
dnl -------------------------------- expat -------------------------------- dnl -------------------------------- expat --------------------------------
MPD_AUTO_PKG(expat, EXPAT, [expat], MPD_ENABLE_AUTO_PKG(expat, EXPAT, [expat],
[expat XML parser], [expat not found]) [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 --------------------------------- dnl --------------------------------- inotify ---------------------------------
AC_CHECK_FUNCS(inotify_init inotify_init1) AC_CHECK_FUNCS(inotify_init inotify_init1)
@ -943,47 +755,29 @@ dnl ---------------------------------------------------------------------------
dnl ---------------------------------- sqlite --------------------------------- dnl ---------------------------------- sqlite ---------------------------------
MPD_AUTO_PKG(sqlite, SQLITE, [sqlite3], MPD_ENABLE_AUTO_PKG(sqlite, SQLITE, [sqlite3],
[SQLite database support], [sqlite not found]) [SQLite database support], [sqlite not found],
if test x$enable_sqlite = xyes; then [$database_auto])
AC_DEFINE([ENABLE_SQLITE], 1, [Define to enable sqlite database support])
fi
AM_CONDITIONAL(ENABLE_SQLITE, test x$enable_sqlite = xyes)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Converter Plugins dnl Converter Plugins
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl ------------------------------ libsamplerate ------------------------------ 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]) [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 ------------------------------------ dnl ------------------------------ libsoxr ------------------------------------
MPD_AUTO_PKG(soxr, SOXR, [soxr], MPD_ENABLE_AUTO_PKG(soxr, SOXR, [soxr],
[libsoxr resampler], [libsoxr not found]) [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 ---------------------------------------------------------------------------
dnl Input Plugins dnl Input Plugins
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl ----------------------------------- CURL ---------------------------------- 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]) [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 ----------------------------- dnl ----------------------------------- smbclient -----------------------------
MPD_AUTO_PKG_LIB(smbclient, SMBCLIENT, [smbclient >= 0.2], MPD_AUTO_PKG_LIB(smbclient, SMBCLIENT, [smbclient >= 0.2],
@ -995,20 +789,12 @@ fi
AM_CONDITIONAL(ENABLE_SMBCLIENT, test x$enable_smbclient = xyes) AM_CONDITIONAL(ENABLE_SMBCLIENT, test x$enable_smbclient = xyes)
dnl ----------------------------------- NFS ----------------------------- dnl ----------------------------------- NFS -----------------------------
MPD_AUTO_PKG(nfs, NFS, [libnfs], MPD_ENABLE_AUTO_PKG(nfs, NFS, [libnfs],
[NFS input plugin], [libnfs not found]) [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 --------------------------------- dnl --------------------------------- Despotify ---------------------------------
MPD_AUTO_PKG(despotify, DESPOTIFY, [despotify], MPD_ENABLE_AUTO_PKG(despotify, DESPOTIFY, [despotify],
[Despotify support], [despotify not found]) [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 ------------------------------ dnl --------------------------------- Soundcloud ------------------------------
if test x$enable_soundcloud != xno; then if test x$enable_soundcloud != xno; then
@ -1026,24 +812,15 @@ AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes)
AC_SUBST(YAJL_LIBS) AC_SUBST(YAJL_LIBS)
dnl ---------------------------------- cdio --------------------------------- dnl ---------------------------------- cdio ---------------------------------
MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia], MPD_ENABLE_AUTO_PKG_DEPENDS(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
[libcdio_paranoia audio CD library], [libcdio_paranoia not found]) [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 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) AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
fi fi
AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes) MPD_ENABLE_AUTO_PKG(mms, MMS, [libmms >= 0.4],
dnl ---------------------------------- libmms ---------------------------------
MPD_AUTO_PKG(mms, MMS, [libmms >= 0.4],
[libmms mms:// protocol support], [libmms not found]) [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 ---------------------------------------------------------------------------
dnl Neighbor Plugins dnl Neighbor Plugins
@ -1074,8 +851,8 @@ dnl Archive Plugins
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl --------------------------------- iso9660 --------------------------------- dnl --------------------------------- iso9660 ---------------------------------
MPD_AUTO_PKG(iso9660, ISO9660, [libiso9660], MPD_ENABLE_AUTO_PKG(iso9660, ISO9660, [libiso9660],
[libiso9660 archive library], [libiso9660 not found]) [libiso9660 archive plugin], [libiso9660 not found])
AM_CONDITIONAL(HAVE_ISO9660, test x$enable_iso9660 = xyes) AM_CONDITIONAL(HAVE_ISO9660, test x$enable_iso9660 = xyes)
if test x$enable_iso9660 = xyes; then if test x$enable_iso9660 = xyes; then
@ -1090,14 +867,9 @@ AM_CONDITIONAL(ENABLE_ISO9660_TEST, test x$MKISOFS != xno)
dnl ---------------------------------- zlib --------------------------------- dnl ---------------------------------- zlib ---------------------------------
MPD_AUTO_PKG(zlib, ZLIB, [zlib], MPD_ENABLE_AUTO_PKG(zlib, ZLIB, [zlib],
[zlib support], [zlib not found]) [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 --------------------------------- dnl ---------------------------------- libbz2 ---------------------------------
MPD_AUTO_LIB(bzip2, BZ2, bz2, BZ2_bzDecompressInit, [-lbz2], [], MPD_AUTO_LIB(bzip2, BZ2, bz2, BZ2_bzDecompressInit, [-lbz2], [],
@ -1125,21 +897,16 @@ if test x$enable_expat = xno; then
fi fi
fi fi
MPD_AUTO_PKG(upnp, UPNP, [libupnp], MPD_ENABLE_AUTO_PKG_DEPENDS(upnp, UPNP, [libupnp],
[UPnP client support], [libupnp not found]) [UPnP client support], [libupnp not found], [],
if test x$enable_upnp = xyes; then [enable_database], [Cannot use --enable-upnp with --disable-database])
AC_DEFINE(HAVE_LIBUPNP, 1, [Define when libupnp is used])
fi
AM_CONDITIONAL(HAVE_LIBUPNP, test x$enable_upnp = xyes)
dnl --------------------------------- libzzip --------------------------------- dnl --------------------------------- libzzip ---------------------------------
MPD_AUTO_PKG(zzip, ZZIP, [zziplib >= 0.13], MPD_ENABLE_AUTO_PKG(zzip, ZZIP, [zziplib >= 0.13],
[libzzip archive library], [libzzip not found]) [libzzip archive library], [libzzip not found],
[no])
AM_CONDITIONAL(HAVE_ZZIP, test x$enable_zzip = xyes)
if test x$enable_zzip = xyes; then if test x$enable_zzip = xyes; then
AC_DEFINE(HAVE_ZZIP, 1, [Define to have zip archive support])
AC_PATH_PROG(ZIP, zip, no) AC_PATH_PROG(ZIP, zip, no)
else else
ZIP="no" ZIP="no"
@ -1165,20 +932,12 @@ dnl Decoder Plugins
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl -------------------------------- libadplug -------------------------------- dnl -------------------------------- libadplug --------------------------------
MPD_AUTO_PKG(adplug, ADPLUG, [adplug], MPD_ENABLE_AUTO_PKG(adplug, ADPLUG, [adplug],
[AdPlug decoder plugin], [libadplug not found]) [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 -------------------------------- 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]) [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 ----------------------------------- dnl ----------------------------------- DSD -----------------------------------
@ -1194,38 +953,21 @@ AM_PATH_FAAD()
AM_CONDITIONAL(HAVE_FAAD, test x$enable_aac = xyes) AM_CONDITIONAL(HAVE_FAAD, test x$enable_aac = xyes)
dnl ---------------------------------- ffmpeg --------------------------------- 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]) [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 ---------------------------------- dnl ----------------------------------- FLAC ----------------------------------
MPD_AUTO_PKG(flac, FLAC, [flac >= 1.2], MPD_ENABLE_AUTO_PKG(flac, FLAC, [flac >= 1.2],
[FLAC decoder], [libFLAC not found]) [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 enable_flac_encoder=$enable_flac
dnl -------------------------------- FluidSynth ------------------------------- dnl -------------------------------- FluidSynth -------------------------------
MPD_AUTO_PKG(fluidsynth, FLUIDSYNTH, [fluidsynth >= 1.1], MPD_ENABLE_AUTO_PKG(fluidsynth, FLUIDSYNTH, [fluidsynth >= 1.1],
[fluidsynth decoder], [fluidsynth not found]) [fluidsynth MIDI decoder plugin], [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)
dnl ---------------------------------- libgme --------------------------------- dnl ---------------------------------- libgme ---------------------------------
MPD_AUTO_PKG_LIB(gme, GME, [libgme], gme, gme_open_file, [-lgme -lstdc++], [], 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 fi
dnl -------------------------------- libmpg123 -------------------------------- dnl -------------------------------- libmpg123 --------------------------------
MPD_AUTO_PKG(mpg123, MPG123, [libmpg123], MPD_ENABLE_AUTO_PKG(mpg123, MPG123, [libmpg123],
[libmpg123 decoder plugin], [libmpg123 not found]) [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 -------------------------------- dnl -------------------------------- libmikmod --------------------------------
if test x$enable_mikmod = xyes; then if test x$enable_mikmod = xyes; then
@ -1274,14 +1012,9 @@ fi
AM_CONDITIONAL(ENABLE_MIKMOD_DECODER, test x$enable_mikmod = xyes) AM_CONDITIONAL(ENABLE_MIKMOD_DECODER, test x$enable_mikmod = xyes)
dnl -------------------------------- libmodplug ------------------------------- dnl -------------------------------- libmodplug -------------------------------
MPD_AUTO_PKG(modplug, MODPLUG, [libmodplug], MPD_ENABLE_AUTO_PKG(modplug, MODPLUG, [libmodplug],
[modplug decoder plugin], [libmodplug not found]) [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 --------------------------------- dnl -------------------------------- libmp4v2 ---------------------------------
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
MPD_AUTO_LIB(mp4v2, MP4V2, mp4v2, MP4Create, [-lmp4v2], [], MPD_AUTO_LIB(mp4v2, MP4V2, mp4v2, MP4Create, [-lmp4v2], [],
@ -1301,23 +1034,14 @@ fi
AM_CONDITIONAL(HAVE_MP4V2, test x$enable_mp4v2 = xyes) AM_CONDITIONAL(HAVE_MP4V2, test x$enable_mp4v2 = xyes)
dnl -------------------------------- libopus ---------------------------------- dnl -------------------------------- libopus ----------------------------------
MPD_AUTO_PKG(opus, OPUS, [opus ogg], MPD_ENABLE_AUTO_PKG(opus, OPUS, [opus ogg],
[opus decoder plugin], [libopus not found]) [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 -------------------------------- libsndfile -------------------------------
dnl See above test, which may disable this. 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]) [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 -------------------------------- dnl --------------------------------- musepack --------------------------------
MPD_AUTO_LIB(mpc, MPCDEC, mpcdec, mpc_demux_init, [-lmpcdec], [], MPD_AUTO_LIB(mpc, MPCDEC, mpcdec, mpc_demux_init, [-lmpcdec], [],
@ -1423,12 +1147,8 @@ fi
AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes) AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes)
dnl --------------------------------- wavpack --------------------------------- dnl --------------------------------- wavpack ---------------------------------
MPD_AUTO_PKG(wavpack, WAVPACK, [wavpack], MPD_ENABLE_AUTO_PKG(wavpack, WAVPACK, [wavpack],
[WavPack decoder plugin], [libwavpack not found]) [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 -------------------------------- dnl --------------------------------- WildMidi --------------------------------
MPD_AUTO_LIB(wildmidi, WILDMIDI, WildMidi, WildMidi_Init, [-lWildMidi], [], 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 ------------------------------ 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]) [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 --------------------------- dnl ---------------------------- Ogg Vorbis Encoder ---------------------------
MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg], MPD_ENABLE_AUTO_PKG_DEPENDS(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg],
[Ogg Vorbis encoder], [libvorbisenc not found]) [Ogg Vorbis encoder], [libvorbisenc not found], [],
[enable_glib], [Cannot use --enable-vorbis-encoder with --disable-glib])
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)
dnl ------------------------------- LAME Encoder ------------------------------ dnl ------------------------------- LAME Encoder ------------------------------
@ -1510,14 +1219,8 @@ fi
AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame_encoder = xyes) AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame_encoder = xyes)
dnl ----------------------------- TwoLAME Encoder ----------------------------- dnl ----------------------------- TwoLAME Encoder -----------------------------
MPD_AUTO_PKG(twolame_encoder, TWOLAME, [twolame], MPD_ENABLE_AUTO_PKG(twolame_encoder, TWOLAME, [twolame],
[TwoLAME encoder], [libtwolame not found]) [TwoLAME encoder plugin], [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)
dnl ------------------------------- WAVE Encoder ------------------------------ dnl ------------------------------- WAVE Encoder ------------------------------
AM_CONDITIONAL(ENABLE_WAVE_ENCODER, test x$enable_wave_encoder = xyes) AM_CONDITIONAL(ENABLE_WAVE_ENCODER, test x$enable_wave_encoder = xyes)
@ -1557,24 +1260,13 @@ dnl Audio Output Plugins
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl ----------------------------------- ALSA ---------------------------------- dnl ----------------------------------- ALSA ----------------------------------
MPD_AUTO_PKG(alsa, ALSA, [alsa >= 0.9.0], MPD_ENABLE_AUTO_PKG(alsa, ALSA, [alsa >= 0.9.0],
[ALSA output plugin], [libasound not found]) [ALSA output plugin], [libasound not found],
[$linux_auto])
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)
dnl ----------------------------------- ROAR ---------------------------------- dnl ----------------------------------- ROAR ----------------------------------
MPD_AUTO_PKG(roar, ROAR, [libroar >= 0.4.0], MPD_ENABLE_AUTO_PKG(roar, ROAR, [libroar >= 0.4.0],
[ROAR output plugin], [libroar not found]) [RoarAudio 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)
dnl ----------------------------------- FIFO ---------------------------------- dnl ----------------------------------- FIFO ----------------------------------
if test x$enable_fifo = xyes; then if test x$enable_fifo = xyes; then
@ -1604,11 +1296,9 @@ fi
AM_CONDITIONAL(ENABLE_HTTPD_OUTPUT, test x$enable_httpd_output = xyes) AM_CONDITIONAL(ENABLE_HTTPD_OUTPUT, test x$enable_httpd_output = xyes)
dnl ----------------------------------- JACK ---------------------------------- dnl ----------------------------------- JACK ----------------------------------
MPD_AUTO_PKG(jack, JACK, [jack >= 0.100], MPD_ENABLE_AUTO_PKG_DEPENDS(jack, JACK, [jack >= 0.100],
[JACK output plugin], [libjack not found]) [JACK output plugin], [libjack not found], [],
if test x$enable_jack = xyes; then [enable_glib], [Cannot use --enable-jack with --disable-glib])
AC_DEFINE([HAVE_JACK], 1, [Define to enable JACK support])
fi
if test x$enable_jack = xyes; then if test x$enable_jack = xyes; then
# check whether jack_set_info_function() is available # check whether jack_set_info_function() is available
@ -1620,16 +1310,10 @@ if test x$enable_jack = xyes; then
LIBS=$old_LIBS LIBS=$old_LIBS
fi fi
AM_CONDITIONAL(HAVE_JACK, test x$enable_jack = xyes)
dnl ---------------------------------- libao ---------------------------------- dnl ---------------------------------- libao ----------------------------------
MPD_AUTO_PKG(ao, AO, [ao], MPD_ENABLE_AUTO_PKG_DEPENDS(ao, AO, [ao],
[libao output plugin], [libao not found]) [libao output plugin], [libao not found], [],
if test x$enable_ao = xyes; then [enable_glib], [Cannot use --enable-ao with --disable-glib])
AC_DEFINE(HAVE_AO, 1, [Define to play with ao])
fi
AM_CONDITIONAL(HAVE_AO, test x$enable_ao = xyes)
dnl ---------------------------------- OpenAL --------------------------------- dnl ---------------------------------- OpenAL ---------------------------------
AC_SUBST(OPENAL_CFLAGS,"") AC_SUBST(OPENAL_CFLAGS,"")
@ -1683,14 +1367,8 @@ fi
AM_CONDITIONAL(ENABLE_PIPE_OUTPUT, test x$enable_pipe_output = xyes) AM_CONDITIONAL(ENABLE_PIPE_OUTPUT, test x$enable_pipe_output = xyes)
dnl -------------------------------- PulseAudio ------------------------------- 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]) [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 -------------------------------- dnl --------------------------------- Recorder --------------------------------
if test x$enable_recorder_output = xauto; then if test x$enable_recorder_output = xauto; then

27
m4/mpd_auto.m4
View File

@ -77,3 +77,30 @@ AC_DEFUN([MPD_AUTO_LIB], [
MPD_AUTO_RESULT([$1], [$7], [$8]) 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])])
])

2
src/archive/ArchiveList.cxx
View File

@ -32,7 +32,7 @@ const ArchivePlugin *const archive_plugins[] = {
#ifdef HAVE_BZ2 #ifdef HAVE_BZ2
&bz2_archive_plugin, &bz2_archive_plugin,
#endif #endif
#ifdef HAVE_ZZIP #ifdef ENABLE_ZZIP
&zzip_archive_plugin, &zzip_archive_plugin,
#endif #endif
#ifdef HAVE_ISO9660 #ifdef HAVE_ISO9660

4
src/db/Registry.cxx
View File

@ -28,10 +28,10 @@
const DatabasePlugin *const database_plugins[] = { const DatabasePlugin *const database_plugins[] = {
&simple_db_plugin, &simple_db_plugin,
#ifdef HAVE_LIBMPDCLIENT #ifdef ENABLE_LIBMPDCLIENT
&proxy_db_plugin, &proxy_db_plugin,
#endif #endif
#ifdef HAVE_LIBUPNP #ifdef ENABLE_UPNP
&upnp_db_plugin, &upnp_db_plugin,
#endif #endif
nullptr nullptr

18
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@ -41,7 +41,7 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
#include "fs/io/GzipOutputStream.hxx" #include "fs/io/GzipOutputStream.hxx"
#endif #endif
@ -52,21 +52,21 @@ static constexpr Domain simple_db_domain("simple_db");
inline SimpleDatabase::SimpleDatabase() inline SimpleDatabase::SimpleDatabase()
:Database(simple_db_plugin), :Database(simple_db_plugin),
path(AllocatedPath::Null()), path(AllocatedPath::Null()),
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
compress(true), compress(true),
#endif #endif
cache_path(AllocatedPath::Null()), cache_path(AllocatedPath::Null()),
prefixed_light_song(nullptr) {} prefixed_light_song(nullptr) {}
inline SimpleDatabase::SimpleDatabase(AllocatedPath &&_path, inline SimpleDatabase::SimpleDatabase(AllocatedPath &&_path,
#ifndef HAVE_ZLIB #ifndef ENABLE_ZLIB
gcc_unused gcc_unused
#endif #endif
bool _compress) bool _compress)
:Database(simple_db_plugin), :Database(simple_db_plugin),
path(std::move(_path)), path(std::move(_path)),
path_utf8(path.ToUTF8()), path_utf8(path.ToUTF8()),
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
compress(_compress), compress(_compress),
#endif #endif
cache_path(AllocatedPath::Null()), cache_path(AllocatedPath::Null()),
@ -104,7 +104,7 @@ SimpleDatabase::Configure(const config_param &param, Error &error)
if (path.IsNull() && error.IsDefined()) if (path.IsNull() && error.IsDefined())
return false; return false;
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
compress = param.GetBlockValue("compress", compress); compress = param.GetBlockValue("compress", compress);
#endif #endif
@ -389,7 +389,7 @@ SimpleDatabase::Save(Error &error)
OutputStream *os = &fos; OutputStream *os = &fos;
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
GzipOutputStream *gzip = nullptr; GzipOutputStream *gzip = nullptr;
if (compress) { if (compress) {
gzip = new GzipOutputStream(*os, error); gzip = new GzipOutputStream(*os, error);
@ -407,13 +407,13 @@ SimpleDatabase::Save(Error &error)
db_save_internal(bos, *root); db_save_internal(bos, *root);
if (!bos.Flush(error)) { if (!bos.Flush(error)) {
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
delete gzip; delete gzip;
#endif #endif
return false; return false;
} }
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
if (gzip != nullptr) { if (gzip != nullptr) {
bool success = gzip->Flush(error); bool success = gzip->Flush(error);
delete gzip; delete gzip;
@ -484,7 +484,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri,
std::string name(storage_uri); std::string name(storage_uri);
std::replace_if(name.begin(), name.end(), IsUnsafeChar, '_'); std::replace_if(name.begin(), name.end(), IsUnsafeChar, '_');
#ifndef HAVE_ZLIB #ifndef ENABLE_ZLIB
constexpr bool compress = false; constexpr bool compress = false;
#endif #endif
auto db = new SimpleDatabase(AllocatedPath::Build(cache_path, auto db = new SimpleDatabase(AllocatedPath::Build(cache_path,

2
src/db/plugins/simple/SimpleDatabasePlugin.hxx
View File

@ -39,7 +39,7 @@ class SimpleDatabase : public Database {
AllocatedPath path; AllocatedPath path;
std::string path_utf8; std::string path_utf8;
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
bool compress; bool compress;
#endif #endif

18
src/decoder/DecoderList.cxx
View File

@ -52,7 +52,7 @@ const struct DecoderPlugin *const decoder_plugins[] = {
#ifdef HAVE_MAD #ifdef HAVE_MAD
&mad_decoder_plugin, &mad_decoder_plugin,
#endif #endif
#ifdef HAVE_MPG123 #ifdef ENABLE_MPG123
&mpg123_decoder_plugin, &mpg123_decoder_plugin,
#endif #endif
#ifdef HAVE_MP4V2 #ifdef HAVE_MP4V2
@ -61,19 +61,17 @@ const struct DecoderPlugin *const decoder_plugins[] = {
#ifdef ENABLE_VORBIS_DECODER #ifdef ENABLE_VORBIS_DECODER
&vorbis_decoder_plugin, &vorbis_decoder_plugin,
#endif #endif
#if defined(HAVE_FLAC) #ifdef ENABLE_FLAC
&oggflac_decoder_plugin, &oggflac_decoder_plugin,
#endif
#ifdef HAVE_FLAC
&flac_decoder_plugin, &flac_decoder_plugin,
#endif #endif
#ifdef HAVE_OPUS #ifdef ENABLE_OPUS
&opus_decoder_plugin, &opus_decoder_plugin,
#endif #endif
#ifdef ENABLE_SNDFILE #ifdef ENABLE_SNDFILE
&sndfile_decoder_plugin, &sndfile_decoder_plugin,
#endif #endif
#ifdef HAVE_AUDIOFILE #ifdef ENABLE_AUDIOFILE
&audiofile_decoder_plugin, &audiofile_decoder_plugin,
#endif #endif
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
@ -86,10 +84,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
#ifdef HAVE_MPCDEC #ifdef HAVE_MPCDEC
&mpcdec_decoder_plugin, &mpcdec_decoder_plugin,
#endif #endif
#ifdef HAVE_WAVPACK #ifdef ENABLE_WAVPACK
&wavpack_decoder_plugin, &wavpack_decoder_plugin,
#endif #endif
#ifdef HAVE_MODPLUG #ifdef ENABLE_MODPLUG
&modplug_decoder_plugin, &modplug_decoder_plugin,
#endif #endif
#ifdef ENABLE_MIKMOD_DECODER #ifdef ENABLE_MIKMOD_DECODER
@ -104,10 +102,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
#ifdef ENABLE_FLUIDSYNTH #ifdef ENABLE_FLUIDSYNTH
&fluidsynth_decoder_plugin, &fluidsynth_decoder_plugin,
#endif #endif
#ifdef HAVE_ADPLUG #ifdef ENABLE_ADPLUG
&adplug_decoder_plugin, &adplug_decoder_plugin,
#endif #endif
#ifdef HAVE_FFMPEG #ifdef ENABLE_FFMPEG
&ffmpeg_decoder_plugin, &ffmpeg_decoder_plugin,
#endif #endif
#ifdef HAVE_GME #ifdef HAVE_GME

8
src/encoder/EncoderList.cxx
View File

@ -33,16 +33,16 @@
const EncoderPlugin *const encoder_plugins[] = { const EncoderPlugin *const encoder_plugins[] = {
&null_encoder_plugin, &null_encoder_plugin,
#ifdef ENABLE_VORBIS_ENCODER #ifdef ENABLE_VORBISENC
&vorbis_encoder_plugin, &vorbis_encoder_plugin,
#endif #endif
#ifdef HAVE_OPUS #ifdef ENABLE_OPUS
&opus_encoder_plugin, &opus_encoder_plugin,
#endif #endif
#ifdef ENABLE_LAME_ENCODER #ifdef ENABLE_LAME_ENCODER
&lame_encoder_plugin, &lame_encoder_plugin,
#endif #endif
#ifdef ENABLE_TWOLAME_ENCODER #ifdef ENABLE_TWOLAME
&twolame_encoder_plugin, &twolame_encoder_plugin,
#endif #endif
#ifdef ENABLE_WAVE_ENCODER #ifdef ENABLE_WAVE_ENCODER
@ -51,7 +51,7 @@ const EncoderPlugin *const encoder_plugins[] = {
#ifdef ENABLE_FLAC_ENCODER #ifdef ENABLE_FLAC_ENCODER
&flac_encoder_plugin, &flac_encoder_plugin,
#endif #endif
#ifdef ENABLE_SHINE_ENCODER #ifdef ENABLE_SHINE
&shine_encoder_plugin, &shine_encoder_plugin,
#endif #endif
nullptr nullptr

6
src/fs/io/TextFile.cxx
View File

@ -28,14 +28,14 @@
TextFile::TextFile(Path path_fs, Error &error) TextFile::TextFile(Path path_fs, Error &error)
:file_reader(new FileReader(path_fs, error)), :file_reader(new FileReader(path_fs, error)),
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
gunzip_reader(file_reader->IsDefined() gunzip_reader(file_reader->IsDefined()
? new AutoGunzipReader(*file_reader) ? new AutoGunzipReader(*file_reader)
: nullptr), : nullptr),
#endif #endif
buffered_reader(file_reader->IsDefined() buffered_reader(file_reader->IsDefined()
? new BufferedReader(* ? new BufferedReader(*
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
gunzip_reader gunzip_reader
#else #else
file_reader file_reader
@ -48,7 +48,7 @@ TextFile::TextFile(Path path_fs, Error &error)
TextFile::~TextFile() TextFile::~TextFile()
{ {
delete buffered_reader; delete buffered_reader;
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
delete gunzip_reader; delete gunzip_reader;
#endif #endif
delete file_reader; delete file_reader;

2
src/fs/io/TextFile.hxx
View File

@ -34,7 +34,7 @@ class BufferedReader;
class TextFile { class TextFile {
FileReader *const file_reader; FileReader *const file_reader;
#ifdef HAVE_ZLIB #ifdef ENABLE_ZLIB
AutoGunzipReader *const gunzip_reader; AutoGunzipReader *const gunzip_reader;
#endif #endif

8
src/input/Registry.cxx
View File

@ -22,7 +22,7 @@
#include "util/Macros.hxx" #include "util/Macros.hxx"
#include "plugins/FileInputPlugin.hxx" #include "plugins/FileInputPlugin.hxx"
#ifdef HAVE_ALSA #ifdef ENABLE_ALSA
#include "plugins/AlsaInputPlugin.hxx" #include "plugins/AlsaInputPlugin.hxx"
#endif #endif
@ -34,7 +34,7 @@
#include "plugins/CurlInputPlugin.hxx" #include "plugins/CurlInputPlugin.hxx"
#endif #endif
#ifdef HAVE_FFMPEG #ifdef ENABLE_FFMPEG
#include "plugins/FfmpegInputPlugin.hxx" #include "plugins/FfmpegInputPlugin.hxx"
#endif #endif
@ -60,7 +60,7 @@
const InputPlugin *const input_plugins[] = { const InputPlugin *const input_plugins[] = {
&input_plugin_file, &input_plugin_file,
#ifdef HAVE_ALSA #ifdef ENABLE_ALSA
&input_plugin_alsa, &input_plugin_alsa,
#endif #endif
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
@ -69,7 +69,7 @@ const InputPlugin *const input_plugins[] = {
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
&input_plugin_curl, &input_plugin_curl,
#endif #endif
#ifdef HAVE_FFMPEG #ifdef ENABLE_FFMPEG
&input_plugin_ffmpeg, &input_plugin_ffmpeg,
#endif #endif
#ifdef ENABLE_SMBCLIENT #ifdef ENABLE_SMBCLIENT

4
src/ls.cxx
View File

@ -41,7 +41,7 @@ static const char *remoteUrlPrefixes[] = {
"mmst://", "mmst://",
"mmsu://", "mmsu://",
#endif #endif
#ifdef HAVE_FFMPEG #ifdef ENABLE_FFMPEG
"gopher://", "gopher://",
"rtp://", "rtp://",
"rtsp://", "rtsp://",
@ -61,7 +61,7 @@ static const char *remoteUrlPrefixes[] = {
#ifdef ENABLE_DESPOTIFY #ifdef ENABLE_DESPOTIFY
"spt://", "spt://",
#endif #endif
#ifdef HAVE_ALSA #ifdef ENABLE_ALSA
"alsa://", "alsa://",
#endif #endif
NULL NULL

2
src/neighbor/Registry.cxx
View File

@ -29,7 +29,7 @@ const NeighborPlugin *const neighbor_plugins[] = {
#ifdef ENABLE_SMBCLIENT #ifdef ENABLE_SMBCLIENT
&smbclient_neighbor_plugin, &smbclient_neighbor_plugin,
#endif #endif
#ifdef HAVE_LIBUPNP #ifdef ENABLE_UPNP
&upnp_neighbor_plugin, &upnp_neighbor_plugin,
#endif #endif
nullptr nullptr

10
src/output/Registry.cxx
View File

@ -54,13 +54,13 @@ const AudioOutputPlugin *const audio_output_plugins[] = {
#ifdef ENABLE_PIPE_OUTPUT #ifdef ENABLE_PIPE_OUTPUT
&pipe_output_plugin, &pipe_output_plugin,
#endif #endif
#ifdef HAVE_ALSA #ifdef ENABLE_ALSA
&alsa_output_plugin, &alsa_output_plugin,
#endif #endif
#ifdef HAVE_ROAR #ifdef ENABLE_ROAR
&roar_output_plugin, &roar_output_plugin,
#endif #endif
#ifdef HAVE_AO #ifdef ENABLE_AO
&ao_output_plugin, &ao_output_plugin,
#endif #endif
#ifdef HAVE_OSS #ifdef HAVE_OSS
@ -75,10 +75,10 @@ const AudioOutputPlugin *const audio_output_plugins[] = {
#ifdef ENABLE_SOLARIS_OUTPUT #ifdef ENABLE_SOLARIS_OUTPUT
&solaris_output_plugin, &solaris_output_plugin,
#endif #endif
#ifdef HAVE_PULSE #ifdef ENABLE_PULSE
&pulse_output_plugin, &pulse_output_plugin,
#endif #endif
#ifdef HAVE_JACK #ifdef ENABLE_JACK
&jack_output_plugin, &jack_output_plugin,
#endif #endif
#ifdef ENABLE_HTTPD_OUTPUT #ifdef ENABLE_HTTPD_OUTPUT

16
src/pcm/ConfiguredResampler.cxx
View File

@ -25,11 +25,11 @@
#include "config/ConfigError.hxx" #include "config/ConfigError.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#ifdef HAVE_LIBSAMPLERATE #ifdef ENABLE_LIBSAMPLERATE
#include "LibsamplerateResampler.hxx" #include "LibsamplerateResampler.hxx"
#endif #endif
#ifdef HAVE_SOXR #ifdef ENABLE_SOXR
#include "SoxrResampler.hxx" #include "SoxrResampler.hxx"
#endif #endif
@ -38,11 +38,11 @@
enum class SelectedResampler { enum class SelectedResampler {
FALLBACK, FALLBACK,
#ifdef HAVE_LIBSAMPLERATE #ifdef ENABLE_LIBSAMPLERATE
LIBSAMPLERATE, LIBSAMPLERATE,
#endif #endif
#ifdef HAVE_SOXR #ifdef ENABLE_SOXR
SOXR, SOXR,
#endif #endif
}; };
@ -58,14 +58,14 @@ pcm_resampler_global_init(Error &error)
if (strcmp(converter, "internal") == 0) if (strcmp(converter, "internal") == 0)
return true; return true;
#ifdef HAVE_SOXR #ifdef ENABLE_SOXR
if (memcmp(converter, "soxr", 4) == 0) { if (memcmp(converter, "soxr", 4) == 0) {
selected_resampler = SelectedResampler::SOXR; selected_resampler = SelectedResampler::SOXR;
return pcm_resample_soxr_global_init(converter, error); return pcm_resample_soxr_global_init(converter, error);
} }
#endif #endif
#ifdef HAVE_LIBSAMPLERATE #ifdef ENABLE_LIBSAMPLERATE
selected_resampler = SelectedResampler::LIBSAMPLERATE; selected_resampler = SelectedResampler::LIBSAMPLERATE;
return pcm_resample_lsr_global_init(converter, error); return pcm_resample_lsr_global_init(converter, error);
#endif #endif
@ -86,12 +86,12 @@ pcm_resampler_create()
case SelectedResampler::FALLBACK: case SelectedResampler::FALLBACK:
return new FallbackPcmResampler(); return new FallbackPcmResampler();
#ifdef HAVE_LIBSAMPLERATE #ifdef ENABLE_LIBSAMPLERATE
case SelectedResampler::LIBSAMPLERATE: case SelectedResampler::LIBSAMPLERATE:
return new LibsampleratePcmResampler(); return new LibsampleratePcmResampler();
#endif #endif
#ifdef HAVE_SOXR #ifdef ENABLE_SOXR
case SelectedResampler::SOXR: case SelectedResampler::SOXR:
return new SoxrPcmResampler(); return new SoxrPcmResampler();
#endif #endif

2
src/playlist/PlaylistRegistry.cxx
View File

@ -49,7 +49,7 @@ const struct playlist_plugin *const playlist_plugins[] = {
// TODO: enable without GLib // TODO: enable without GLib
&pls_playlist_plugin, &pls_playlist_plugin,
#endif #endif
#ifdef HAVE_EXPAT #ifdef ENABLE_EXPAT
&xspf_playlist_plugin, &xspf_playlist_plugin,
&asx_playlist_plugin, &asx_playlist_plugin,
&rss_playlist_plugin, &rss_playlist_plugin,

2
src/system/fd_util.h
View File

@ -103,7 +103,7 @@ socketpair_cloexec_nonblock(int domain, int type, int protocol, int sv[2]);
#endif #endif
#ifdef HAVE_LIBMPDCLIENT #ifdef ENABLE_LIBMPDCLIENT
/* Avoid symbol conflict with statically linked libmpdclient */ /* Avoid symbol conflict with statically linked libmpdclient */
#define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict #define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict
#endif #endif

2
test/DumpDatabase.cxx
View File

@ -44,7 +44,7 @@ using std::endl;
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_LIBUPNP #ifdef ENABLE_UPNP
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
size_t size_t
InputStream::LockRead(void *, size_t, Error &) InputStream::LockRead(void *, size_t, Error &)