From 386d5647da414c477f7f045c2850bfb1854e2302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 15 Oct 2015 04:40:52 +0200 Subject: Fix OGG detection on openSUSE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- ConfigureChecks.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ConfigureChecks.cmake') diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1fa37d7..df4d86a 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -210,11 +210,11 @@ if( WITH_XIPH_DECODER ) check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H ) if( HAVE_OGGFLAC_H ) tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC ) - check_library_exits( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC ) + check_library_exists( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC ) tde_restore( CMAKE_REQUIRED_LIBRARIES ) if( HAVE_LIBOGGFLAC ) set( OGGFLAC_LIBRARIES "-lOggFLAC" ) - endif( HAVE_LIBFLAC ) + endif( HAVE_LIBOGGFLAC ) endif( HAVE_OGGFLAC_H ) endif( NOT HAVE_LIBFLAC113 ) endif( FLAC_FOUND ) @@ -237,7 +237,7 @@ if( WITH_XIPH_DECODER ) pkg_search_module( SPEEX speex>=1.1 ) if( SPEEX_FOUND ) set( HAVE_SPEEX11 1 ) - check_library_exits( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT ) + check_library_exitss( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT ) if( NOT HAVE_SPEEX_DECODE_INT ) set( BROKEN_SPEEX11 1 ) endif( ) @@ -267,6 +267,11 @@ endif( WITH_XIPH_DECODER ) if( WITH_XIPH_DECODER ) + pkg_search_module( OGG ogg ) + if( NOT OGG_FOUND ) + tde_message_fatal( "ogg are required, but not found on your system" ) + endif( NOT OGG_FOUND ) + pkg_search_module( VORBIS vorbis ) if( NOT VORBIS_FOUND ) tde_message_fatal( "ogg/vorbis are required, but not found on your system" ) -- cgit v1.2.1