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

configure.ac: Move use_tremor to enable_tremor.

Browse Source
This commit is contained in:
Avuton Olrich 2010-09-11 20:07:55 -07:00
parent a3745ae7f3
commit 841b9b3d63
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -916,13 +916,13 @@ AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes)
dnl -------------------------------- Ogg Tremor ------------------------------- dnl -------------------------------- Ogg Tremor -------------------------------
if test x$with_tremor = xyes || test x$with_tremor = xno; then if test x$with_tremor = xyes || test x$with_tremor = xno; then
use_tremor="$with_tremor" enable_tremor="$with_tremor"
else else
tremor_prefix="$with_tremor" tremor_prefix="$with_tremor"
use_tremor=yes enable_tremor=yes
fi fi
if test x$use_tremor = xyes; then if test x$enable_tremor = xyes; then
if test "x$tremor_libraries" != "x" ; then if test "x$tremor_libraries" != "x" ; then
TREMOR_LIBS="-L$tremor_libraries" TREMOR_LIBS="-L$tremor_libraries"
elif test "x$tremor_prefix" != "x" ; then elif test "x$tremor_prefix" != "x" ; then
@ -953,7 +953,7 @@ 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 && test x$enable_oggflac = xyes; then if test x$enable_tremor = xyes && test x$enable_oggflac = xyes; then
AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor]) AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor])
enable_oggflac=no enable_oggflac=no
fi fi
@ -971,7 +971,7 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
dnl -------------------------------- Ogg Vorbis ------------------------------- dnl -------------------------------- Ogg Vorbis -------------------------------
if test x$enable_vorbis = xyes; then if test x$enable_vorbis = xyes; then
if test x$use_tremor = xyes; then if test x$enable_tremor = xyes; then
AC_MSG_WARN(["OggTremor detected, could not enable Vorbis."]) AC_MSG_WARN(["OggTremor detected, could not enable Vorbis."])
enable_vorbis=no enable_vorbis=no
elif test x$enable_ogg = xyes; then elif test x$enable_ogg = xyes; then
@ -1511,7 +1511,7 @@ results(mp4, [MP4])
results(mpc, [Musepack]) results(mpc, [Musepack])
results(oggflac, [OggFLAC], flac) results(oggflac, [OggFLAC], flac)
echo -ne '\n\t' echo -ne '\n\t'
results(with_tremor, [OggTremor]) results(tremor, [OggTremor])
results(vorbis, [OggVorbis]) results(vorbis, [OggVorbis])
results(audiofile, [WAVE]) results(audiofile, [WAVE])
results(wavpack, [WavPack]) results(wavpack, [WavPack])