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

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-07-14 14:35:52
Message-ID: 1121351752.830655.6526.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434556 by carewolf:

Use akode-config to find akode and make JuK compile


 M  +20 -6     configure.in.in  
 M  +2 -2      juk/Makefile.am  
 M  +6 -2      juk/akodeplayer.cpp  
 M  +4 -0      juk/akodeplayer.h  


--- trunk/KDE/kdemultimedia/configure.in.in #434555:434556
@@ -328,6 +328,26 @@
   AC_SUBST(taglib_libs)
 ])
 
+AC_DEFUN([KDE_CHECK_AKODE],
+[
+  AC_PATH_PROG(AKODE_CONFIG, akode-config, [no], [$PATH:$prefix/bin])
+
+  if test "x$AKODE_CONFIG" != xno; then
+    AC_DEFINE(HAVE_AKODE, 1, [define if you have aKodelib installed])
+    akode_includes=`$AKODE_CONFIG --cflags`
+    akode_libs=`$AKODE_CONFIG --libs`
+    have_akode=yes
+  else
+    taglib_includes=""
+    taglib_libs=""
+    have_taglib=no
+  fi
+
+  AC_SUBST(akode_includes)
+  AC_SUBST(akode_libs)
+])
+
+
 AC_DEFUN([KDE_CHECK_MPEGLIB_ARTS],
 [
   MPEGLIB_ARTS_MAJOR_VERSION=0
@@ -377,12 +397,6 @@
   fi
 ])dnl KDE_CHECK_MPEGLIB_ARTS
 
-AC_DEFUN([KDE_CHECK_AKODE],
-[
-    KDE_CHECK_HEADER(akode/buffered_decoder.h, have_akode=yes, have_akode=no)
-
-])dnl KDE_CHECK_AKODE
-
 AC_TYPE_SIGNAL
 
 AC_ARG_WITH(vorbis,
--- trunk/KDE/kdemultimedia/juk/Makefile.am #434555:434556
@@ -74,7 +74,7 @@
 
 tagguessertest_SOURCES = tagguessertest.cpp tagguesser.cpp
 
-INCLUDES= $(all_includes) $(taglib_includes) $(GST_CFLAGS) $(ARTS_CFLAGS)
+INCLUDES= $(all_includes) $(taglib_includes) $(akode_includes) $(GST_CFLAGS) \
$(ARTS_CFLAGS)  
 ##################################################
 # check to see if MusicBrainz is available
@@ -84,7 +84,7 @@
 endif
 ##################################################
 
-juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(LIB_KHTML) \
$(LIB_ARTS) ../akode/lib/libakode.la +juk_LDADD = -lm $(LDADD_GST) $(mblibs) \
$(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)  juk_LDFLAGS = \
$(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST)  
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
--- trunk/KDE/kdemultimedia/juk/akodeplayer.cpp #434555:434556
@@ -14,12 +14,14 @@
 
 #include <config.h>
 
+#if HAVE_AKODE
+
 #include <kdebug.h>
 
 #include <qfile.h>
 
-#include "../akode/lib/player.h"
-#include "../akode/lib/decoder.h"
+#include <akode/player.h>
+#include <akode/decoder.h>
 
 #include "akodeplayer.h"
 
@@ -163,3 +165,5 @@
 }
 
 #include "akodeplayer.moc"
+
+#endif
--- trunk/KDE/kdemultimedia/juk/akodeplayer.h #434555:434556
@@ -18,10 +18,13 @@
 
 #include <config.h>
 
+#if HAVE_AKODE
+
 #include <qstring.h>
 
 #include "player.h"
 #include <kdemacros.h>
+
 namespace aKode {
     class File;
     class Player;
@@ -59,3 +62,4 @@
 };
 
 #endif
+#endif


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