diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
| commit | 0c9fc2f8090ed225c76296088e6760630eb42779 (patch) | |
| tree | 9238436fb89ebf6a91d329eba0f5feec1ad137fd /configure.ac | |
| parent | 1a954748a027aa5b4fc6c85b0ad96c2fa25d53b8 (diff) | |
| parent | fe588a255ba713875a21bb98d3b7daf60af2844e (diff) | |
Merge commit 'release-0.16.2'
Conflicts:
Makefile.am
NEWS
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0d07555e..2142bcfc 100644 --- a/configure.ac +++ b/configure.ac @@ -660,7 +660,7 @@ fi AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes) dnl ---------------------------------- libogg --------------------------------- -if test x$with_tremor == xno || test -z $with_tremor; then +if test x$with_tremor = xno || test -z $with_tremor; then PKG_CHECK_MODULES(OGG, [ogg], enable_ogg=yes, enable_ogg=no) fi @@ -959,13 +959,19 @@ if test x$enable_tremor = xyes; then ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $TREMOR_CFLAGS" LIBS="$LIBS $TREMOR_LIBS" - AC_CHECK_LIB(vorbisidec,ov_read,enable_vorbis=yes,enable_vorbis=no; + AC_CHECK_LIB(vorbisidec,ov_read,,enable_tremor=no; AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support])) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" +fi +if test x$enable_tremor = xyes; then AC_DEFINE(HAVE_TREMOR,1, [Define to use tremor (libvorbisidec) for ogg support]) + AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]), +else + TREMOR_CFLAGS= + TREMOR_LIBS= fi AC_SUBST(TREMOR_CFLAGS) @@ -1005,7 +1011,7 @@ if test x$enable_vorbis = xyes; then fi fi -AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes) +AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes || test x$enable_tremor = xyes) dnl --------------------------------- sidplay --------------------------------- found_sidplay=$HAVE_CXX |