[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-276-g477aaba

[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, master has been updated
       via  477aabaf753f987987f7a2e1f999a499ea3bd103 (commit)
       via  aba53e9f96d0c9b270edef0806976a56326249c4 (commit)
       via  161ea8c8229a0f59626bae05ce300313477500c3 (commit)
       via  75ba215ebd8be7e14b26bb53ef3c7d41e4ce1e02 (commit)
      from  101a54add351ff62793cbfbf3877787c4791f833 (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 477aabaf753f987987f7a2e1f999a499ea3bd103
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 9 15:36:35 2014 +0100

    Fix test for zlib.
    
    * configure.ac (HAVE_ZLIB): Define only if found.

diff --git a/configure.ac b/configure.ac
index 96b023a..03a2c27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1362,12 +1362,13 @@ if test "$use_zip" = yes ; then
     ])
 
   AC_CHECK_HEADER(zlib.h,
-        AC_CHECK_LIB(z, deflateInit2_,
-         ZLIBS="-lz",
-         CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
-         CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
-
-  AC_DEFINE(HAVE_ZIP,1, [Defined if ZIP and ZLIB are supported])
+     AC_CHECK_LIB(z, deflateInit2_,
+       [
+       ZLIBS="-lz"
+       AC_DEFINE(HAVE_ZIP,1, [Defined if ZIP and ZLIB are supported])
+       ],
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
 fi
 
 

commit aba53e9f96d0c9b270edef0806976a56326249c4
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 8 16:47:46 2014 +0100

    Add --enable-silent-rules stuff.
    
    * configure.ac: Add AM_SILENT_RULES.

diff --git a/configure.ac b/configure.ac
index a206188..96b023a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -544,6 +544,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AM_SILENT_RULES
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP

commit 161ea8c8229a0f59626bae05ce300313477500c3
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 8 17:03:21 2014 +0100

    Add i686-w64-mingw32 as w32 toolchain to autogen.sh.
    
    --

diff --git a/autogen.sh b/autogen.sh
index 935a456..05ed1f2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -129,7 +129,7 @@ if [ "$myhost" = "w32" ]; then
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
-          toolprefixes="$w32_toolprefixes i586-mingw32msvc"
+          toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
           toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
           extraoptions="--enable-gpgtar $w32_extraoptions"
           ;;

commit 75ba215ebd8be7e14b26bb53ef3c7d41e4ce1e02
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 8 11:47:07 2014 +0100

    w32: Add macro for the registry key.
    
    * configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define.
    * common/homedir.c (default_homedir): Use it.
    * common/logging.c (do_logv): Use it.

diff --git a/common/homedir.c b/common/homedir.c
index 682df9a..77622a1 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -222,7 +222,7 @@ default_homedir (void)
               char *tmp;
 
               tmp = read_w32_registry_string (NULL,
-                                              "Software\\GNU\\" GNUPG_NAME,
+                                              GNUPG_REGISTRY_DIR,
                                               "HomeDir");
               if (tmp && !*tmp)
                 {
diff --git a/common/logging.c b/common/logging.c
index e94cdaf..2b5bb2d 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -636,7 +636,7 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
 
       tmp = (no_registry
              ? NULL
-             : read_w32_registry_string (NULL, "Software\\GNU\\"GNUPG_NAME,
+             : read_w32_registry_string (NULL, GNUPG_REGISTRY_DIR,
                                          "DefaultLogFile"));
       log_set_file (tmp && *tmp? tmp : NULL);
       jnlib_free (tmp);
diff --git a/configure.ac b/configure.ac
index fa841c4..a206188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1600,6 +1600,11 @@ AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr",
 
 AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])
 
+if test "$have_w32_system" = yes; then
+  AC_DEFINE_UNQUOTED(GNUPG_REGISTRY_DIR, "\\Software\\GNU\\GnuPG",
+                     [The directory part of the W32 registry keys])
+fi
+
 
 #
 # Provide information about the build.

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

Summary of changes:
 autogen.sh       |    2 +-
 common/homedir.c |    2 +-
 common/logging.c |    2 +-
 configure.ac     |   19 +++++++++++++------
 4 files changed, 16 insertions(+), 9 deletions(-)


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