[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=ac16514

The following commit has been merged in the master branch:
commit ac16514dbf9c4fe0ccbd826a1f94f7182512eaa7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Sep 12 13:08:28 2012 +0100

    Make TTS plugin optional
    
    Reviewed-by: Martin Klapetek
---
 CMakeLists.txt         |  6 +++---
 filters/CMakeLists.txt | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 609a07a..bd70594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,6 @@ add_definitions (${KDE4_DEFINITIONS}
 
 macro_optional_find_package(TelepathyLoggerQt4)
 macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepathyLoggerQt4" "Qt4 wrapper around telepathy-logger" FALSE "" "Needed for optional backlog support in the chat-window")
-macro_display_feature_log()
 if(TELEPATHY_LOGGER_QT4_FOUND)
     add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )
     include_directories(
@@ -45,8 +44,9 @@ add_subdirectory(data)
 add_subdirectory(adiumxtra-protocol-handler)
 add_subdirectory(logviewer)
 add_subdirectory(plasmoid)
-
-
 add_subdirectory(filters)
 add_subdirectory(tests)
 
+macro_display_feature_log()
+
+
diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index 3dac798..db5cffe 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -4,4 +4,14 @@ add_subdirectory(emoticons)
 add_subdirectory(images)
 #Commented out until https://bugs.kde.org/show_bug.cgi?id=304740
 # add_subdirectory(searchexpansion)
-add_subdirectory(texttospeech)
+
+
+IF (EXISTS "${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml")
+    set (HAS_KTTS TRUE)
+ENDIF (EXISTS "${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml")
+
+if(HAS_KTTS)
+    add_subdirectory(texttospeech)
+endif(HAS_KTTS)
+
+macro_log_feature(HAS_KTTS "KTTSD" "KDE Text to Speech Deamon" "" FALSE "" "Needed for optional tts message plugin")

-- 
ktp-text-ui packaging