From 6c7f1f741bcbf8e408c9c7ced078cd1cef70af2c Mon Sep 17 00:00:00 2001 From: canavan at github Date: Sun, 7 May 2017 00:06:56 +0200 Subject: [PATCH] buildconf: fix hang on IRIX Apparently, /usr/bin/m4 ignores the --version parameter and waits for input from stdin. Fixes #1471 --- buildconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildconf b/buildconf index 0d998c2bfc..940559652e 100755 --- a/buildconf +++ b/buildconf @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -255,7 +255,7 @@ echo "buildconf: libtoolize version $lt_version (ok)" #-------------------------------------------------------------------------- # m4 check # -m4=`(${M4:-m4} --version || ${M4:-gm4} --version) 2>/dev/null | head -n 1`; +m4=`(${M4:-m4} --version 0<&- || ${M4:-gm4} --version) 2>/dev/null 0<&- | head -n 1`; m4_version=`echo $m4 | sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'` if { echo $m4 | grep "GNU" >/dev/null 2>&1; } then