[Pkg-gnupg-commit] [gnupg2] 192/292: w32: Fix PKG_CONFIG_LIBDIR in --build-w32

Daniel Kahn Gillmor dkg at fifthhorseman.net
Mon Nov 21 06:31:41 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

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>
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list