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

List:       kde-commits
Subject:    KDE/kdebase/kioslave/ldap
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2005-07-23 22:54:19
Message-ID: 1122159259.229651.28903.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 438027 by gyurco:

Seperate test for -llber. Patch by Jonathan Marten.

BUG: 81957



 M  +22 -13    configure.in.in  


--- trunk/KDE/kdebase/kioslave/ldap/configure.in.in #438026:438027
@@ -1,4 +1,4 @@
-AC_MSG_CHECKING(whether to compile LDAP support)
+AC_MSG_CHECKING(for LDAP support)
 AC_ARG_WITH(ldap,
 AC_HELP_STRING([--with-ldap=PATH],[Set path for LDAP files [default=check]]),
 [ case "$withval" in
@@ -27,7 +27,7 @@
           LDAP_LIBS="-L$ldap_libdir "
           test "$USE_RPATH" = yes && LDAP_RPATH="-R $ldap_libdir"
         fi
-        LDAP_LIBS="${LDAP_LIBS}-lldap -llber ${LIBRESOLV}"
+        LDAP_LIBS="${LDAP_LIBS}-lldap"
         with_ldap=FOUND
         break
       fi
@@ -43,12 +43,22 @@
   LDAP_SUBDIR="ldap"
   AC_MSG_RESULT(Apple framework)
   ;;
+FOUND)
+  AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir)
+  ;;
 NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
 *)
-  if test "x$with_ldap" = "xFOUND" ; then
-    msg="incs=$ldap_incdir libs=$ldap_libdir"
-  else
-    msg="$with_ldap"
+  AC_MSG_RESULT($with_ldap)
+  ;;
+esac
+
+LIB_LBER=
+KDE_CHECK_LIB(lber, ber_alloc, [LIB_LBER=-llber], [], -L$ldap_libdir)
+AC_SUBST(LIB_LBER)
+
+AC_MSG_CHECKING(whether LDAP support can be compiled)
+
+  if test "x$with_ldap" != "xFOUND" ; then
     LDAP_ROOT="$with_ldap"
     if test "x$LDAP_ROOT" != "x/usr" ; then
       LDAP_INCS="-I${LDAP_ROOT}/include"
@@ -57,8 +67,10 @@
         LDAP_RPATH="-R ${LDAP_ROOT}/lib"
       fi
     fi
-    LDAP_LIBS="${LDAP_LIBS}-lldap -llber ${LIBRESOLV}"
+    LDAP_LIBS="${LDAP_LIBS}-lldap"
   fi
+  LDAP_LIBS="${LDAP_LIBS} ${LIB_LBER} ${LIBRESOLV}"
+
   kde_safe_LIBS="$LIBS"
   kde_safe_CFLAGS="$CFLAGS"
   LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
@@ -67,10 +79,9 @@
   AC_LANG_C
   AC_TRY_LINK(dnl
   [
-  #include <lber.h>
   #include <ldap.h>
-  #if LDAP_VENDOR_VERSION < 20000
-  #error OpenLDAP version too old, please upgrade to version 2 or higher
+  #if LDAP_API_VERSION < 2004
+  #error LDAP version too old, please upgrade to a library supporting API 2004 or higher
   #endif
   ],
   [
@@ -90,10 +101,8 @@
   else
     AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries])
     LDAP_SUBDIR="ldap"
-    AC_MSG_RESULT($msg)
+    AC_MSG_RESULT(yes)
   fi
-  ;;
-esac
 
 AC_SUBST(LDAP_INCS)
 AC_SUBST(LDAP_LIBS)
[prev in list] [next in list] [prev in thread] [next in thread]