[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kstartperf
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-08-26 20:02:19
Message-ID: 1156622539.715498.3753.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 577480 by mueller:

drop libtool wrapper. 


 M  +1 -1      CMakeLists.txt  
 M  +6 -6      libkstartperf.c  


--- trunk/KDE/kdesdk/kstartperf/CMakeLists.txt #577479:577480
@@ -10,7 +10,7 @@
 
 kde4_add_library(kstartperf SHARED ${kstartperf_LIB_SRCS})
 
-target_link_libraries(kstartperf  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(kstartperf dl)
 
 set_target_properties(kstartperf PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 install(TARGETS kstartperf  DESTINATION ${LIB_INSTALL_DIR} )
--- trunk/KDE/kdesdk/kstartperf/libkstartperf.c #577479:577480
@@ -23,7 +23,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
-#include <ltdl.h>
+#include <dlfcn.h>
 
 
 /* Prototypes */
@@ -64,11 +64,11 @@
 
 void KDE_InterceptXMapRequest(Display * d, Window w)
 {
-    lt_dlhandle handle;
+    void* handle;
 
-    handle = lt_dlopen("libX11.so");
+    handle = dlopen("libX11.so", RTLD_LAZY);
     if (handle == 0L)
-	handle = lt_dlopen("libX11.so.6");
+	handle = dlopen("libX11.so.6", RTLD_LAZY);
 
     if (handle == 0L)
     {
@@ -76,14 +76,14 @@
 	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");
[prev in list] [next in list] [prev in thread] [next in thread]