mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 11:44:44 +00:00
configure: properly quote configure options stored in config.*
Originally committed as revision 19201 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7cc8d616aa
commit
b04251c5d0
14
configure
vendored
14
configure
vendored
@ -283,6 +283,12 @@ c_escape(){
|
||||
echo "$*" | sed 's/["\\]/\\\0/g'
|
||||
}
|
||||
|
||||
sh_quote(){
|
||||
v=$(echo "$1" | sed "s/'/'\\\\''/g")
|
||||
test "$v" = "${v#*[ |&;<>()$\`\\\"\'*?\[\]#~=%]}" || v="'$v'"
|
||||
echo "$v"
|
||||
}
|
||||
|
||||
set_all(){
|
||||
value=$1
|
||||
shift
|
||||
@ -1270,9 +1276,9 @@ else
|
||||
fi
|
||||
|
||||
for v in "$@"; do
|
||||
r="${v#*=}"
|
||||
l="${v%$r}"
|
||||
test "$r" = "${r#* }" || r="'$r'"
|
||||
r=${v#*=}
|
||||
l=${v%"$r"}
|
||||
r=$(sh_quote "$r")
|
||||
FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}"
|
||||
done
|
||||
|
||||
@ -2444,7 +2450,7 @@ echo "# Automatically generated by configure - do not modify!" > config.mak
|
||||
echo "/* Automatically generated by configure - do not modify! */" > $TMPH
|
||||
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
|
||||
echo "#define FFMPEG_CONFIG_H" >> $TMPH
|
||||
echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
|
||||
echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH
|
||||
echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
|
||||
|
||||
echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak
|
||||
|
Loading…
Reference in New Issue
Block a user