changeset 16914:80e5b1a6673a

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.
author Bruno Haible <bruno@clisp.org>
date Tue, 19 Jun 2012 12:11:04 +0200
parents a878aa8b0b82
children 3aded6c8d483
files ChangeLog m4/getopt.m4
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jun 17 21:16:54 2012 +0200
+++ b/ChangeLog	Tue Jun 19 12:11:04 2012 +0200
@@ -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
--- a/m4/getopt.m4	Sun Jun 17 21:16:54 2012 +0200
+++ b/m4/getopt.m4	Tue Jun 19 12:11:04 2012 +0200
@@ -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 @@
                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 @@
                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 @@
                char *argv[] = { program, w, dummy, NULL };
                optind = opterr = 1;
                if (getopt (3, argv, "W;") != 'W')
-                 result |= 128;
+                 result |= 64;
              }
              return result;
            ]])],