[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:11:49
Message-ID: 1121350309.383682.6208.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434553 by carewolf:

Correct configure checks


 M  +3 -3      akode_artsplugin/Makefile.am  
 A             akode_artsplugin/configure.in.in  
 M  +7 -0      configure.in.bot  
 M  +23 -1     configure.in.in  


--- trunk/KDE/kdemultimedia/akode_artsplugin/Makefile.am #434552:434553
@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_srcdir)/akode/lib -I$(kde_includes)/arts $(all_includes)
+INCLUDES= -I$(kde_includes)/akode -I$(kde_includes)/arts $(all_includes)
 
 noinst_HEADERS = akodePlayObject_impl.h
 
@@ -7,8 +7,8 @@
 libarts_akode_la_SOURCES = akodearts.cc akodePlayObject_impl.cpp \
         akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp \
                akodeXiphPlayObject_impl.cpp \
         akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp
-libarts_akode_la_LDFLAGS = -L$(top_srcdir)/akode/lib $(KDE_LDFLAGS) $(KDE_RPATH) \
                -module -avoid-version -no-undefined
-libarts_akode_la_LIBADD =  ../lib/libakode.la -lkmedia2_idl -lsoundserver_idl \
-lartsflow +libarts_akode_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_RPATH) -module \
-avoid-version -no-undefined +libarts_akode_la_LIBADD =  -lakode -lkmedia2_idl \
-lsoundserver_idl -lartsflow  libarts_akode_la_METASOURCES = AUTO
 libarts_akode_la_COMPILE_FIRST = akodearts.h
 
--- trunk/KDE/kdemultimedia/configure.in.bot #434552:434553
@@ -24,3 +24,10 @@
   echo "See http://lame.sourceforge.net/"
   all_tests=bad
 fi
+
+if test "x$with_akode" = xcheck && test "x$have_akode" = xno; then
+    echo "aKode was not found. Without it the aKode aRts-plugin"
+    echo "will not be installed, and aRts will be."
+    echo "unable to play many music formats."
+    all_tests=bad
+fi
--- trunk/KDE/kdemultimedia/configure.in.in #434552:434553
@@ -362,7 +362,7 @@
     AC_SUBST(ARTSC_INCLUDE)
     ARTSC_LIBS=`${ARTSCCONFIG} --libs`
     AC_MSG_RESULT([arts libraries... $ARTSC_LIBS])
-    AC_SUBST(ARTSC_LIBS)	
+    AC_SUBST(ARTSC_LIBS)
     AC_SUBST(LIBDL)
   fi
 
@@ -377,6 +377,12 @@
   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,
@@ -481,4 +487,20 @@
   fi
 fi
 
+AC_ARG_WITH(akode,
+    [AS_HELP_STRING([--with-akode],
+        [enable the aKode decoder @<:@default=check@:>@])],
+    [], with_akode=check)
+
+have_akode=no
+if test "x$with_akode" != xno; then
+  KDE_CHECK_AKODE
+
+  if test "x$with_akode" != xcheck && test "x$have_akode" != xyes; then
+    AC_MSG_FAILURE([--with-akode was given, but test for aKode failed])
+  fi
+fi
+
+AM_CONDITIONAL(install_akode_artsplugin, test x$build_arts = xyes && test \
x$have_akode = xyes ) +
 KDE_CHECK_MPEGLIB_ARTS


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