From: Eric Blake <eblake@redhat.com>
Date: Wed, 8 Sep 2010 14:49:15 +0000 (-0600)
Subject: getopt: optimize previous patch
X-Git-Tag: v0.1~3835
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=28a948d4a051659556d86b676e8bdf4a3a444966;p=gnulib.git

getopt: optimize previous patch

* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Correctly check for
empty variable.  Speed up awk script.
Reported by Paolo Bonzini.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 9a51377eb..e2b773c7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,13 @@
 	glibc, and refer the reader there. Keep BSD API documentation, as
 	that is not readily available elsewhere.
 
+2010-09-08  Eric Blake  <eblake@redhat.com>
+
+	getopt: optimize previous patch
+	* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Correctly check for
+	empty variable.  Speed up awk script.
+	Reported by Paolo Bonzini.
+
 2010-09-07  Eric Blake  <eblake@redhat.com>
 
 	getopt: handle POSIXLY_CORRECT set but not exported
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 720f0482a..d05e9d914 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 30
+# getopt.m4 serial 31
 dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -218,9 +218,8 @@ main ()
        # so take care to revert to the correct (non-)export state.
 dnl GNU Coding Standards currently allow awk but not env; besides, env
 dnl is ambiguous with environment values that contain newlines.
-       gl_awk_probe='BEGIN { for (v in ENVIRON)
-         if (v == "POSIXLY_CORRECT") print "x" }'
-       case ${POSIXLY_CORRECT:+x}`$AWK "$gl_awk_probe" </dev/null` in
+       gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
+       case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
          xx) gl_had_POSIXLY_CORRECT=exported ;;
          x)  gl_had_POSIXLY_CORRECT=yes      ;;
          *)  gl_had_POSIXLY_CORRECT=         ;;