[git] GnuPG - branch, master, updated. gnupg-2.1.12-49-g79b7a8a

[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  79b7a8a9e0d41b743ceaee20dc47294359fe0d44 (commit)
      from  8d976a6b07c5a356631791b46b590328c1451f31 (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 79b7a8a9e0d41b743ceaee20dc47294359fe0d44
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Jun 4 18:45:37 2016 +0200

    w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
    
    * configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
    * build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
      --enable-build-timestamp.
    --
    
    Debian-bug-id: 826309
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index d286655..67ccbb4 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -448,7 +448,9 @@ speedo_pkg_libgcrypt_configure = --disable-static
 speedo_pkg_libksba_configure = --disable-static
 
 ifeq ($(TARGETOS),w32)
-speedo_pkg_gnupg_configure = --enable-gpg2-is-gpg --disable-g13 --disable-ntbtls
+speedo_pkg_gnupg_configure = \
+        --enable-gpg2-is-gpg --disable-g13 --disable-ntbtls \
+        --enable-build-timestamp
 else
 speedo_pkg_gnupg_configure = --disable-g13
 endif
diff --git a/configure.ac b/configure.ac
index 07d728a..1b8a6fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1776,12 +1776,13 @@ AC_ARG_ENABLE([build-timestamp],
         BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
       else
         BUILD_TIMESTAMP="$enableval"
-      fi],
-     [BUILD_TIMESTAMP="<none>"])
+      fi
+      BUILD_HOSTNAME="$ac_hostname"],
+     [BUILD_TIMESTAMP="<none>"
+      BUILD_HOSTNAME="<anon>"])
 AC_SUBST(BUILD_TIMESTAMP)
 AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
                    [The time this package was configured for a build])
-BUILD_HOSTNAME="$ac_hostname"
 AC_SUBST(BUILD_HOSTNAME)
 
 

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

Summary of changes:
 build-aux/speedo.mk | 4 +++-
 configure.ac        | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)


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