[git] GnuPG - branch, master, updated. gnupg-2.1.19-39-gb71384c

[by Justus Winter]

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  b71384c8054ce2f245ccfae02b8ee81e1adfc512 (commit)
      from  4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4 (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 b71384c8054ce2f245ccfae02b8ee81e1adfc512
Author: Justus Winter <justus at g10code.com>
Date:   Tue Mar 7 15:34:35 2017 +0100

    Revert "build: Improve CFLAGS handling."
    
    This reverts commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4.

diff --git a/configure.ac b/configure.ac
index 8e2fc43..6d35450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,14 +85,12 @@ AB_INIT
 
 AC_GNU_SOURCE
 
-# Before we do anything with the C compiler, we first split the user's
-# CFLAGS into two lists, one containing all flags matching '-Werror',
-# and the other one containing all remaing flags. They are recombined
-# 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_werror="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -e -Werror | tr '\n' ' ')"
-CFLAGS="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -v -e -Werror | tr '\n' ' ')"
+# 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
@@ -1678,7 +1676,7 @@ fi
 #
 # Add user CFLAGS.
 #
-CFLAGS="$CFLAGS $CFLAGS_werror"
+CFLAGS="$CFLAGS $CFLAGS_orig"
 
 #
 # Decide what to build

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

Summary of changes:
 configure.ac | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)


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