[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.1-40-g6579da5

[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 "GnuPG for Windows".

The branch, master has been updated
       via  6579da5dd019fdc1bc45ccb8437c9c2319cd64b6 (commit)
      from  e87712de145fe2b8b0a071596bbfcfda6dba2d82 (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 6579da5dd019fdc1bc45ccb8437c9c2319cd64b6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 19 10:16:10 2014 +0200

    Set lib and includedir explicitly for curl
    
        * src/Makefile.am (gpg4win_pkg_curl_configure): Set lib
        and includedir explicitly.
    
    --
        Curl now uses pkg-config to find gnutls, this fails as
        gnutls is not configured to be installed in the stow directory
        and pkg-config does not report this directory as libdir
        for gnutls. So set LIBS and CPPFLAGS to look for includes
        and libaries in the installation prefix.

diff --git a/src/Makefile.am b/src/Makefile.am
index 072a9b1..ee34e84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -305,7 +305,8 @@ gpg4win_pkg_gnutls_make_args = \
 
 
 gpg4win_pkg_curl_configure = \
-  --with-gnutls --without-ca-bundle --with-libiconv-prefix=$(idir)
+  --with-gnutls --without-ca-bundle --with-libiconv-prefix=$(idir) \
+  CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
 
 gpg4win_pkg_libxml2_configure = \
   --enable-shared --without-python --with-iconv=$(idir)

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

Summary of changes:
 src/Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org