[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-159-g838f2be

[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  838f2be17173a2d44cc5ace003bf8c83d538a285 (commit)
      from  14815ce80c086d9a4b2395cac5741d685fe2e0ab (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 838f2be17173a2d44cc5ace003bf8c83d538a285
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu May 2 15:41:55 2013 +0000

    Link pinentry with a static libstdc++
    
        This avoids a depedency to libstdc++.dll.
        * src/Makefile.am: Add CXXFLAGS for pinentry to link static
        libstdc++
    
    --
        This should be safe as pinentry neither does exceptions
        nor dynamic loading.
        Qt itself also links libstdc++ statically.

diff --git a/src/Makefile.am b/src/Makefile.am
index 4018e0a..c4ae59a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -236,7 +236,8 @@ gpg4win_pkg_pinentry_configure = \
   --disable-pinentry-gtk \
   --enable-pinentry-gtk2 \
   --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
-  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
+  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
+  CXXFLAGS=-static-libstdc++
 #  --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
 
 # The LDFLAGS is needed for -lintl for glib.  The QT4 variables work

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

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


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