diff options
-rw-r--r-- | ConfigureChecks.cmake | 7 | ||||
-rw-r--r-- | config.h.cmake | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index c5b7c0fe..c51954e6 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -255,7 +255,12 @@ if( WITH_VORBIS ) tde_message_fatal( "Ogg/Vorbis support are requested, but `libvorbisenc` not found" ) endif( ) - set( HAVE_VORBIS 1 ) + check_library_exists( vorbis vorbis_bitrate_addblock "${VORBIS_LIBRARY_DIRS}" HAVE_VORBIS_2 ) + if( HAVE_VORBIS_2 ) + set( HAVE_VORBIS 2 ) + else( ) + set( HAVE_VORBIS 1 ) + endif( ) set( OGG_VORBIS 1 ) endif( WITH_VORBIS ) diff --git a/config.h.cmake b/config.h.cmake index 61dd9169..812818bb 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -31,7 +31,7 @@ #cmakedefine HAVE_MACHINE_SOUNDCARD_H 1 #cmakedefine HAVE_LIBFLAC 1 -#cmakedefine HAVE_VORBIS 1 +#cmakedefine HAVE_VORBIS @HAVE_VORBIS@ #cmakedefine OGG_VORBIS 1 /* mpeglib */ |