From 0dbe81bb9780e541e1b4065dd7a9b1750cdf70c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Thu, 7 Dec 2006 19:23:32 +0000
Subject: [PATCH] make shell test work with Solaris /bin/sh
Originally committed as revision 7251 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index a4607a45177..00d10a20456 100755
--- a/configure
+++ b/configure
@@ -11,12 +11,19 @@
# try to make this part work with most shells
try_exec(){
+ echo "Trying shell $1"
type "$1" >/dev/null 2>&1 && exec "$@"
}
unset foo
-(: ${foo%%bar}) 2>/dev/null && ! (: ${foo?}) 2>/dev/null
-if test "$?" != 0; then
+(: ${foo%%bar}) 2>/dev/null
+E1="$?"
+
+(: ${foo?}) 2>/dev/null
+E2="$?"
+
+if test "$E1" != 0 || test "$E2" = 0; then
+ echo "Broken shell detected. Trying alternatives."
export FF_CONF_EXEC
if test "0$FF_CONF_EXEC" -lt 1; then
FF_CONF_EXEC=1
@@ -339,7 +346,7 @@ check_header(){
int x;
EOF
err=$?
- var=`echo $header | sed 's/[^[:alnum:]]/_/g'`
+ var=`echo $header | sed 's/[^A-Za-z0-9_]/_/g'`
test "$err" = 0 && enable $var || disable $var
return $err
}
--
GitLab