summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-03-03 20:52:07 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-03-03 20:52:46 +0100
commite9785ee7aaad48b833c84b4b57a95d8ef83fb90f (patch)
treeb6894eb0f6959f6af1ed853bec3cea6d1ab72c36 /kdesktop/lock
parente39534e8510d8bcdd81f94f014b76778748da573 (diff)
downloadtdebase-e9785ee7aaad48b833c84b4b57a95d8ef83fb90f.tar.gz
tdebase-e9785ee7aaad48b833c84b4b57a95d8ef83fb90f.zip
Reapply commit 936d3cec inadvertently reverted in de7e5867
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/CMakeLists.txt9
-rw-r--r--kdesktop/lock/lockprocess.cc2
2 files changed, 9 insertions, 2 deletions
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 80c2b2cdb..db5e930bc 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -32,11 +32,16 @@ set( target kdesktop_lock )
set( ${target}_SRCS
lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
- securedlg.cc autologout.cc main.cc backtrace_symbols.c
+ securedlg.cc autologout.cc main.cc
)
+if( WITH_KDESKTOP_LOCK_BACKTRACE )
+ list( APPEND ${target}_SRCS backtrace_symbols.c )
+ set( BACKTRACE_LIBRARY bfd )
+endif( )
+
tde_add_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdesktopsettings-static dmctl-static tdeio-shared Xext bfd ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
+ LINK kdesktopsettings-static dmctl-static tdeio-shared Xext ${BACKTRACE_LIBRARY} ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index c08c4d424..288541ff9 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -137,6 +137,7 @@ static Atom gXA_SCREENSAVER_VERSION;
void print_trace()
{
+#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
void *array[10];
size_t size;
char **strings;
@@ -152,6 +153,7 @@ void print_trace()
}
free (strings);
+#endif
}
static void segv_handler(int)