From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 28 Apr 2009 13:54:35 +0000 (+0200)
Subject: Update gnulib files.
X-Git-Tag: gnutls_2_7_8~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=872582914045517a505d36ecfa50910f47dfdc02;p=thirdparty%2Fgnutls.git

Update gnulib files.
---

diff --git a/maint.mk b/maint.mk
index 229b0dc3a5..b7f68680ba 100644
--- a/maint.mk
+++ b/maint.mk
@@ -113,7 +113,7 @@ endef
 sc_avoid_if_before_free:
 	@$(srcdir)/build-aux/useless-if-before-free			\
 		$(useless_free_options)					\
-	    $$($(VC_LIST_EXCEPT)) &&					\
+	    $$($(VC_LIST_EXCEPT) | grep -v useless-if-before-free) &&	\
 	  { echo '$(ME): found useless "if" before "free" above' 1>&2;	\
 	    exit 1; } || :
 
@@ -191,10 +191,13 @@ sc_prohibit_have_config_h:
 	  { echo '$(ME): found use of HAVE''_CONFIG_H; remove'		\
 		1>&2; exit 1; } || :
 
-# Nearly all .c files must include <config.h>.
+# Nearly all .c files must include <config.h>.  However, we also permit this
+# via inclusion of a package-specific header, if cfg.mk specified one.
+# config_h_header must be suitable for grep -E.
+config_h_header ?= <config\.h>
 sc_require_config_h:
-	@if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then		\
-	  grep -L '^# *include <config\.h>'				\
+	@if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then	\
+	  grep -EL '^# *include $(config_h_header)'			\
 		$$($(VC_LIST_EXCEPT) | grep '\.c$$')			\
 	      | grep . &&						\
 	  { echo '$(ME): the above files do not include <config.h>'	\
@@ -203,12 +206,13 @@ sc_require_config_h:
 	fi
 
 # You must include <config.h> before including any other header file.
+# This can possibly be via a package-specific header, if given by cfg.mk.
 sc_require_config_h_first:
 	@if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then	\
 	  fail=0;							\
 	  for i in $$($(VC_LIST_EXCEPT) | grep '\.c$$'); do		\
 	    grep '^# *include\>' $$i | sed 1q				\
-		| grep '^# *include <config\.h>' > /dev/null		\
+		| grep -E '^# *include $(config_h_header)' > /dev/null	\
 	      || { echo $$i; fail=1; };					\
 	  done;								\
 	  test $$fail = 1 &&						\