[git] GnuPG - branch, master, updated. gnupg-2.1.15-307-g3b6b8fe

[by Andre Heinecke]

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  3b6b8fe32af7568ff51066d4c2e3679df6dea86f (commit)
      from  7a634e48b13c5d5d295b8fed9b429e1b2109a333 (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 3b6b8fe32af7568ff51066d4c2e3679df6dea86f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 31 11:17:16 2016 +0100

    w32: Fix PKG_CONFIG_LIBDIR in --build-w32
    
    * autogen.sh: Point pkg-config to the right location.
    
    --
    PKG_CONFIG_LIBDIR is located to usually be /usr/lib/pkgconfig so
    in our case it should also point directly to the pkgconfig location
    and not the prefix. This fixes gnutls and sqlite detection.
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/autogen.sh b/autogen.sh
index 10cc203..92c6df8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,7 +311,7 @@ if [ "$myhost" = "w32" ]; then
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${w32root}  \
              --host=${host} --build=${build} SYSROOT=${w32root} \
-             PKG_CONFIG_LIBDIR=${w32root} \
+             PKG_CONFIG_LIBDIR=${w32root}/lib/pkgconfig \
              ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc

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

Summary of changes:
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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