From b12000555e93cf620d53d321ef637912535b66bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 16 Oct 2016 19:39:12 +0200
Subject: cmake: Fix FTBFS due to artsc includes This relates to bug 2714
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1602d89a8fda0eeec793ba2205a152d8ddd898e2)
---
 ConfigureChecks.cmake                          |  4 ++--
 configure.in.in                                | 18 +++++++++++++-----
 plugins/audiooutput/arts/CMakeLists.txt        |  2 +-
 plugins/audiooutput/arts/Makefile.am           |  2 +-
 plugins/audiooutput/arts/k3bartsoutputplugin.h |  2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3ffcde3..9466c7c 100644
--- a/ConfigureChecks.cmake
+++ b/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( )
 
diff --git a/configure.in.in b/configure.in.in
index 27cec92..7fe8c4a 100644
--- a/configure.in.in
+++ b/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
-	KDE_CHECK_HEADERS(artsc/artsc.h,
-		[arts_available=yes
-	 	 ARTS_LIBS="-lartsc"],
-		[arts_available=no]
-	)
+	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_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])
diff --git a/plugins/audiooutput/arts/CMakeLists.txt b/plugins/audiooutput/arts/CMakeLists.txt
index 58b4a97..ed41002 100644
--- a/plugins/audiooutput/arts/CMakeLists.txt
+++ b/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}
 )
 
diff --git a/plugins/audiooutput/arts/Makefile.am b/plugins/audiooutput/arts/Makefile.am
index 94c93a0..4577022 100644
--- a/plugins/audiooutput/arts/Makefile.am
+++ b/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
 
diff --git a/plugins/audiooutput/arts/k3bartsoutputplugin.h b/plugins/audiooutput/arts/k3bartsoutputplugin.h
index e1b5499..9a07787 100644
--- a/plugins/audiooutput/arts/k3bartsoutputplugin.h
+++ b/plugins/audiooutput/arts/k3bartsoutputplugin.h
@@ -18,7 +18,7 @@
 
 #include <k3baudiooutputplugin.h>
 
-#include <artsc/artsc.h>
+#include <artsc.h>
 
 
 class K3bArtsOutputPlugin : public K3bAudioOutputPlugin
-- 
cgit v1.2.3