[git] GPA - branch, master, updated. gpa-0.9.2-7-g25ed941

[by Werner Koch]

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 Assistant".

The branch, master has been updated
       via  25ed9419447071b8d1a3cde4f3b6691d013ebb2c (commit)
      from  65f809292bd20ab7b7d58ad94ede252e5fb294b5 (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 25ed9419447071b8d1a3cde4f3b6691d013ebb2c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 7 09:30:49 2012 +0200

    Try to figure the keyserver helper directory using gpg2keys.
    
    * configure.ac: Check for gpg2keys_ldap.  Check in directory
    /usr/lib/gnupg2.

diff --git a/configure.ac b/configure.ac
index 5b478bb..778b1ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,8 +157,9 @@ if test -z "$GPG"; then
 fi
 
 dnl Find the keyserver plugins. Assume that gpgkeys_ldap is always available
-AC_PATH_PROG(GPGKEYS_LDAP, gpgkeys_ldap, [${libexecdir}/gnupg/gpgkeys_ldap],
-             [$PATH:/usr/libexec/gnupg/:/usr/lib/gnupg/])
+AC_PATH_PROGS(GPGKEYS_LDAP, gpg2keys_ldap gpgkeys_ldap,
+             [${libexecdir}/gnupg/gpg2keys_ldap],
+             [$PATH:/usr/libexec/gnupg:/usr/lib/gnupg2:/usr/lib/gnupg])
 KEYSERVER_HELPERS_DIR=`dirname $GPGKEYS_LDAP`
 if test -z "$KEYSERVER_HELPERS_DIR"; then
        AC_MSG_ERROR([[

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

Summary of changes:
 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


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