diff options
| author | Avuton Olrich <avuton@gmail.com> | 2010-04-17 03:41:44 -0700 |
|---|---|---|
| committer | Avuton Olrich <avuton@gmail.com> | 2010-04-21 07:10:59 -0700 |
| commit | 9d72a341094ad0a4e9a01c3cd8d55e2fb034591e (patch) | |
| tree | f0a9733551dfec04f5ff9fca88a0a172b0fd6f9e | |
| parent | 18cdbfa70f137b40466700eda11352f126ca810c (diff) | |
| download | mpd-9d72a341094ad0a4e9a01c3cd8d55e2fb034591e.tar.gz mpd-9d72a341094ad0a4e9a01c3cd8d55e2fb034591e.tar.xz mpd-9d72a341094ad0a4e9a01c3cd8d55e2fb034591e.zip | |
configure.ac: Move sndfile/modplug conflict test to Decoder Plugins, add header.
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
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 |