aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-07-20 19:00:59 +0000
committerMåns Rullgård <mans@mansr.com>2009-07-20 19:00:59 +0000
commit89f2932baf8f8bd9f5e3de1d903ab70c6315f629 (patch)
tree573aef2372f0142402d2480ac5b38ac6507e06d0
parent932e6a5a4c78250e3cab4f65215214fb0dbf51f7 (diff)
downloadffmpeg-89f2932baf8f8bd9f5e3de1d903ab70c6315f629.tar.gz
configure: make --extra-cflags cumulative again
Originally committed as revision 19471 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure b/configure
index b5726d363a..ec0eab8d36 100755
--- a/configure
+++ b/configure
@@ -1002,7 +1002,6 @@ CMDLINE_SET="
cpu
cross_prefix
dep_cc
- extra_cflags
extra_version
host_cc
host_cflags
@@ -1020,6 +1019,10 @@ CMDLINE_SET="
target_path
"
+CMDLINE_APPEND="
+ extra_cflags
+"
+
# code dependency declarations
# architecture extensions
@@ -1401,8 +1404,13 @@ for opt do
optname="${opt%%=*}"
optname="${optname#--}"
optname=$(echo "$optname" | sed 's/-/_/g')
- is_in $optname $CMDLINE_SET || die_unknown $opt
- eval $optname='$optval'
+ if is_in $optname $CMDLINE_SET; then
+ eval $optname='$optval'
+ elif is_in $optname $CMDLINE_APPEND; then
+ append $optname "$optval"
+ else
+ die_unknown $opt
+ fi
;;
esac
done