[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.21-8-g4d93e5e

[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 Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  4d93e5e3cfb5e017bcdf58e8e9ecce11a2870192 (commit)
      from  755f92e2afaa7be32e4d60253971724639b99c16 (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 4d93e5e3cfb5e017bcdf58e8e9ecce11a2870192
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:05:08 2013 +0200

    gpgtar: Fix building for systems with a separate libintl.
    
    * tools/Makefile.am (gpgtar_LDADD): Add LIBINTL.
    --
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 12990efb45ee7c425167aad19fe759d5609c5182)
    
    Resolved conflicts:
    	tools/Makefile.am => Libiconv was already there.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index a94fbcd..cc782a3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -119,7 +119,7 @@ gpgtar_SOURCES = \
 	no-libgcrypt.c
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
 gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
-               $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.

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

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


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