[SCM] GNU libtasn1 branch, master, updated. libtasn1_2_10-28-gdbb8437

[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 libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=dbb84372b3bb58c30352d8e3c5edd2588fae4a54

The branch, master has been updated
       via  dbb84372b3bb58c30352d8e3c5edd2588fae4a54 (commit)
      from  2d16a1396d565e56e317488bb66c5d89b13fe158 (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 dbb84372b3bb58c30352d8e3c5edd2588fae4a54
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 25 00:23:10 2011 +0100

    Fix valgrind check.

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

Summary of changes:
 gl/m4/gnulib-common.m4                |    2 +-
 gl/m4/valgrind-tests.m4               |    9 ++++++---
 gl/override/m4/valgrind-tests.m4.diff |   20 ++++++++++----------
 lib/glm4/gnulib-common.m4             |    2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index 7d83299..8621dec 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -18,7 +18,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
 #  define _Noreturn __attribute__ ((__noreturn__))
-# elif 1200 <= _MSC_VER
+# elif defined _MSC_VER && 1200 <= _MSC_VER
 #  define _Noreturn __declspec (noreturn)
 # else
 #  define _Noreturn
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 1ffa2ed..f1838d1 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -1,4 +1,4 @@
-# valgrind-tests.m4 serial 2
+# valgrind-tests.m4 serial 3
 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,9 +21,12 @@ AC_DEFUN([gl_VALGRIND_TESTS],
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
-  if test -n "$VALGRIND" && $VALGRIND -q true > /dev/null 2>&1; then
+  OPTS="-q --error-exitcode=1 --leak-check=no"
+
+  if test -n "$VALGRIND" \
+     && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
     opt_valgrind_tests=yes
-    VALGRIND="$VALGRIND -q --error-exitcode=1 --leak-check=no"
+    VALGRIND="$VALGRIND $OPTS"
   else
     opt_valgrind_tests=no
     VALGRIND=
diff --git a/gl/override/m4/valgrind-tests.m4.diff 
b/gl/override/m4/valgrind-tests.m4.diff
index 4cbfd45..f77d993 100644
--- a/gl/override/m4/valgrind-tests.m4.diff
+++ b/gl/override/m4/valgrind-tests.m4.diff
@@ -1,11 +1,11 @@
---- gl/m4/valgrind-tests.m4.orig       2011-04-24 10:35:32.482365841 +0200
-+++ gl/m4/valgrind-tests.m4    2011-04-24 10:34:56.006869280 +0200
-@@ -23,7 +23,7 @@
+--- gl/m4/valgrind-tests.m4.orig       2011-11-25 00:22:13.922991882 +0100
++++ gl/m4/valgrind-tests.m4    2011-11-25 00:22:23.114450252 +0100
+@@ -21,7 +21,7 @@
+     AC_CHECK_PROGS(VALGRIND, valgrind)
+   fi
  
-   if test -n "$VALGRIND" && $VALGRIND -q true > /dev/null 2>&1; then
-     opt_valgrind_tests=yes
--    VALGRIND="$VALGRIND -q --error-exitcode=1 --leak-check=full"
-+    VALGRIND="$VALGRIND -q --error-exitcode=1 --leak-check=no"
-   else
-     opt_valgrind_tests=no
-     VALGRIND=
+-  OPTS="-q --error-exitcode=1 --leak-check=full"
++  OPTS="-q --error-exitcode=1 --leak-check=no"
+ 
+   if test -n "$VALGRIND" \
+      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/lib/glm4/gnulib-common.m4 b/lib/glm4/gnulib-common.m4
index 7d83299..8621dec 100644
--- a/lib/glm4/gnulib-common.m4
+++ b/lib/glm4/gnulib-common.m4
@@ -18,7 +18,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
 #  define _Noreturn __attribute__ ((__noreturn__))
-# elif 1200 <= _MSC_VER
+# elif defined _MSC_VER && 1200 <= _MSC_VER
 #  define _Noreturn __declspec (noreturn)
 # else
 #  define _Noreturn


hooks/post-receive
-- 
GNU libtasn1