From f70dccdce10f599be288431da166b5b09a53135c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 3 Nov 2008 16:48:12 +0100 Subject: configure.ac: separate the "aac" and "mp4" decoder tests MPD used to have a copy of the mp4ff library. Since that has been removed, AAC suport was disabled when there was no libmp4ff. Separate the libmp4ff test, and enable AAC support no matter if libmp4ff is available. --- src/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 6f11caaab..cc8f6e55b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -182,7 +182,11 @@ mpd_SOURCES += decoder/wavpack_plugin.c endif if HAVE_FAAD -mpd_SOURCES += decoder/aac_plugin.c decoder/mp4_plugin.c +mpd_SOURCES += decoder/aac_plugin.c +endif + +if HAVE_MP4 +mpd_SOURCES += decoder/mp4_plugin.c endif if HAVE_OGG_COMMON @@ -293,6 +297,7 @@ mpd_LDADD = $(MPD_LIBS) \ $(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \ $(ID3TAG_LIBS) \ $(MAD_LIBS) \ + $(MP4FF_LIBS) \ $(FFMPEG_LIBS) \ $(GLIB_LIBS) -- cgit v1.2.3