From b4a1cd05f9ea552ea9205cca2ffe6ec89322c7ee Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Tue, 25 Jun 2002 21:18:44 +0000
Subject: [PATCH] fine tune ldap library detection

---
 ChangeLog.claws |  6 ++++++
 configure.in    | 31 +++++++++++++++++++++++++------
 src/Makefile.am |  3 ++-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d996c53d8..1ea921c5d 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-06-25 [alfons]	0.7.8claws27
+	
+	* configure.in
+	* src/Makefile.am
+		fine tune ldap library detection
+
 2002-06-25 [alfons]	0.7.8claws26
 
 	* src/compose.c
diff --git a/configure.in b/configure.in
index 870da77de..82ca88a8f 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws26
+EXTRA_VERSION=claws27
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -165,22 +165,41 @@ else
 fi
 
 dnl for LDAP support in addressbook
-dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
 	[  --enable-ldap           Enable LDAP support [default=no]],
 	[ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
 AC_MSG_CHECKING([whether to use LDAP])
 if test "$ac_cv_enable_ldap" = yes; then
 	AC_MSG_RESULT(yes)
+
+	dnl check for available libraries, and pull them in
+	AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
+	AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
+	AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
+	AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber")
+
+	dnl we need libpthread for sylpheed ldap,  until we find
+	dnl a better way to handle ldap requests asynchronously...
+	AC_CHECK_LIB(pthread, pthread_create, LDAP_LIBS="$LDAP_LIBS -lpthread")
+
+	dnl the check for the headers 
 	AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
-			 [ AC_DEFINE(USE_LDAP) ],
+			 [ ac_cv_enable_ldap=yes ],
 			 [ ac_cv_enable_ldap=no ])
-	AC_MSG_CHECKING([whether ldap is available])
+	AC_MSG_CHECKING([whether ldap headers were detected])
 	AC_MSG_RESULT($ac_cv_enable_ldap)
 
 	if test "$ac_cv_enable_ldap" = yes; then
-		CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
-		LIBS="$LIBS -lldap -llber -lpthread -lresolv `$GLIB_CONFIG --libs gthread`"
+		AC_CHECK_LIB(ldap, ldap_open, [ 
+				ac_cv_enable_ldap=yes
+				CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
+				LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
+				AC_DEFINE(USE_LDAP)
+				AC_SUBST(LDAP_LIBS)
+				], 
+				[ ac_cv_enable_ldap=no ], $LDAP_LIBS )
+		AC_MSG_CHECKING([whether ldap libs were detected])
+		AC_MSG_RESULT($ac_cv_enable_ldap)
 	fi
 else
 	AC_MSG_RESULT(no)
diff --git a/src/Makefile.am b/src/Makefile.am
index 94ac7ba64..c41e7268d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -228,7 +228,8 @@ sylpheed_LDADD = \
 	$(GDK_IMLIB_LIBS) \
 	$(GDK_PIXBUF_LIBS) \
 	$(GPGME_LIBS) \
-        $(PSPELL_LIBS)
+        $(PSPELL_LIBS) \
+	$(LDAP_LIBS)
 
 CPPFLAGS = \
 	-DLOCALEDIR=\""$(localedir)"\" \
-- 
2.25.1