[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-52-g76ff42e

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  76ff42ef8d1232dd36bf48c1020b0b9b2afb1c7d (commit)
      from  b817ae7df947093384a25797999a9aa187e20f9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 76ff42ef8d1232dd36bf48c1020b0b9b2afb1c7d
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Thu Feb 16 17:51:20 2012 +0100

    Check for lber and link dirmngr_ldap to it.
    
    * configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
    * dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).

diff --git a/configure.ac b/configure.ac
index 47c6d12..6aadaa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1009,7 +1009,14 @@ AM_CONDITIONAL(USE_DNS_SRV, test x"$use_dns_srv" = xyes)
 #
 if test "$try_ks_ldap" = yes || test "$build_dirmngr" = "yes" ; then
    GNUPG_CHECK_LDAP($NETLIBS)
+   AC_CHECK_LIB(lber, ber_free,
+                [ LBER_LIBS="$LBER_LIBS -llber"
+                  AC_DEFINE(HAVE_LBER,1,
+                           [defined if liblber is available])
+                  have_lber=yes
+               ])
 fi
+AC_SUBST(LBER_LIBS)
 
 #
 # Check for curl.  We fake the curl API if libcurl isn't installed.
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index c5f073e..7c43165 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -72,7 +72,8 @@ dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
 dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 dirmngr_ldap_LDFLAGS =
 dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o ../gl/libgnu.a $(DNSLIBS) \
-		     $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LIBINTL) $(LIBICONV)
+		     $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \
+		     $(LIBICONV)
 endif
 
 dirmngr_client_SOURCES = dirmngr-client.c

-----------------------------------------------------------------------

Summary of changes:
 configure.ac        |    7 +++++++
 dirmngr/Makefile.am |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org