From 89f2932baf8f8bd9f5e3de1d903ab70c6315f629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 20 Jul 2009 19:00:59 +0000 Subject: [PATCH] configure: make --extra-cflags cumulative again Originally committed as revision 19471 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 14 +++++++++++--- 1 file 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