virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

make shell test work with Solaris /bin/sh

Browse Source 
Originally committed as revision 7251 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2006-12-07 19:23:32 +00:00
parent 6c81ca9906
commit 0dbe81bb97
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@@ -11,12 +11,19 @@
# try to make this part work with most shells # try to make this part work with most shells
try_exec(){ try_exec(){
echo "Trying shell $1"
type "$1" >/dev/null 2>&1 && exec "$@" type "$1" >/dev/null 2>&1 && exec "$@"
} }
unset foo unset foo
(: ${foo%%bar}) 2>/dev/null && ! (: ${foo?}) 2>/dev/null (: ${foo%%bar}) 2>/dev/null
if test "$?" != 0; then E1="$?"
(: ${foo?}) 2>/dev/null
E2="$?"
if test "$E1" != 0 || test "$E2" = 0; then
echo "Broken shell detected. Trying alternatives."
export FF_CONF_EXEC export FF_CONF_EXEC
if test "0$FF_CONF_EXEC" -lt 1; then if test "0$FF_CONF_EXEC" -lt 1; then
FF_CONF_EXEC=1 FF_CONF_EXEC=1
@@ -339,7 +346,7 @@ check_header(){
int x; int x;
EOF EOF
err=$? 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 test "$err" = 0 && enable $var || disable $var
return $err return $err
} }