[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-38-ga8d29be

[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  a8d29be8a356d016c21c1398342e263361c7fe05 (commit)
       via  02f3d700d26f944d6bdf5dfe074ac2322d53c6af (commit)
      from  250368c66f17ae790b088138300f0ef793631d6c (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 a8d29be8a356d016c21c1398342e263361c7fe05
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 23 12:26:11 2013 +0200

    Only build extra dependencies if necessary
    
        When no extra gpgex host is set there should be no dependencies
        on those packages.
    
        * m4/gpg4win.m4 (GPG4WIN_SPKGEX): Check for GPGEX_ADD_HOST setting.

diff --git a/m4/gpg4win.m4 b/m4/gpg4win.m4
index eeb13c4..91b2efe 100644
--- a/m4/gpg4win.m4
+++ b/m4/gpg4win.m4
@@ -337,19 +337,22 @@ AC_DEFUN([GPG4WIN_SPKGEX],
 [
   GPG4WIN_SPKG([$1],[$2],[$3],[$4])
 
-  # gpg4win_pkg_PKGNAME_deps=DEPS
-  gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_ex_deps="$2"
-  AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_ex_deps)
-
-  gpg4win_ex_pkgs="$gpg4win_ex_pkgs $1"
-
-  GPG4WIN_DEFINE(HAVE_PKG_[]m4_translit([$1],[a-z+-],[A-Z__])_EX)
-  # Record dependencies.  Also enter every package as node.
-  _gpg4win_ex_deps="$_gpg4win_ex_deps $1 $1"
-  AS_IF([test ! -z "$2"],
-        for _gpg4win_i in $2; do
-          _gpg4win_ex_deps="$_gpg4win_ex_deps $_gpg4win_i $1"
-        done)
+  AS_IF([test ! -z "$GPGEX_ADD_HOST"],
+
+    # gpg4win_pkg_PKGNAME_deps=DEPS
+    gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_ex_deps="$2"
+    AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_ex_deps)
+
+    gpg4win_ex_pkgs="$gpg4win_ex_pkgs $1"
+
+    GPG4WIN_DEFINE(HAVE_PKG_[]m4_translit([$1],[a-z+-],[A-Z__])_EX)
+    # Record dependencies.  Also enter every package as node.
+    _gpg4win_ex_deps="$_gpg4win_ex_deps $1 $1"
+    AS_IF([test ! -z "$2"],
+          for _gpg4win_i in $2; do
+            _gpg4win_ex_deps="$_gpg4win_ex_deps $_gpg4win_i $1"
+          done)
+  )
 ])
 
 # GPG4WIN_BPKG_GNUWIN32([PKG],[DEPENDS],[IF-FOUND],[IF-NOT-FOUND])

commit 02f3d700d26f944d6bdf5dfe074ac2322d53c6af
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 23 12:23:24 2013 +0200

    Do not error out if libgcc and libstdc++ not found
    
        They can be optional if you only build the compendium for example.
        So just warn in the missing_opt_tools section.
    
        * configure.ac: Change missing_tools to missing_opt_tools for
        compiler libraries.

diff --git a/configure.ac b/configure.ac
index a3ccdb8..45f7a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,12 +279,12 @@ if test "$libgcc_dll" = "no"; then
   fi
 fi
 if test "$libgcc_dll" = "no"; then
-  missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
+  missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
 else
   if test -r "$libgcc_dll"; then
     cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
   else
-    missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
+    missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
   fi
 fi
 
@@ -300,12 +300,12 @@ if test "$libstdcpp_dll" = "no"; then
   fi
 fi
 if test "$libstdcpp_dll" = "no"; then
-  missing_tools="libstdc++-6.dll $missing_tools"
+  missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
 else
   if test -r "$libstdcpp_dll"; then
     cp $libstdcpp_dll src/libstdc++-6.dll-x
   else
-    missing_tools="libstdc++-6.dll $missing_tools"
+    missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
  fi
 fi
 

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

Summary of changes:
 configure.ac  |    8 ++++----
 m4/gpg4win.m4 |   29 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 17 deletions(-)


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