From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Mon, 18 Feb 2002 21:11:01 +0000 (+0000)
Subject: we're loading functions explicitly from dynamically loaded so's, so remove explicit... 
X-Git-Tag: rel_0_7_2~2
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8ebef0a87aca3e6cdebd517521d84a216f265445;hp=2db1dd255c3fcd9e7d4c3d4ec0cbd8967cade582

we're loading functions explicitly from dynamically loaded so's, so remove explicit func checks
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index cc615e201..5ed079fe7 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-02-18 [alfons]	0.7.1claws13
+
+	* src/syldap.c
+	* src/jpilot.c
+		remove references to dlfcn and explicitly loading functions
+		from dynalink libs, because libs linked anyway, and functions
+		are loaded explicitly
+
 2002-02-17 [melvin]	0.7.1claws12
 
 	* src/prefs_actions.c
diff --git a/configure.in b/configure.in
index 977b7f4a7..3e25bad21 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws12
+EXTRA_VERSION=claws13
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/jpilot.c b/src/jpilot.c
index 629c3e539..046cdb1dc 100644
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <dlfcn.h>
 #include <netinet/in.h>
 
 #ifdef HAVE_LIBPISOCK_PI_ARGS_H
@@ -1622,26 +1621,6 @@ gboolean jpilot_test_custom_label( JPilotFile *pilotFile, const gchar *labelName
 * Return: TRUE if library available.
 */
 gboolean jpilot_test_pilot_lib( void ) {
-	void *handle, *fun;
-
-	handle = dlopen( PILOT_LINK_LIB_NAME, RTLD_LAZY );
-	if( ! handle ) {
-		return FALSE;
-	}
-
-	/* Test for symbols we need */
-	fun = dlsym( handle, "unpack_Address" );
-	if( ! fun ) {
-		dlclose( handle );
-		return FALSE;
-	}
-
-	fun = dlsym( handle, "unpack_AddressAppInfo" );
-	if( ! fun ) {
-		dlclose( handle );
-		return FALSE;
-	}
-	dlclose( handle );
 	return TRUE;
 }
 
diff --git a/src/syldap.c b/src/syldap.c
index 1d3bcffc8..f844bfe0f 100644
--- a/src/syldap.c
+++ b/src/syldap.c
@@ -35,7 +35,6 @@
 #include <ldap.h>
 #include <lber.h>
 #include <pthread.h>
-#include <dlfcn.h>
 
 #include "mgutils.h"
 #include "addritem.h"
@@ -1058,65 +1057,11 @@ gboolean syldap_test_connect( SyldapServer *ldapServer ) {
 	return retVal;
 }
 
-#define LDAP_LINK_LIB_NAME_1 "libldap.so"
-#define LDAP_LINK_LIB_NAME_2 "liblber.so"
-#define LDAP_LINK_LIB_NAME_3 "libresolv.so"
-#define LDAP_LINK_LIB_NAME_4 "libpthread.so"
-
 /*
 * Test whether LDAP libraries installed.
 * Return: TRUE if library available.
 */
 gboolean syldap_test_ldap_lib() {
-	void *handle, *fun;
-	
-	/* Get library */
-	handle = dlopen( LDAP_LINK_LIB_NAME_1, RTLD_LAZY );
-	if( ! handle ) {
-		return FALSE;
-	}
-
-	/* Test for symbols we need */
-	fun = dlsym( handle, "ldap_init" );
-	if( ! fun ) {
-		dlclose( handle );
-		return FALSE;
-	}
-	dlclose( handle ); handle = NULL; fun = NULL;
-
-	handle = dlopen( LDAP_LINK_LIB_NAME_2, RTLD_LAZY );
-	if( ! handle ) {
-		return FALSE;
-	}
-	fun = dlsym( handle, "ber_init" );
-	if( ! fun ) {
-		dlclose( handle );
-		return FALSE;
-	}
-	dlclose( handle ); handle = NULL; fun = NULL;
-
-	handle = dlopen( LDAP_LINK_LIB_NAME_3, RTLD_LAZY );
-	if( ! handle ) {
-		return FALSE;
-	}
-	fun = dlsym( handle, "res_query" );
-	if( ! fun ) {
-		dlclose( handle );
-		return FALSE;
-	}
-	dlclose( handle ); handle = NULL; fun = NULL;
-
-	handle = dlopen( LDAP_LINK_LIB_NAME_4, RTLD_LAZY );
-	if( ! handle ) {
-		return FALSE;
-	}
-	fun = dlsym( handle, "pthread_create" );
-	if( ! fun ) {
-		dlclose( handle );
-		return FALSE;
-	}
-	dlclose( handle ); handle = NULL; fun = NULL;
-
 	return TRUE;
 }