[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2005-07-13 19:22:11
Message-ID: 1121282531.613170.13652.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434343 by ctennis:

Fix theora and vorbis checks, per the previous commits

 M  +7 -7      configure.in.in  
 M  +1 -1      kfile-plugins/theora/configure.in.in  


--- trunk/KDE/kdemultimedia/configure.in.in #434342:434343
@@ -92,22 +92,22 @@
 [
   have_oggvorbis=yes
 
-  AC_CHECK_LIB(ogg, ogg_page_version,
+  KDE_CHECK_LIB(ogg, ogg_page_version,
     [:], [have_oggvorbis=no])
 
   KDE_CHECK_HEADER(vorbis/vorbisfile.h,
     [:], [have_oggvorbis=no])
 
-  AC_CHECK_LIB(vorbis, vorbis_info_init,
+  KDE_CHECK_LIB(vorbis, vorbis_info_init,
     [:], [have_oggvorbis=no])
 
-  AC_CHECK_LIB(vorbisfile, ov_open,
+  KDE_CHECK_LIB(vorbisfile, ov_open,
     [:], [have_oggvorbis=no], -lvorbis -logg)
 
-  AC_CHECK_LIB(vorbisenc, vorbis_info_clear,
+  KDE_CHECK_LIB(vorbisenc, vorbis_info_clear,
     [:], [have_oggvorbis=no])
 
-  AC_CHECK_LIB(vorbisenc, vorbis_bitrate_addblock,
+  KDE_CHECK_LIB(vorbisenc, vorbis_bitrate_addblock,
     [have_vorbis_value=2], [have_vorbis_value=1])
 
   if test "x$have_oggvorbis" = xyes; then
@@ -251,7 +251,7 @@
   KDE_CHECK_HEADER(cdda_interface.h,
     [:], [have_cdparanoia=no])
 
-  AC_CHECK_LIB(cdda_paranoia, paranoia_init,
+  KDE_CHECK_LIB(cdda_paranoia, paranoia_init,
     [:], [have_cdparanoia=no], [-lcdda_interface -lm])
 
   # because of the horrible hack we need shared cdparanoia
@@ -296,7 +296,7 @@
   KDE_CHECK_HEADER(lame/lame.h,
     [:], [have_lame=no])
 
-  AC_CHECK_LIB(mp3lame, lame_init,
+  KDE_CHECK_LIB(mp3lame, lame_init,
     [:], [have_lame=no], [-lm])
 
   if test "x$have_lame" = xyes; then
--- trunk/KDE/kdemultimedia/kfile-plugins/theora/configure.in.in #434342:434343
@@ -6,7 +6,7 @@
   [], [have_theora=no])
 
 KDE_CHECK_LIB(theora, theora_info_init,
-  [], [have_theora=no])
+  [], [have_theora=no], [-lvorbis -logg])
 ])
 
 AC_ARG_WITH(theora,
[prev in list] [next in list] [prev in thread] [next in thread]