Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'

* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
	configure

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

diff --cc configure
index cb9586d,52cebb7..a67a431
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2116,11 -1862,9 +2116,11 @@@ shlibdir_default="$libdir_default
  # toolchain
  ar_default="ar"
  cc_default="gcc"
 +cxx_default="g++"
  host_cc_default="gcc"
  cp_f="cp -f"
- ln_s="ln -sf"
 +install="install"
+ ln_s="ln -s -f"
  nm_default="nm -g"
  objformat="elf"
  pkg_config_default=pkg-config
@@@ -3390,8 -3076,7 +3390,7 @@@ case $target_os i
          add_compat strtod.o strtod=avpriv_strtod
          network_extralibs='-lbsd'
          exeobjs=compat/plan9/main.o
 -        disable avserver
 +        disable ffserver
-         ln_s='ln -s -f'
          cp_f='cp'
          ;;
      none)