Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Fri, 27 Oct 2017 11:56:15 +0000 (13:56 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 27 Oct 2017 11:56:15 +0000 (13:56 +0200)
--
Resolved Conflicts:
configure.ac - Adjust due to new log_clock otions

1  2 
configure.ac
g10/keygen.c
sm/gpgsm.c
sm/gpgsm.h

diff --cc configure.ac
@@@ -1680,19 -1666,15 +1674,28 @@@ AC_ARG_ENABLE(optimization
                     fi])
  
  #
 +# log_debug has certain requirements which might hamper portability.
 +# Thus we use an option to enable it.
 +#
 +AC_MSG_CHECKING([whether to enable log_clock])
 +AC_ARG_ENABLE(log_clock,
 +              AC_HELP_STRING([--enable-log-clock],
 +                             [enable log_clock timestamps]),
 +              enable_log_clock=$enableval, enable_log_clock=no)
 +AC_MSG_RESULT($enable_log_clock)
 +if test "$enable_log_clock" = yes ; then
 +  AC_DEFINE(ENABLE_LOG_CLOCK,1,[Defined to use log_clock timestamps])
 +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
diff --cc g10/keygen.c
Simple merge
diff --cc sm/gpgsm.c
Simple merge
diff --cc sm/gpgsm.h
Simple merge