From 9d72a341094ad0a4e9a01c3cd8d55e2fb034591e Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sat, 17 Apr 2010 03:41:44 -0700
Subject: configure.ac: Move sndfile/modplug conflict test to Decoder Plugins,
 add header.

---
 configure.ac | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index 4456b2a7d..f399e6d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1051,6 +1051,14 @@ 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
 
 
 if test x$enable_mpc = xyes; then
-- 
cgit v1.2.3