From 28a948d4a051659556d86b676e8bdf4a3a444966 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 8 Sep 2010 08:49:15 -0600 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ m4/getopt.m4 | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) 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 + + 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 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"