From 88e2f6c860a05fd1471c66cc7bcc9d1fca1da3c7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 10 May 2010 11:06:37 +0200
Subject: [PATCH] tests: provide a definition of gl_trap_ in cfg.mk

* cfg.mk (gl_trap_): Define here, now that it's gone from maint.mk.
* gnulib: Update to latest.
---
 cfg.mk | 7 +++++++
 gnulib | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cfg.mk b/cfg.mk
index 5a71a12..ae05f8c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -115,6 +115,13 @@ sc_x_sc_dist_check:
 	  > $@-t
 	@mv $@-t $@
 
+define gl_trap_
+  Exit () { set +e; (exit $$1); exit $$1; };				\
+  for sig in 1 2 3 13 15; do						\
+    eval "trap 'Exit $$(expr $$sig + 128)' $$sig";			\
+  done
+endef
+
 # Files in src/ should not include directly any of
 # the headers already included via system.h.
 sc_system_h_headers: .re-list
diff --git a/gnulib b/gnulib
index 880f2b6..204e7fe 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 880f2b69df57af506439d6aaf1fe185a6f960e43
+Subproject commit 204e7feaf617b2e14fdf1226dfaf858e984c1737
-- 
2.7.4