Commit b04251c5 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

configure: properly quote configure options stored in config.*

Originally committed as revision 19201 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7cc8d616
...@@ -283,6 +283,12 @@ c_escape(){ ...@@ -283,6 +283,12 @@ c_escape(){
echo "$*" | sed 's/["\\]/\\\0/g' echo "$*" | sed 's/["\\]/\\\0/g'
} }
sh_quote(){
v=$(echo "$1" | sed "s/'/'\\\\''/g")
test "$v" = "${v#*[ |&;<>()$\`\\\"\'*?\[\]#~=%]}" || v="'$v'"
echo "$v"
}
set_all(){ set_all(){
value=$1 value=$1
shift shift
...@@ -1270,9 +1276,9 @@ else ...@@ -1270,9 +1276,9 @@ else
fi fi
for v in "$@"; do for v in "$@"; do
r="${v#*=}" r=${v#*=}
l="${v%$r}" l=${v%"$r"}
test "$r" = "${r#* }" || r="'$r'" r=$(sh_quote "$r")
FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}" FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}"
done done
...@@ -2444,7 +2450,7 @@ echo "# Automatically generated by configure - do not modify!" > config.mak ...@@ -2444,7 +2450,7 @@ echo "# Automatically generated by configure - do not modify!" > config.mak
echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "/* Automatically generated by configure - do not modify! */" > $TMPH
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
echo "#define 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 "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment