From b19304461285cbf4416d93e68c41e97f1c2bef74 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Fri, 26 Apr 2013 13:11:28 -0500
Subject: Add cmake configure option to support ksmserver shutdown debugging
 timing markers. (cherry picked from commit
 62d43d23e6dc10a351e64b95724810a94ceb1f0a)

---
 CMakeLists.txt         | 1 +
 config.h.cmake         | 3 +++
 ksmserver/shutdown.cpp | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0a5a65db..0102f7a3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,6 +135,7 @@ option( BUILD_TSAK "Build tsak"  ${BUILD_ALL} )
 option( BUILD_KROOTBACKING "Build krootbacking"  ${BUILD_ALL} )
 option( BUILD_TQT3INTEGRATION "Build tqt3integration"  ${BUILD_ALL} )
 option( BUILD_CRASHTEST "Build crash test program"  ${BUILD_ALL} )
+option( BUILD_PROFILE_SHUTDOWN "Build ksmserver shutdown debugging timing markers"  OFF )
 
 
 ##### set PKG_CONFIG_PATH #######################
diff --git a/config.h.cmake b/config.h.cmake
index bbbb91628..285e4ae53 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -178,3 +178,6 @@
 
 // tsak
 #cmakedefine BUILD_TSAK "@BUILD_TSAK@"
+
+// Defined when wanting ksmserver shutdown debugging timing markers in .xsession-errors
+#cmakedefine BUILD_PROFILE_SHUTDOWN 1
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 40aebd4be..ea0773eb6 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -88,10 +88,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "shutdowndlg.h"
 #include "client.h"
 
-// #define PROFILE_SHUTDOWN 1
+#ifdef BUILD_PROFILE_SHUTDOWN
+#define PROFILE_SHUTDOWN 1
+#endif
 
 #ifdef PROFILE_SHUTDOWN
-	#define SHUTDOWN_MARKER(x) printf("[ksmserver] '%s' [%s]\n\r", x, TQTime::currentTime().toString("hh:mm:ss:zzz").ascii()); fflush(stdout);
+	#define SHUTDOWN_MARKER(x) printf("[ksmserver] '%s' [%s]\n", x, TQTime::currentTime().toString("hh:mm:ss:zzz").ascii()); fflush(stdout);
 #else // PROFILE_SHUTDOWN
 	#define SHUTDOWN_MARKER(x)
 #endif // PROFILE_SHUTDOWN
-- 
cgit v1.2.1