Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 17:03:02 +0000 (19:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 17:03:02 +0000 (19:03 +0200)
* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -1976,11 -1668,9 +1977,12 @@@ CMDLINE_SET=
      cc
      cpu
      cross_prefix
 +    cxx
      dep_cc
 +    doxygen
+     env
      extra_version
 +    gas
      host_cc
      host_cflags
      host_ld
@@@ -3077,13 -2542,15 +3079,17 @@@ for opt d
      esac
  done
  
+ for e in "$env"; do
+     eval "export $e"
+ done
  disabled logging && logfile=/dev/null
  
 -echo "# $0 $LIBAV_CONFIGURATION" > $logfile
 +echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
  set >> $logfile
  
 +test -n "$valgrind" && toolchain="valgrind-memcheck"
 +
  case "$toolchain" in
      clang-asan)
          cc_default="clang"