aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-01-10 11:47:14 +0100
committerMax Kellermann <max@duempel.org>2011-01-10 11:47:14 +0100
commit2b29ca796edfc765b498463dac732663142911f2 (patch)
treebb71702b20181e5f96bf64c95facc164deb19736
parent51840088128a25a642744db3a2bff380952ca375 (diff)
parent9ad862d3a6f0cbb043bf4f9ff97e54e5c606ad3e (diff)
downloadmpd-2b29ca796edfc765b498463dac732663142911f2.tar.gz
mpd-2b29ca796edfc765b498463dac732663142911f2.tar.xz
mpd-2b29ca796edfc765b498463dac732663142911f2.zip
Merge commit 'release-0.16.1'
Conflicts: NEWS
-rw-r--r--Makefile.am10
-rw-r--r--NEWS3
-rw-r--r--configure.ac15
3 files changed, 10 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 1efd5605e..873cc0925 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,8 @@ AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"'
bin_PROGRAMS = src/mpd
+noinst_LIBRARIES =
+
src_mpd_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS)
src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
$(LIBWRAP_CFLAGS) \
@@ -436,7 +438,6 @@ DECODER_CFLAGS = \
$(SNDFILE_CFLAGS) \
$(AUDIOFILE_CFLAGS) \
$(LIBMIKMOD_CFLAGS) \
- $(MODPLUG_CFLAGS) \
$(GME_CFLAGS) \
$(SIDPLAY_CFLAGS) \
$(FLUIDSYNTH_CFLAGS) \
@@ -452,7 +453,6 @@ DECODER_LIBS = \
$(FLAC_LIBS) \
$(SNDFILE_LIBS) \
$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
- $(MODPLUG_LIBS) \
$(GME_LIBS) \
$(SIDPLAY_LIBS) \
$(FLUIDSYNTH_LIBS) \
@@ -526,7 +526,11 @@ DECODER_SRC += src/decoder/mikmod_decoder_plugin.c
endif
if HAVE_MODPLUG
-DECODER_SRC += src/decoder/modplug_decoder_plugin.c
+libmodplug_decoder_plugin_a_SOURCES = src/decoder/modplug_decoder_plugin.c
+libmodplug_decoder_plugin_a_CFLAGS = $(src_mpd_CFLAGS) $(MODPLUG_CFLAGS)
+libmodplug_decoder_plugin_a_CPPFLAGS = $(src_mpd_CPPFLAGS)
+noinst_LIBRARIES += libmodplug_decoder_plugin.a
+DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS)
endif
if ENABLE_SIDPLAY
diff --git a/NEWS b/NEWS
index 3b1cd00e3..2d33148c3 100644
--- a/NEWS
+++ b/NEWS
@@ -5,13 +5,14 @@ ver 0.17 (2010/??/??)
- osx: allow user to specify other audio devices
-ver 0.16.1 (2010/??/??)
+ver 0.16.1 (2010/01/09)
* audio_check: fix parameter in prototype
* add void casts to suppress "result unused" warnings (clang)
* input:
- ffado: disable by default
* decoder:
- mad: work around build failure on Solaris
+ - resolve modplug vs. libsndfile cflags/headers conflict
* output:
- solaris: add missing parameter to open_cloexec() cal
- osx: fix up audio format first, then apply it to device
diff --git a/configure.ac b/configure.ac
index a4ebde3a0..af5356f26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ dnl Programs
dnl ---------------------------------------------------------------------------
AC_PROG_CC_C99
AC_PROG_CXX
+AC_PROG_RANLIB
HAVE_CXX=yes
if test x$CXX = xg++; then
@@ -864,15 +865,6 @@ if test x$enable_modplug = xyes; then
fi
AM_CONDITIONAL(HAVE_MODPLUG, test x$enable_modplug = xyes)
-dnl --------------------------- sndfile/modplug test --------------------------
-if test x$enable_sndfile = xauto && test x$enable_modplug = xyes; then
- dnl If modplug is enabled, enable sndfile only if explicitly
- dnl requested - modplug's modplug/sndfile.h is known to
- dnl conflict with libsndfile's sndfile.h.
- AC_MSG_NOTICE([disabling libsndfile auto-detection, because the modplug decoder is enabled])
- enable_sndfile=no
-fi
-
dnl -------------------------------- libsndfile -------------------------------
dnl See above test, which may disable this.
MPD_AUTO_PKG(sndfile, SNDFILE, [sndfile],
@@ -1598,11 +1590,6 @@ results(cdio_paranoia, [CDIO_PARANOIA])
printf '\n\n##########################################\n\n'
-if test x$enable_sndfile = xyes && test x$enable_modplug = xyes; then
- AC_MSG_WARN([compilation may fail, because libmodplug conflicts with libsndfile])
- AC_MSG_WARN([libmodplug ships modplug/sndfile.h, which hides libsndfile's sndfile.h])
-fi
-
echo 'Generating files needed for compilation'
dnl ---------------------------------------------------------------------------