autogen.sh: Cope with the Python rewrite of gtk-doc

gtkdoc-scan 1.26 prints its version to stderr instead of stdout.

Signed-off-by: Simon McVittie <smcv@debian.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/autogen.sh b/autogen.sh
index f67caa7..6cb13d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -75,8 +75,15 @@ version_check() {
     for vc_checkprog in $vc_checkprogs; do
 	echo $ECHO_N "  testing $vc_checkprog... "
 	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
-	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
+	    vc_actual_version=`$vc_checkprog --version 2>/dev/null | head -n 1 | \
                                sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
+
+	    if [ -z "$vc_actual_version" ]; then
+		# In gtk-doc 1.26, gtkdoc-scan --version prints to stderr
+		vc_actual_version=`$vc_checkprog --version 2>&1 | head -n 1 | \
+                                  sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
+	    fi
+
 	    if compare_versions $vc_min_version $vc_actual_version; then
 		echo "found $vc_actual_version"
 		# set variable