summaryrefslogtreecommitdiffstats
path: root/kstartperf
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-14 19:38:06 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-14 19:38:06 -0500
commit1de68cb32ec6b702879793828653e85ec3bcc5e1 (patch)
tree06656342dfaba7ae08657e6da23ceff94fa7fcaa /kstartperf
parent8d740ff03303f59a0098816aeac7854352f7628d (diff)
downloadtdesdk-1de68cb32ec6b702879793828653e85ec3bcc5e1.tar.gz
tdesdk-1de68cb32ec6b702879793828653e85ec3bcc5e1.zip
Fix kstartperf failure
This closes Bug 854
Diffstat (limited to 'kstartperf')
-rw-r--r--kstartperf/Makefile.am3
-rw-r--r--kstartperf/kstartperf.cpp2
-rw-r--r--kstartperf/libkstartperf.c17
3 files changed, 11 insertions, 11 deletions
diff --git a/kstartperf/Makefile.am b/kstartperf/Makefile.am
index 3aea986f..3921d009 100644
--- a/kstartperf/Makefile.am
+++ b/kstartperf/Makefile.am
@@ -1,8 +1,7 @@
INCLUDES = $(all_includes)
lib_LTLIBRARIES = libkstartperf.la
-libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -version-info 1:0 -no-undefined
-# libkstartperf_la_LIBADD = ../libltdl/libltdlc.la
+libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ldl -version-info 1:0 -no-undefined
libkstartperf_la_SOURCES = libkstartperf.c
bin_PROGRAMS = kstartperf
diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp
index 992111fb..49d60f01 100644
--- a/kstartperf/kstartperf.cpp
+++ b/kstartperf/kstartperf.cpp
@@ -2,7 +2,7 @@
*
* $Id$
*
- * This file is part of the KDE project, module kstartperf.
+ * This file is part of the TDE project, module kstartperf.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*
* You can freely redistribute this program under the "Artistic License".
diff --git a/kstartperf/libkstartperf.c b/kstartperf/libkstartperf.c
index 3c8deae0..9c6a0954 100644
--- a/kstartperf/libkstartperf.c
+++ b/kstartperf/libkstartperf.c
@@ -23,8 +23,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
-#include <ltdl.h>
-
+#include <dlfcn.h>
/* Prototypes */
@@ -64,26 +63,28 @@ int XMapRaised(Display * d, Window w)
void KDE_InterceptXMapRequest(Display * d, Window w)
{
- lt_dlhandle handle;
+ void * handle;
+
- handle = lt_dlopen("libX11.so");
+ handle = dlopen("libX11.so", (RTLD_LAZY | RTLD_GLOBAL));
if (handle == 0L)
- handle = lt_dlopen("libX11.so.6");
+ handle = dlopen("libX11.so.6", (RTLD_LAZY | RTLD_GLOBAL));
if (handle == 0L)
{
- fprintf(stderr, "kstartperf: Could not dlopen libX11\n");
+ const char * ltdlError = dlerror();
+ fprintf(stderr, "kstartperf: Could not dlopen libX11: %s\n", ltdlError);
exit(1);
}
- KDE_RealXMapWindow = (KDE_XMapRequestSignature)lt_dlsym(handle, "XMapWindow");
+ KDE_RealXMapWindow = (KDE_XMapRequestSignature)dlsym(handle, "XMapWindow");
if (KDE_RealXMapWindow == 0L)
{
fprintf(stderr, "kstartperf: Could not find symbol XMapWindow in libX11\n");
exit(1);
}
- KDE_RealXMapRaised = (KDE_XMapRequestSignature)lt_dlsym(handle, "XMapRaised");
+ KDE_RealXMapRaised = (KDE_XMapRequestSignature)dlsym(handle, "XMapRaised");
if (KDE_RealXMapRaised == 0L)
{
fprintf(stderr, "kstartperf: Could not find symbol XMapRaised in libX11\n");