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

configure.ac: Check for vorbis once, and AC_DEFINE it there.

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

11
configure.ac
View File

@ -1064,9 +1064,6 @@ if test x$use_tremor = xyes; then
AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support])) AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support]))
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
if test x$enable_vorbis = xyes; then
AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support])
fi
fi fi
if test x$use_tremor = xyes; then if test x$use_tremor = xyes; then
@ -1100,8 +1097,12 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
dnl -------------------------------- Ogg Vorbis ------------------------------- dnl -------------------------------- Ogg Vorbis -------------------------------
if test x$enable_tremor != xyes -a test x$enable_vorbis = xyes; then if test x$enable_tremor != xyes -a test x$enable_vorbis = xyes; then
PKG_CHECK_MODULES(VORBIS, [ogg vorbis vorbisfile], PKG_CHECK_MODULES(VORBIS, [ogg vorbis vorbisfile],
AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
enable_vorbis=no) fi
if test x$enable_vorbis = xyes; then
AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
enable_vorbis=no)
fi fi
AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes) AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes)