fine tune ldap library detection

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d996c53d885a865d741254e4e8389cb15e31f0b9..1ea921c5d86fb56357c7d918b7b9199bbc6a2d36 100644 (file)
--- 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
 2002-06-25 [alfons]    0.7.8claws26
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 870da77de4f5510f35942e86f3ed70b7a1c31428..82ca88a8f39934428feaa9d37b02e30914538954 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target


@@ -165,22 +165,41 @@ else
 fi
 
 dnl for LDAP support in addressbook
 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)
 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_CHECK_HEADERS(ldap.h lber.h pthread.h,

-                        [ AC_DEFINE(USE_LDAP) ],
+                        [ ac_cv_enable_ldap=yes ],

                         [ ac_cv_enable_ldap=no ])
                         [ 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
        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)
        fi
 else
        AC_MSG_RESULT(no)

diff --git a/src/Makefile.am b/src/Makefile.am
index 94ac7ba6402cef8df457db6d548f301f213aecb3..c41e7268daa4c8bb2b901e7ddac63b57e7ee27fa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -228,7 +228,8 @@ sylpheed_LDADD = \
        $(GDK_IMLIB_LIBS) \
        $(GDK_PIXBUF_LIBS) \
        $(GPGME_LIBS) \
        $(GDK_IMLIB_LIBS) \
        $(GDK_PIXBUF_LIBS) \
        $(GPGME_LIBS) \

-        $(PSPELL_LIBS)
+        $(PSPELL_LIBS) \
+       $(LDAP_LIBS)

 
 CPPFLAGS = \
        -DLOCALEDIR=\""$(localedir)"\" \
 
 CPPFLAGS = \
        -DLOCALEDIR=\""$(localedir)"\" \