we're loading functions explicitly from dynamically loaded so's, so remove explicit...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index cc615e201ce686b80ab077a23810a120aa3cd252..5ed079fe74c10d4b3b492a866501c30a0647300a 100644 (file)
--- 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 977b7f4a74cf9ee1b1c75edf7ac0dab6724d3d40..3e25bad21cc5505186270c1e29f3f3257ba67c60 100644 (file)
--- 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 629c3e5390790ebb0c4860c53a5e2f4788c268a6..046cdb1dcab2c204dd60925c46354c1edd8ebb65 100644 (file)
--- 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 1d3bcffc8a465d29eb8029b2dfc95aaf18c55cc5..f844bfe0f85995668a64735579e71b27db7edf28 100644 (file)
--- 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;
 }