diff options
| author | Avuton Olrich <avuton@gmail.com> | 2010-04-17 04:04:37 -0700 |
|---|---|---|
| committer | Avuton Olrich <avuton@gmail.com> | 2010-04-21 07:35:31 -0700 |
| commit | 21f5ed4a2593a285068dca713aa1f861e558a113 (patch) | |
| tree | 6ca67731c862afedea27d2c8e2d66afef3a8cecd | |
| parent | 52fc168905b2ce3692408d7a80440048258f3aed (diff) | |
| download | mpd-21f5ed4a2593a285068dca713aa1f861e558a113.tar.gz mpd-21f5ed4a2593a285068dca713aa1f861e558a113.tar.xz mpd-21f5ed4a2593a285068dca713aa1f861e558a113.zip | |
configure.ac: Check for vorbis once, and AC_DEFINE it there.
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 8b17c36af..333a27669 100644 --- a/configure.ac +++ b/configure.ac @@ -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])) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" - if test x$enable_vorbis = xyes; then - AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]) - fi fi if test x$use_tremor = xyes; then @@ -1100,8 +1097,12 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes) dnl -------------------------------- Ogg Vorbis ------------------------------- if test x$enable_tremor != xyes -a test x$enable_vorbis = xyes; then 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 AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes) |