Fix OGG detection on openSUSE

Signed-off-by: François Andriot <francois.andriot@free.fr>
pull/1/head
François Andriot 9 years ago committed by Slávek Banko
parent 5d88506182
commit 386d5647da

@ -210,11 +210,11 @@ if( WITH_XIPH_DECODER )
check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H ) check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H )
if( HAVE_OGGFLAC_H ) if( HAVE_OGGFLAC_H )
tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC ) 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 ) tde_restore( CMAKE_REQUIRED_LIBRARIES )
if( HAVE_LIBOGGFLAC ) if( HAVE_LIBOGGFLAC )
set( OGGFLAC_LIBRARIES "-lOggFLAC" ) set( OGGFLAC_LIBRARIES "-lOggFLAC" )
endif( HAVE_LIBFLAC ) endif( HAVE_LIBOGGFLAC )
endif( HAVE_OGGFLAC_H ) endif( HAVE_OGGFLAC_H )
endif( NOT HAVE_LIBFLAC113 ) endif( NOT HAVE_LIBFLAC113 )
endif( FLAC_FOUND ) endif( FLAC_FOUND )
@ -237,7 +237,7 @@ if( WITH_XIPH_DECODER )
pkg_search_module( SPEEX speex>=1.1 ) pkg_search_module( SPEEX speex>=1.1 )
if( SPEEX_FOUND ) if( SPEEX_FOUND )
set( HAVE_SPEEX11 1 ) 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 ) if( NOT HAVE_SPEEX_DECODE_INT )
set( BROKEN_SPEEX11 1 ) set( BROKEN_SPEEX11 1 )
endif( ) endif( )
@ -267,6 +267,11 @@ endif( WITH_XIPH_DECODER )
if( 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 ) pkg_search_module( VORBIS vorbis )
if( NOT VORBIS_FOUND ) if( NOT VORBIS_FOUND )
tde_message_fatal( "ogg/vorbis are required, but not found on your system" ) tde_message_fatal( "ogg/vorbis are required, but not found on your system" )

@ -1,7 +1,7 @@
dnl don't remove the below dnl don't remove the below
dnl AC_OUTPUT(akode/akode-config) dnl AC_OUTPUT(akode/akode-config)
AM_CONFIG_HEADER(akode/lib/akode_export.h) AC_CONFIG_HEADER(akode/lib/akode_export.h)
AC_DEFUN([AC_CHECK_LIBFLAC], AC_DEFUN([AC_CHECK_LIBFLAC],
[ [

@ -38,7 +38,7 @@ tde_add_library(
akode-shared akode-shared
${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES} ${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES}
${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
${SPEEX_LIBRARIES} ${SPEEX_LIBRARIES} ${OGG_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -55,7 +55,7 @@ KDE_CONF_FILES
dnl without this order in this file, automake will be confused! dnl without this order in this file, automake will be confused!
dnl dnl
AM_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
dnl checks for programs. dnl checks for programs.
dnl first check for c/c++ compilers dnl first check for c/c++ compilers

Loading…
Cancel
Save