From: Bruno Haible <bruno@clisp.org>
Date: Tue, 19 Jun 2012 10:11:04 +0000 (+0200)
Subject: getopt-gnu: Fix exit code overflow in autoconf test.
X-Git-Tag: v0.1~614
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=38aceb40ff9930056a32c1d7306145b30d333a1a

getopt-gnu: Fix exit code overflow in autoconf test.

* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Squash exit code values,
to keep them below < 128.
---

diff --git a/ChangeLog b/ChangeLog
index b3635c62b..0253664be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-19  Bruno Haible  <bruno@clisp.org>
+
+	getopt-gnu: Fix exit code overflow in autoconf test.
+	* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Squash exit code values,
+	to keep them below < 128.
+
 2012-06-17  Jim Meyering  <meyering@redhat.com>
 
 	maint.mk: fix typo in code to derive GPG key at release time
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 2aea89595..0b95cdd3e 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 39
+# getopt.m4 serial 40
 dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -276,7 +276,7 @@ dnl is ambiguous with environment values that contain newlines.
                if (getopt (3, argv, "-p") != 1)
                  result |= 16;
                else if (getopt (3, argv, "-p") != 'p')
-                 result |= 32;
+                 result |= 16;
              }
              /* This code fails on glibc 2.11.  */
              {
@@ -286,9 +286,9 @@ dnl is ambiguous with environment values that contain newlines.
                char *argv[] = { program, b, a, NULL };
                optind = opterr = 0;
                if (getopt (3, argv, "+:a:b") != 'b')
-                 result |= 64;
+                 result |= 32;
                else if (getopt (3, argv, "+:a:b") != ':')
-                 result |= 64;
+                 result |= 32;
              }
              /* This code dumps core on glibc 2.14.  */
              {
@@ -298,7 +298,7 @@ dnl is ambiguous with environment values that contain newlines.
                char *argv[] = { program, w, dummy, NULL };
                optind = opterr = 1;
                if (getopt (3, argv, "W;") != 'W')
-                 result |= 128;
+                 result |= 64;
              }
              return result;
            ]])],