From a2eb92ef60dd05e9423948534ab483f7ffeb0647 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Tue, 19 Jul 2011 17:22:49 +0100
Subject: [PATCH] getopt-gnu: suppress core dumps from detection code
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Use the nocrash module
to suppress core dumps that may well occur on glibc systems.
These core dumps might not be cleaned up automatically, or could
trigger some system core dump handling logic.
* modules/getopt-gnu: Depend on nocrash.

Signed-off-by: Pádraig Brady <P@draigBrady.com>
---
 ChangeLog          | 7 +++++++
 m4/getopt.m4       | 4 ++++
 modules/getopt-gnu | 1 +
 3 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a521e9b2bd..e72af4c8c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-19  Pádraig Brady  <P@draigBrady.com>
+
+	getopt-gnu: suppress core dumps from detection code
+	* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Use the nocrash module
+	to suppress core dumps that may well occur on glibc systems.
+	* modules/getopt-gnu: Depend on nocrash.
+
 2011-07-16  Paul Eggert  <eggert@cs.ucla.edu>
 
 	pthread_sigmask: ensure usleep is declared
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 7e49ddde9f..047a3db022 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -231,8 +231,12 @@ dnl is ambiguous with environment values that contain newlines.
         [AC_LANG_PROGRAM([[#include <getopt.h>
                            #include <stddef.h>
                            #include <string.h>
+           ]GL_NOCRASH[
            ]], [[
              int result = 0;
+
+             nocrash_init();
+
              /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
                 and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
                 OSF/1 5.1, Solaris 10.  */
diff --git a/modules/getopt-gnu b/modules/getopt-gnu
index 3e5876a1b9..6ad3643aa7 100644
--- a/modules/getopt-gnu
+++ b/modules/getopt-gnu
@@ -5,6 +5,7 @@ process command line arguments.
 Files:
 
 Depends-on:
+nocrash
 getopt-posix
 
 configure.ac:
-- 
2.30.2