diff options
| author | canavan at github <canavan@users.noreply.github.com> | 2017-05-07 00:06:56 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-07 00:09:27 +0200 |
| commit | 6c7f1f741bcbf8e408c9c7ced078cd1cef70af2c (patch) | |
| tree | 7ffa095f5ced4e8039244adc8aa5155f37f52067 /buildconf | |
| parent | 289236b223db7baa04c7f1c586f321c8ac04e98a (diff) | |
| download | curl-6c7f1f741bcbf8e408c9c7ced078cd1cef70af2c.tar.gz | |
buildconf: fix hang on IRIX
Apparently, /usr/bin/m4 ignores the --version parameter and waits for
input from stdin.
Fixes #1471
Diffstat (limited to 'buildconf')
| -rwxr-xr-x | buildconf | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, 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 |