cmake: Fix FTBFS due to artsc includes

This relates to bug 2714

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1602d89a8f)

ConfigureChecks.cmake

@@ -108,9 +108,9 @@ endif( )
 ##### arts ######################################
 
 if( WITH_ARTS )
-  pkg_search_module( ARTS arts )
+  pkg_search_module( ARTS artsc )
   if( NOT ARTS_FOUND )
-    tde_message_fatal( "aRts is requested, but was not found on your system" )
+    tde_message_fatal( "aRtsC is requested, but was not found on your system" )
   endif( )
 endif( )
 

configure.in.in

@@ -35,13 +35,21 @@ AM_CONDITIONAL(compile_libsamplerate, [test -z "$LIBSAMPLERATE"])
 ARTS_LIBS=""
 if test "x$build_arts" = "xyes"; then
 	dnl Find aRts
+	if $PKG_CONFIG artsc --exists; then
+		arts_available=yes
+		ARTS_LIBS="-lartsc"
+		ARTS_INCLUDES="`$PKG_CONFIG artsc --cflags`"
+	else
 		KDE_CHECK_HEADERS(artsc/artsc.h,
 			[arts_available=yes
-	 	 ARTS_LIBS="-lartsc"],
+			 ARTS_LIBS="-lartsc"
+			 ARTS_INCLUDES="`$ARTSCCONFIG --cflags`"],
 			[arts_available=no]
 		)
+	fi
 fi
 AC_SUBST(ARTS_LIBS)
+AC_SUBST(ARTS_INCLUDES)
 AM_CONDITIONAL(include_arts, [test -n "$ARTS_LIBS"])
 if test "x$build_arts" = "xyes" -a "x$arts_available" = "xyes"; then
 	AC_DEFINE(WITH_ARTS,1,[defined if arts support is compiled in])

plugins/audiooutput/arts/CMakeLists.txt

@@ -31,7 +31,7 @@ link_directories(
 
 tde_add_kpart( libk3bartsoutputplugin AUTOMOC
   SOURCES k3bartsoutputplugin.cpp
-  LINK tdecore-shared k3b-shared ${ARTS_LIBRARIES} artsc
+  LINK tdecore-shared k3b-shared artsc
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 

plugins/audiooutput/arts/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin $(all_includes)
+AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin $(ARTS_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libk3bartsoutputplugin.la
 

plugins/audiooutput/arts/k3bartsoutputplugin.h

@@ -18,7 +18,7 @@
 
 #include <k3baudiooutputplugin.h>
 
-#include <artsc/artsc.h>
+#include <artsc.h>
 
 
 class K3bArtsOutputPlugin : public K3bAudioOutputPlugin