[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.1-21-g812fe29

[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-2 has been updated
       via  812fe29bff42cf7dbd07e0becc55b2ada340dd97 (commit)
       via  e417aaf69817fcb4a73c38077853dc940a2deabc (commit)
      from  1067403c8a7fb51decf30059e46901b5ee9f5b37 (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 812fe29bff42cf7dbd07e0becc55b2ada340dd97
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 24 18:42:37 2017 +0200

    build: New configure option --enable-werror
    
    * configure.ac: Implement that option.
    --
    
    This can be used as a workaround in case of bogus autoconf tests.
    
    GnuPG-bug-id: 2423
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 1f933a7..551c970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1666,6 +1666,17 @@ AC_ARG_ENABLE(optimization,
                    fi])
 
 #
+# Add -Werror to CFLAGS.  This hack can be used to avoid problems with
+# misbehaving autoconf tests in case the user supplied -Werror.
+#
+AC_ARG_ENABLE(werror,
+   AC_HELP_STRING([--enable-werror],
+                  [append -Werror to CFLAGS]),
+                  [if test $enableval = yes ; then
+                      CFLAGS="$CFLAGS -Werror"
+                   fi])
+
+#
 # Configure option --enable-all-tests
 #
 AC_MSG_CHECKING([whether "make check" shall run all tests])

commit e417aaf69817fcb4a73c38077853dc940a2deabc
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 24 18:34:28 2017 +0200

    build: Do not mess with CFLAGS in configure.
    
    * configure.ac: Do not mess with the user provided CFLAGS.
    --
    
    A problem was claimed with some configure tests if the user provided
    CFLAGS=-Werror.  The commit introducing this
    
    Fixes-commit: 02eb9fc9d5863abcfed6af704e618f8cac7cc2e8
    
    does not mention a concrete case.  Anyway, messing with CFLAGS is a
    bad idea because configure tests will then test something different
    than what is used later (cf. autoconf manual).  Tests which depend on
    the whether -Werror is used needsto be fixed.
    
    Note that in certain cases we modify CFLAGS.  This is only done for
    some configure options or if the platform requires the use of special
    compiler flags (e.g. on HP/UX).
    
    GnuPG-bug-id: 2423

diff --git a/configure.ac b/configure.ac
index 70c1226..1f933a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,12 +89,6 @@ AB_INIT
 
 AC_GNU_SOURCE
 
-# Before we do anything with the C compiler, we first save the user's
-# CFLAGS (they are restored at the end of the configure script).  This
-# is because some configure checks don't work with -Werror, but we'd
-# like to use -Werror with our build.
-CFLAGS_orig=$CFLAGS
-CFLAGS=
 
 # Some status variables.
 have_gpg_error=no
@@ -1701,11 +1695,6 @@ if test x"$gnupg_builddir_envvar" = x"yes"; then
 fi
 
 #
-# Add user CFLAGS.
-#
-CFLAGS="$CFLAGS $CFLAGS_orig"
-
-#
 # Decide what to build
 #
 

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

Summary of changes:
 configure.ac | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)


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