[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-56-gbde225a

[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=bde225af952fd3c607c0dab254e0eca8c076c836

The branch, master has been updated
       via  bde225af952fd3c607c0dab254e0eca8c076c836 (commit)
      from  ef11b756916c9961d63b373b06ec229841cc07a9 (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 bde225af952fd3c607c0dab254e0eca8c076c836
Author: Simon Josefsson <address@hidden>
Date:   Mon May 31 17:48:09 2010 +0200

    Update gnulib files.

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

Summary of changes:
 GNUmakefile |    6 ++++--
 maint.mk    |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index daba47a..97fea36 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -60,8 +60,10 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
     $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
   _is-install-target ?= $(filter-out %check, $(filter 
install%,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target)$(_is-install-target))
-    _curr-ver := $(shell cd $(srcdir) \
-                   && $(_build-aux)/git-version-gen .tarball-version)
+    _curr-ver := $(shell cd $(srcdir)                          \
+                   && $(_build-aux)/git-version-gen            \
+                         .tarball-version                      \
+                         $(git-version-gen-tag-sed-script))
     ifneq ($(_curr-ver),$(VERSION))
       ifeq ($(_curr-ver),UNKNOWN)
         $(info WARNING: unable to verify if $(VERSION) is the correct version)
diff --git a/maint.mk b/maint.mk
index 1bdd0d5..e526e0f 100644
--- a/maint.mk
+++ b/maint.mk
@@ -689,7 +689,8 @@ define def_sym_regex
            perl -lne '$(gl_extract_significant_defines_)' $$f;         \
          done;                                                         \
        ) | sort -u                                                     \
-         | sed 's/^/^ *# *define /;s/$$/\\>/'
+         | grep -Ev '^ATTRIBUTE_NORETURN'                              \
+         | sed 's/^/^ *# *(define|undef)  */;s/$$/\\>/'
 endef
 
 # Don't define macros that we already get from gnulib header files.
@@ -698,7 +699,7 @@ sc_prohibit_always-defined_macros:
          case $$(echo all: | grep -l -f - Makefile) in Makefile);; *)  \
            echo '$(ME): skipping $@: you lack GNU grep' 1>&2; exit 0;; \
          esac;                                                         \
-         $(def_sym_regex) | grep -f - $$($(VC_LIST_EXCEPT))            \
+         $(def_sym_regex) | grep -E -f - $$($(VC_LIST_EXCEPT))         \
            && { echo '$(ME): define the above via some gnulib .h file' \
                  1>&2;  exit 1; } || :;                                \
        fi


hooks/post-receive
-- 
GNU gnutls