Revision 3fe142e2 configure

View differences:

configure
68 68
  echo "  --disable-shared         do not build shared libraries [default=yes]"
69 69
  echo "  --enable-gpl             allow use of GPL code, the resulting libav*"
70 70
  echo "                           and ffmpeg will be under GPL [default=no]"
71
  echo "  --enable-nonfree         allow use of nonfree code, the resulting libav*"
72
  echo "                           and ffmpeg will be unredistributable [default=no]"
71 73
  echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
72 74
  echo "  --enable-swscaler        software scaler support [default=no]"
73 75
  echo "  --enable-beosthreads     use BeOS threads [default=no]"
......
650 652
    memalign_hack
651 653
    mpegaudio_hp
652 654
    network
655
    nonfree
653 656
    powerpc_perf
654 657
    pp
655 658
    small
......
1355 1358
    die_gpl_disabled "The software scaler"     swscaler
1356 1359
fi
1357 1360

  
1361
if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then
1362
    die "libamr is nonfree and --enable-nonfree is not specified."
1363
fi
1364

  
1358 1365
check_deps $ARCH_EXT_LIST
1359 1366

  
1360 1367
test -z "$need_memalign" && need_memalign="$mmx"
......
1928 1935
    echo $partlist
1929 1936
done
1930 1937

  
1931
enabled gpl &&
1932
    echo "License: GPL" ||
1933
    echo "License: LGPL"
1938
enabled nonfree &&
1939
    echo "License: unredistributable" ||
1940
    (enabled gpl &&
1941
        echo "License: GPL" ||
1942
        echo "License: LGPL")
1934 1943

  
1935 1944
echo "Creating config.mak and config.h..."
1936 1945

  

Also available in: Unified diff