fix FTBFS when aRts support is not available from tdelibs.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

ConfigureChecks.cmake

@@ -35,18 +35,19 @@ if( BUILD_DOC AND BUILD_KIG )
 endif( )
 
 
-##### check for arts
-
-if( WITH_ARTS )
-   pkg_search_module( ARTS arts )
-   if( NOT ARTS_FOUND )
-      tde_message_fatal( "aRts is requested but was not found on your system" )
-   endif( NOT ARTS_FOUND )
-   set( WITHOUT_ARTS false )
-endif( WITH_ARTS )
+##### check for arts support
 
 if( NOT WITH_ARTS )
-   set( WITHOUT_ARTS 1 )
+    set( WITHOUT_ARTS 1 )
+ else()
+    find_library( ARTSKDE_LIBRARIES artskde )
+    if( NOT ARTSKDE_LIBRARIES )
+        tde_message_fatal( "aRts support through tdelibs is requested, but was not found on your system" )
+     else()
+        find_path( ARTSKDE_INCLUDE_DIRS kartsdispatcher.h
+                   PATH_SUFFIXES arts
+        )
+    endif()
 endif( NOT WITH_ARTS )
 
 

blinken/src/CMakeLists.txt

@@ -4,6 +4,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${ARTSKDE_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -32,7 +33,7 @@ tde_add_executable( blinken AUTOMOC
      tdecore-shared
      tdeui-shared
      tdeio-shared
-     artskde-shared
+     ${ARTSKDE_LIBRARIES}
 
   DESTINATION ${BIN_INSTALL_DIR}
 )

blinken/src/artsplayer.h

@@ -22,10 +22,10 @@ namespace KDE
 	class PlayObject;
 }
 #else
-#include <arts/kartsdispatcher.h>
-#include <arts/kartsserver.h>
-#include <arts/kplayobject.h>
-#include <arts/kplayobjectfactory.h>
+#include <kartsdispatcher.h>
+#include <kartsserver.h>
+#include <kplayobject.h>
+#include <kplayobjectfactory.h>
 #endif
 
 #include <tqvaluelist.h>

kanagram/src/CMakeLists.txt

@@ -4,6 +4,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${ARTSKDE_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -44,7 +45,7 @@ tde_add_executable( kanagram AUTOMOC
      tdeui-shared
      tdeio-shared
      tdenewstuff-shared
-     artskde-shared
+     ${ARTSKDE_LIBRARIES}
 
   DESTINATION ${BIN_INSTALL_DIR}
 )

kanagram/src/kanagram.h

@@ -29,10 +29,10 @@
 #include <kxmlguiclient.h>
 
 #ifndef WITHOUT_ARTS
-#include <arts/kartsdispatcher.h>
-#include <arts/kartsserver.h>
-#include <arts/kplayobject.h>
-#include <arts/kplayobjectfactory.h>
+#include <kartsdispatcher.h>
+#include <kartsserver.h>
+#include <kplayobject.h>
+#include <kplayobjectfactory.h>
 #else
 class KArtsDispatcher;
 class KArtsServer;