Home | History | Annotate | Download | only in patches
      1 Index: ekiga/configure.ac
      2 ===================================================================
      3 --- ekiga/configure.ac	(revision 7064)
      4 +++ ekiga/configure.ac	(working copy)
      5 @@ -314,12 +314,21 @@
      6  
      7    dnl Checking for the library presence
      8    LIBS_save="$LIBS"
      9 -  LIBS="${LIBS} -L${with_ldap_dir}/${libname}/ -llber"
     10 +
     11 +  if test "x${gm_platform}" != "xsolaris"; then
     12 +  	LIBS="${LIBS} -L${with_ldap_dir}/${libname}/ -llber"
     13 +  else
     14 +  	LIBS="${LIBS} -L${with_ldap_dir}/${libname}/"
     15 +  fi
     16    AC_CHECK_LIB(ldap, main, ldap_libs="yes", ldap_libs="no")
     17    LIBS="${LIBS_save}"
     18  
     19    if test "x${ldap_libs}" != "xno"; then
     20 -  	LDAP_LIBS="-llber -lldap"
     21 +        if test "x${gm_platform}" != "xsolaris"; then
     22 +  		LDAP_LIBS="-lldap -llber"
     23 +	else
     24 +		LDAP_LIBS="-lldap"
     25 +	fi
     26    	if test "x${with_ldap_dir}" != "x/usr"; then
     27    		LDAP_LIBS="-L${with_ldap_dir}/${libname} $LDAP_LIBS"
     28    	fi
     29 Index: ekiga/lib/engine/addressbook/ldap/ldap-book.cpp
     30 ===================================================================
     31 --- ekiga/lib/engine/addressbook/ldap/ldap-book.cpp	(revision 7064)
     32 +++ ekiga/lib/engine/addressbook/ldap/ldap-book.cpp	(working copy)
     33 @@ -375,9 +375,17 @@
     34    updated.emit ();
     35  
     36    ldap_uri = g_strdup_printf ("ldap://%s:%d", hostname.c_str (), port);
     37 +#ifdef SOLARIS  
     38 +  ldap_context = ldap_init ( hostname.c_str(), port);
     39 +#else  
     40    result = ldap_initialize (&ldap_context, ldap_uri);
     41 +#endif  
     42    g_free (ldap_uri);
     43 +#ifdef SOLARIS
     44 +  if (ldap_context == NULL) {
     45 +#else  
     46    if (result != LDAP_SUCCESS) {
     47 +#endif  
     48  
     49      status = std::string (_("Could not initialize server"));
     50      updated.emit ();
     51