oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Avuton Olrich 2010-04-17 04:08:08 -07:00
parent 21f5ed4a25
commit b6c8de6e01
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -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)
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"