]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
configure: make --extra-cflags cumulative again
authormru <mru@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 20 Jul 2009 19:00:59 +0000 (19:00 +0000)
committermru <mru@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 20 Jul 2009 19:00:59 +0000 (19:00 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19471 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

configure

index b5726d363a01dd52709381359ee8483188e6a219..ec0eab8d3609068f0cf63d914e9edce5e906d849 100755 (executable)
--- 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