summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-10-16 19:39:12 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-10-16 19:39:12 +0200
commit1602d89a8fda0eeec793ba2205a152d8ddd898e2 (patch)
tree431f75776bf542e697b13c17aebd1c96bd8bbb50
parenta30375c69fa166f3a2af7637f5a8dfac0bc20114 (diff)
downloadk3b-1602d89a.tar.gz
k3b-1602d89a.zip
cmake: Fix FTBFS due to artsc includes
This relates to bug 2714 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ConfigureChecks.cmake4
-rw-r--r--configure.in.in18
-rw-r--r--plugins/audiooutput/arts/CMakeLists.txt2
-rw-r--r--plugins/audiooutput/arts/Makefile.am2
-rw-r--r--plugins/audiooutput/arts/k3bartsoutputplugin.h2
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