From: Ben Walton <bwalton@artsci.utoronto.ca>
Date: Thu, 12 Mar 2009 19:20:10 +0000 (-0400)
Subject: configure: asciidoc version test cleanup
X-Git-Tag: v1.6.3-rc0~122^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29adc8baf997e143d8aeac9a0aeb257539d32e6d;p=git.git

configure: asciidoc version test cleanup

Redirect stderr to /dev/null instead of stdout.  This discards warnings
generated by python 2.6 related to the reorganization of functions within
modules.  The warnings were causing the version detection to break.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/configure.ac b/configure.ac
index fe9d7eb46..f4b8e49dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,7 +291,7 @@ fi
 AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
 if test -n "$ASCIIDOC"; then
 	AC_MSG_CHECKING([for asciidoc version])
-	asciidoc_version=`$ASCIIDOC --version 2>&1`
+	asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
 	case "${asciidoc_version}" in
 	asciidoc' '8*)
 		ASCIIDOC8=YesPlease