[FFmpeg-cvslog] Merge commit 'f7174d7ed045445d00a6d557236737d09ad32343'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Apr 26 16:39:37 2017 +0200| [f9ecf5498c63f7f7b4f2e97720d7bae5a3abeae6] | committer: Clément Bœsch

Merge commit 'f7174d7ed045445d00a6d557236737d09ad32343'

* commit 'f7174d7ed045445d00a6d557236737d09ad32343':
  configure: fix linking with MSVC when using --disable-optimizations

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9ecf5498c63f7f7b4f2e97720d7bae5a3abeae6
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index fc970cd86a..27d085b25b 100755
--- a/configure
+++ b/configure
@@ -4149,6 +4149,7 @@ probe_cc(){
         _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
         _cflags_speed="-O2"
         _cflags_size="-O1"
+        _cflags_noopt="-O1"
         if $_cc -nologo- 2>&1 | grep -q Linker; then
             _ld_o='-out:$@'
         else


======================================================================

diff --cc configure
index fc970cd86a,2ecd0ed718..27d085b25b
--- a/configure
+++ b/configure
@@@ -4142,25 -3326,6 +4142,26 @@@ probe_cc()
          _flags_filter=msvc_flags
          _ld_lib='lib%.a'
          _ld_path='-libpath:'
 +    elif $_cc -nologo- 2>&1 | grep -q Microsoft; then
 +        _type=msvc
 +        _ident=$($_cc 2>&1 | head -n1)
 +        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
 +        _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
 +        _cflags_speed="-O2"
 +        _cflags_size="-O1"
++        _cflags_noopt="-O1"
 +        if $_cc -nologo- 2>&1 | grep -q Linker; then
 +            _ld_o='-out:$@'
 +        else
 +            _ld_o='-Fe$@'
 +        fi
 +        _cc_o='-Fo$@'
 +        _cc_e='-P -Fi$@'
 +        _flags_filter=msvc_flags
 +        _ld_lib='lib%.a'
 +        _ld_path='-libpath:'
 +        _flags='-nologo'
 +        disable stripping
      elif $_cc --version 2>/dev/null | grep -q ^cparser; then
          _type=cparser
          _ident=$($_cc --version | head -n1)