[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_5-7-ge455844

[Simon Josefsson]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=e4558449efb98f1d8898b7097b8431ba43bb5e32

The branch, gnutls_2_8_x has been updated
       via  e4558449efb98f1d8898b7097b8431ba43bb5e32 (commit)
       via  66737459c55519a32c16809a41ca64e84b1ac7a1 (commit)
      from  6e51d216d8346cd7bd40107eb1449da316e9ff0c (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 e4558449efb98f1d8898b7097b8431ba43bb5e32
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 6 17:23:34 2009 +0100

    Add.

commit 66737459c55519a32c16809a41ca64e84b1ac7a1
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 6 17:21:43 2009 +0100

    Fix --disable-valgrind-tests.

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

Summary of changes:
 NEWS           |    7 ++++++-
 configure.ac   |    2 +-
 m4/valgrind.m4 |   15 +++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 23abae2..6b856d8 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,12 @@ See the end for copying conditions.
 
 * Version 2.8.6 (unreleased)
 
-** libgnutls: Cleanups and several bug fixes found by Steve Grubb and Tomas 
Mraz.
+** libgnutls: Cleanups and several bug fixes.
+Found by Steve Grubb and Tomas Mraz.
+
+** Fix --disable-valgrind-tests.
+Reported by Ingmar Vanhassel in
+<https://savannah.gnu.org/support/?107029>.
 
 ** API and ABI modifications:
 No changes since last version.
diff --git a/configure.ac b/configure.ac
index 19d87e5..bbcfc10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,7 +296,7 @@ AC_MSG_NOTICE([summary of build options:
   Compiler:         ${CC}
   Warning flags:    errors: ${WERROR_CFLAGS} warnings: ${WARN_CFLAGS}
   Library types:    Shared=${enable_shared}, Static=${enable_static}
-  Valgrind:         ${VALGRIND}
+  Valgrind:         $opt_valgrind_tests ${VALGRIND}
   Guile wrappers:   $opt_guile_bindings
   C++ library:      $use_cxx
   OpenSSL library:  $enable_openssl
diff --git a/m4/valgrind.m4 b/m4/valgrind.m4
index 5a8006a..e22370f 100644
--- a/m4/valgrind.m4
+++ b/m4/valgrind.m4
@@ -1,4 +1,4 @@
-# valgrind.m4 serial 1
+# valgrind.m4 serial 2
 dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,20 +11,23 @@ dnl From Simon Josefsson
 # Check if valgrind is available, and set VALGRIND to it if available.
 AC_DEFUN([sj_VALGRIND],
 [
+  AC_ARG_ENABLE(valgrind-tests,
+    AS_HELP_STRING([--enable-valgrind-tests],
+                   [run self tests under valgrind]),
+    [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
+
   # Run self-tests under valgrind?
-  if test "$cross_compiling" = no; then
+  if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
+
   if test -n "$VALGRIND" && $VALGRIND true > /dev/null 2>&1; then
     opt_valgrind_tests=yes
   else
     opt_valgrind_tests=no
     VALGRIND=
   fi
+
   AC_MSG_CHECKING([whether self tests are run under valgrind])
-  AC_ARG_ENABLE(valgrind-tests,
-    AS_HELP_STRING([--enable-valgrind-tests],
-                   [run self tests under valgrind]),
-    opt_valgrind_tests=$enableval)
   AC_MSG_RESULT($opt_valgrind_tests)
 ])


hooks/post-receive
-- 
GNU gnutls