Skip to content

M
mpd
Commit b6c8de6e authored by Avuton Olrich's avatar Avuton Olrich
Browse files
Options

configure.ac: Move tremor/oggflac test under oggflac.

parent 21f5ed4a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
configure.ac
View file @ b6c8de6e
...@@ -1069,10 +1069,6 @@ fi ...@@ -1069,10 +1069,6 @@ fi
if test x$use_tremor = xyes; then if test x$use_tremor = xyes; then
AC_DEFINE(HAVE_TREMOR,1, AC_DEFINE(HAVE_TREMOR,1,
[Define to use tremor (libvorbisidec) for ogg support]) [Define to use tremor (libvorbisidec) for ogg support])
if test x$enable_oggflac = xyes; then
AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor])
enable_oggflac=no
fi
fi fi
AC_SUBST(TREMOR_CFLAGS) AC_SUBST(TREMOR_CFLAGS)
...@@ -1080,6 +1076,12 @@ AC_SUBST(TREMOR_LIBS) ...@@ -1080,6 +1076,12 @@ AC_SUBST(TREMOR_LIBS)
dnl --------------------------------- OggFLAC --------------------------------- dnl --------------------------------- OggFLAC ---------------------------------
dnl OggFLAC must go after Ogg Tremor dnl OggFLAC must go after Ogg Tremor
if test x$use_tremor = xyes -a test $xenable_oggflac = yes; then
AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor])
enable_oggflac=no
fi
if test x$enable_oggflac = xyes; then if test x$enable_oggflac = xyes; then
oldmpdcflags="$MPD_CFLAGS" oldmpdcflags="$MPD_CFLAGS"
oldmpdlibs="$MPD_LIBS" oldmpdlibs="$MPD_LIBS"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment