]> git.sesse.net Git - ffmpeg/blobdiff - configure
handle network dependency on protocols with check_deps()
[ffmpeg] / configure
index 92dd7e4c28da6c97b4cf1e80cedfa221401c0750..dd1ce1f5d26c4b608ed56023e9d8e1de3cb73872 100755 (executable)
--- a/configure
+++ b/configure
@@ -62,38 +62,44 @@ show_help(){
   echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"
   echo "  --incdir=DIR             install includes in DIR [PREFIX/include/ffmpeg]"
   echo "  --mandir=DIR             install man page in DIR [PREFIX/man]"
-  echo "  --enable-mp3lame         enable MP3 encoding via libmp3lame [default=no]"
-  echo "  --enable-libnut          enable NUT support via libnut [default=no]"
-  echo "  --enable-libogg          enable Ogg support via libogg [default=no]"
-  echo "  --enable-vorbis          enable Vorbis support via libvorbis [default=no]"
-  echo "  --enable-faad            enable FAAD support via libfaad [default=no]"
-  echo "  --enable-faadbin         build FAAD support with runtime linking [default=no]"
-  echo "  --enable-faac            enable FAAC support via libfaac [default=no]"
-  echo "  --enable-libgsm          enable GSM support via libgsm [default=no]"
-  echo "  --enable-xvid            enable XviD support via xvidcore [default=no]"
-  echo "  --enable-x264            enable H.264 encoding via x264 [default=no]"
   echo "  --enable-mingw32         enable MinGW native/cross Windows compile"
   echo "  --enable-mingwce         enable MinGW native/cross WinCE compile"
-  echo "  --enable-a52             enable GPLed liba52 support [default=no]"
-  echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
-  echo "  --enable-dts             enable GPLed libdts support [default=no]"
-  echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
   echo "  --enable-static          build static libraries [default=yes]"
   echo "  --disable-static         do not build static libraries [default=no]"
   echo "  --enable-shared          build shared libraries [default=no]"
   echo "  --disable-shared         do not build shared libraries [default=yes]"
-  echo "  --enable-amr_nb          enable amr_nb float audio codec"
-  echo "  --enable-amr_nb-fixed    use fixed point for amr-nb codec"
-  echo "  --enable-amr_wb          enable amr_wb float audio codec"
-  echo "  --enable-amr_if2         enable amr_wb IF2 audio codec"
+  echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
+  echo "  --enable-swscaler        software scaler support [default=no]"
   echo "  --enable-sunmlib         use Sun medialib [default=no]"
+  echo "  --enable-beosthreads     use BeOS threads [default=no]"
+  echo "  --enable-os2threads      use OS/2 threads [default=no]"
   echo "  --enable-pthreads        use pthreads [default=no]"
   echo "  --enable-w32threads      use Win32 threads [default=no]"
   echo "  --enable-x11grab         enable X11 grabbing [default=no]"
   echo "  --enable-dc1394          enable IIDC-1394 grabbing using libdc1394"
   echo "                           and libraw1394 [default=no]"
-  echo "  --enable-swscaler        software scaler support [default=no]"
+  echo "  --enable-a52             enable GPLed liba52 support [default=no]"
+  echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
   echo "  --enable-avisynth        allow reading AVISynth script files [default=no]"
+  echo "  --enable-dts             enable GPLed libdts support [default=no]"
+  echo "  --enable-faac            enable FAAC support via libfaac [default=no]"
+  echo "  --enable-faad            enable FAAD support via libfaad [default=no]"
+  echo "  --enable-faadbin         build FAAD support with runtime linking [default=no]"
+  echo "  --enable-libgsm          enable GSM support via libgsm [default=no]"
+  echo "  --enable-mp3lame         enable MP3 encoding via libmp3lame [default=no]"
+  echo "  --enable-libnut          enable NUT (de)muxing via libnut,"
+  echo "                           native demuxer exists [default=no]"
+  echo "  --enable-libogg          enable Ogg muxing via libogg [default=no]"
+  echo "  --enable-libtheora       enable Theora encoding via libtheora [default=no]"
+  echo "  --enable-vorbis          enable Vorbis en/decoding via libvorbis,"
+  echo "                           native implementations exist [default=no]"
+  echo "  --enable-x264            enable H.264 encoding via x264 [default=no]"
+  echo "  --enable-xvid            enable Xvid encoding via xvidcore,"
+  echo "                           native MPEG-4/Xvid encoder exists [default=no]"
+  echo "  --enable-amr_nb          enable amr_nb float audio codec"
+  echo "  --enable-amr_nb-fixed    use fixed point for amr-nb codec"
+  echo "  --enable-amr_wb          enable amr_wb float audio codec"
+  echo "  --enable-amr_if2         enable amr_wb IF2 audio codec"
   echo "  --enable-gpl             allow use of GPL code, the resulting libav*"
   echo "                           and ffmpeg will be under GPL [default=no]"
   echo ""
@@ -114,6 +120,7 @@ show_help(){
   echo "                           (requires enabling PMC)"
   echo "  --disable-mmx            disable MMX usage"
   echo "  --disable-armv5te        disable armv5te usage"
+  echo "  --disable-armv6          disable armv6 usage"
   echo "  --disable-iwmmxt         disable iwmmxt usage"
   echo "  --disable-altivec        disable AltiVec usage"
   echo "  --disable-audio-oss      disable OSS audio support [default=no]"
@@ -209,6 +216,25 @@ set_all(){
     done
 }
 
+pushvar(){
+    for var in $*; do
+        eval level=\${${var}_level:=0}
+        eval ${var}_${level}="\$$var"
+        eval ${var}_level=$(($level+1))
+    done
+}
+
+popvar(){
+    for var in $*; do
+        eval level=\${${var}_level:-0}
+        test $level = 0 && continue
+        eval level=$(($level-1))
+        eval $var="\${${var}_${level}}"
+        eval ${var}_level=$level
+        eval unset ${var}_${level}
+    done
+}
+
 enable(){
     set_all yes $*
 }
@@ -221,18 +247,54 @@ enabled(){
     eval test "x\$$1" = "xyes"
 }
 
+disabled(){
+    eval test "x\$$1" = "xno"
+}
+
 enabled_all(){
     for opt; do
         enabled $opt || return 1
     done
 }
 
+disabled_all(){
+    for opt; do
+        disabled $opt || return 1
+    done
+}
+
 enabled_any(){
     for opt; do
         enabled $opt && return 0
     done
 }
 
+disabled_any(){
+    for opt; do
+        disabled $opt && return 0
+    done
+}
+
+check_deps(){
+    for cfg; do
+        enabled ${cfg}_checking && die "Circular dependency for $cfg."
+        disabled ${cfg}_checking && continue
+        enable ${cfg}_checking
+
+        eval dep_all="\$${cfg}_deps"
+        eval dep_any="\$${cfg}_deps_any"
+
+        pushvar cfg dep_all dep_any
+        check_deps $dep_all $dep_any
+        popvar cfg dep_all dep_any
+
+        enabled_all $dep_all || disable $cfg
+        enabled_any $dep_any || disable $cfg
+
+        disable ${cfg}_checking
+    done
+}
+
 print_config(){
     pfx=$1
     header=$2
@@ -259,6 +321,7 @@ save_flags(){
 }
 
 restore_flags(){
+    flags_saved || return
     CFLAGS="$SAVE_CFLAGS"
     LDFLAGS="$SAVE_LDFLAGS"
     extralibs="$SAVE_extralibs"
@@ -384,7 +447,7 @@ check_lib(){
 }
 
 check_exec(){
-    check_ld "$@" && { test "$cross_compile" = yes || $TMPE >>$logfile 2>&1; }
+    check_ld "$@" && { enabled cross_compile || $TMPE >>$logfile 2>&1; }
 }
 
 require(){
@@ -430,11 +493,12 @@ CONFIG_LIST='
     libfaad
     libfaadbin
     libgsm
+    libmp3lame
     libnut
     libogg
+    libtheora
     libvorbis
     memalign_hack
-    mp3lame
     mpegaudio_hp
     network
     pp
@@ -451,9 +515,13 @@ CONFIG_LIST='
 '
 
 HAVE_LIST='
+    altivec
     altivec_h
+    armv5te
+    armv6
     beosthreads
     byteswap_h
+    cmov
     dcbzl
     dev_bktr_ioctl_bt848_h
     dev_bktr_ioctl_meteor_h
@@ -462,10 +530,12 @@ HAVE_LIST='
     dev_video_bktr_ioctl_bt848_h
     dlfcn_h
     dlopen
+    fast_cmov
     freetype2
     gprof
     imlib2
     inet_aton
+    iwmmxt
     localtime_r
     lrintf
     machine_ioctl_bt848_h
@@ -473,15 +543,73 @@ HAVE_LIST='
     malloc_h
     memalign
     mlib
+    mmi
+    mmx
     os2
     os2threads
     pthreads
     sdl
     sdl_video_size
+    soundcard_h
+    sys_soundcard_h
     threads
     w32threads
 '
 
+TARGET_LIST='
+    altivec
+    armv5te
+    iwmmxt
+    mmi
+    mmx
+'
+
+flashsv_decoder_deps="zlib"
+flashsv_encoder_deps="zlib"
+mpeg_xvmc_decoder_deps="xvmc"
+png_decoder_deps="zlib"
+png_encoder_deps="zlib"
+x264_encoder_deps="x264"
+xvid_encoder_deps="xvid"
+zmbv_decoder_deps="zlib"
+zmbv_encoder_deps="zlib"
+
+aac_decoder_deps="libfaad"
+mpeg4aac_decoder_deps="libfaad"
+ac3_decoder_deps="liba52"
+amr_nb_decoder_deps_any="amr_nb amr_nb_fixed"
+amr_nb_encoder_deps_any="amr_nb amr_nb_fixed"
+amr_wb_decoder_deps="amr_wb"
+amr_wb_encoder_deps="amr_wb"
+dts_decoder_deps="libdts"
+faac_encoder_deps="libfaac"
+libgsm_decoder_deps="libgsm"
+libgsm_encoder_deps="libgsm"
+libtheora_encoder_deps="libtheora"
+mp3lame_encoder_deps="libmp3lame"
+oggvorbis_decoder_deps="libvorbis"
+oggvorbis_encoder_deps="libvorbis"
+
+audio_demuxer_deps_any="audio_oss audio_beos"
+audio_muxer_deps_any="audio_oss audio_beos"
+dc1394_demuxer_deps="dc1394"
+dv1394_demuxer_deps="dv1394"
+gxf_muxer_deps="gpl"
+libnut_demuxer_deps="libnut"
+libnut_muxer_deps="libnut"
+ogg_muxer_deps="libogg"
+redir_demuxer_deps="network"
+rtp_muxer_deps="network"
+rtsp_demuxer_deps="network"
+sdp_demuxer_deps="network"
+v4l2_demuxer_deps="video4linux2"
+video_grab_device_demuxer_deps_any="video4linux bktr"
+x11_grab_device_demuxer_deps="x11grab"
+
+ffplay_deps="sdl"
+ffserver_deps="network protocols muxers"
+network_deps="protocols"
+
 # set temporary file name
 if test ! -z "$TMPDIR" ; then
     TMPDIR1="${TMPDIR}"
@@ -498,14 +626,19 @@ TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
 TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
 
 # default parameters
+
 logging="yes"
 logfile="config.err"
+
+# installation paths
 PREFIX="/usr/local"
 libdir='${PREFIX}/lib'
 shlibdir="$libdir"
 incdir='${PREFIX}/include/ffmpeg'
 mandir='${PREFIX}/man'
 bindir='${PREFIX}/bin'
+
+# toolchain
 cross_prefix=""
 cross_compile="no"
 cc="gcc"
@@ -513,17 +646,23 @@ ar="ar"
 ranlib="ranlib"
 make="make"
 strip="strip"
+asmalign_pot="unknown"
+
+# machine
 arch=`uname -m`
 cpu="generic"
 powerpc_perf="no"
 mmx="default"
 cmov="no"
-cmov_is_fast="no"
+fast_cmov="no"
 armv5te="default"
+armv6="default"
 iwmmxt="default"
 altivec="default"
 dcbzl="no"
 mmi="default"
+bigendian="no"
+
 case "$arch" in
   i386|i486|i586|i686|i86pc|BePC)
     arch="x86_32"
@@ -578,56 +717,81 @@ case "$arch" in
     arch="unknown"
   ;;
 esac
-gprof="no"
-video4linux="yes"
-video4linux2="yes"
-bktr="no"
-audio_oss="yes"
+
+# OS
+beos_netserver="no"
+mingw32="no"
+os2="no"
+wince="no"
+
+# non-library system interfaces
 audio_beos="no"
-x11grab="no"
+audio_oss="yes"
+bktr="yes"
 dv1394="yes"
+video4linux2="yes"
+video4linux="yes"
+
+# libraries
+amr_if2="no"
+amr_nb="no"
+amr_nb_fixed="no"
+amr_wb="no"
+avisynth="no"
 dc1394="no"
-network="yes"
-ipv6="yes"
-zlib="yes"
+dlfcn_h="no"
+dlopen="no"
 liba52="no"
 liba52bin="no"
+libdts="no"
 libfaac="no"
+libfaad2="no"
 libfaad="no"
 libfaadbin="no"
 libgsm="no"
-mp3lame="no"
-libdts="no"
+libmp3lame="no"
 libnut="no"
 libogg="no"
+libtheora="no"
 libvorbis="no"
-xvid="no"
+mlib="no"
+x11grab="no"
 x264="no"
-pp="no"
-mingw32="no"
-wince="no"
-os2="no"
-lstatic="yes"
-lshared="no"
-optimize="yes"
+xvid="no"
+zlib="yes"
+
+# configurable options
 debug="yes"
-extrawarnings="no"
 dostrip="yes"
-installstrip="-s"
-extralibs="-lm"
-bigendian="no"
-vhook="default"
-avisynth="no"
-dlfcn_h="no"
-dlopen="no"
+extrawarnings="no"
+ffmpeg="yes"
+ffplay="yes"
+ffserver="yes"
+gpl="no"
+gprof="no"
+ipv6="yes"
+lshared="no"
+lstatic="yes"
+memalign_hack="no"
 mpegaudio_hp="yes"
+network="yes"
+optimize="yes"
+pp="no"
+protocols="yes"
+swscaler="no"
+vhook="default"
+
+# threading
+beosthreads="no"
+os2threads="no"
+pthreads="no"
+w32threads="no"
+thread_type="no"
+
+# build settings
+extralibs="-lm"
 SHFLAGS='-shared -Wl,-soname,$@'
 VHOOKSHFLAGS='$(SHFLAGS)'
-beos_netserver="no"
-protocols="yes"
-ffmpeg="yes"
-ffserver="yes"
-ffplay="yes"
 LIBOBJFLAGS=""
 FFLDFLAGS=-Wl,--warn-common
 LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
@@ -643,197 +807,140 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
 EXESUF=""
 BUILDSUF=""
-amr_nb="no"
-amr_wb="no"
-amr_nb_fixed="no"
-amr_if2="no"
-mlib="no"
-pthreads="no"
-w32threads="no"
-swscaler="no"
-gpl="no"
-memalign_hack="no"
-asmalign_pot="unknown"
 LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"'
 
 # OS specific
 targetos=`uname -s`
 case $targetos in
-BeOS)
-PREFIX="/boot/home/config"
-# helps building libavcodec
-add_cflags "-DPIC -fomit-frame-pointer"
-# 3 gcc releases known for BeOS, each with ugly bugs
-gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
-case "$gcc_version" in
-2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
-mmx="no"
-;;
-*20010315*) echo "BeBits gcc"
-add_cflags "-fno-expensive-optimizations"
-;;
-esac
-SHFLAGS=-nostart
-# disable Linux things
-audio_oss="no"
-video4linux="no"
-video4linux2="no"
-dv1394="no"
-# enable BeOS things
-audio_beos="yes"
-beosthreads="yes"
-# no need for libm, but the inet stuff
-# Check for BONE
-if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
-extralibs="-lbind -lsocket"
-else
-beos_netserver="yes"
-extralibs="-lnet"
-fi ;;
-SunOS)
-video4linux="no"
-video4linux2="no"
-audio_oss="no"
-dv1394="no"
-make="gmake"
-FFLDFLAGS=""
-FFSERVERLDFLAGS=""
-SHFLAGS="-shared -Wl,-h,\$@"
-add_extralibs "-lsocket -lnsl"
-;;
-NetBSD)
-video4linux="no"
-video4linux2="no"
-bktr="yes"
-audio_oss="yes"
-dv1394="no"
-make="gmake"
-add_extralibs "-lossaudio"
-;;
-OpenBSD)
-video4linux="no"
-video4linux2="no"
-bktr="yes"
-audio_oss="yes"
-dv1394="no"
-need_memalign="no"
-make="gmake"
-LIBOBJFLAGS="\$(PIC)"
-LDCONFIG="ldconfig -m \$(shlibdir)"
-SHFLAGS='-shared'
-SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
-SLIBNAME_WITH_VERSION='$(SLIBNAME)'
-SLIBNAME_WITH_MAJOR='$(SLIBNAME)'
-add_extralibs "-lossaudio"
-;;
-FreeBSD)
-video4linux="no"
-video4linux2="no"
-bktr="yes"
-audio_oss="yes"
-dv1394="no"
-make="gmake"
-need_memalign="no"
-add_cflags "-pthread"
-;;
-GNU/kFreeBSD)
-video4linux="no"
-video4linux2="no"
-bktr="yes"
-audio_oss="yes"
-dv1394="no"
-add_cflags "-pthread"
-;;
-BSD/OS)
-video4linux="no"
-video4linux2="no"
-bktr="yes"
-audio_oss="yes"
-dv1394="no"
-extralibs="-lpoll -lgnugetopt -lm"
-make="gmake"
-strip="strip -d"
-installstrip=""
-;;
-Darwin)
-cc="cc"
-video4linux="no"
-video4linux2="no"
-audio_oss="no"
-dv1394="no"
-need_memalign="no"
-SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress"
-VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
-extralibs=""
-strip="strip -x"
-installstrip=""
-FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
-SLIBSUF=".dylib"
-SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
-SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
-FFSERVERLDFLAGS=-Wl,-bind_at_load
-;;
-MINGW32*)
-# Note: the rest of the mingw32 config is done afterwards as mingw32
-# can be forced on the command line for Linux cross compilation.
-mingw32="yes"
-;;
-CYGWIN*)
-targetos=CYGWIN
-shlibdir="$bindir"
-video4linux="no"
-video4linux2="no"
-audio_oss="yes"
-dv1394="no"
-VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
-VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
-extralibs=""
-EXESUF=".exe"
-SLIBPREF="cyg"
-SLIBSUF=".dll"
-SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
-SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
-SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
-;;
-Linux)
-LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
-;;
-IRIX*)
-targetos=IRIX
-ranlib="echo ignoring ranlib"
-video4linux="no"
-video4linux2="no"
-audio_oss="no"
-make="gmake"
-;;
-OS/2)
-TMPE=$TMPE".exe"
-ar="emxomfar -p128"
-ranlib="echo ignoring ranlib"
-strip="echo ignoring strip"
-add_cflags "-Zomf"
-FFLDFLAGS="-Zomf -Zstack 16384 -s"
-SHFLAGS="-Zdll -Zomf"
-FFSERVERLDFLAGS=""
-LIBPREF=""
-LIBSUF=".lib"
-SLIBPREF=""
-SLIBSUF=".dll"
-EXESUF=".exe"
-extralibs=""
-pkg_requires=""
-video4linux="no"
-video4linux2="no"
-audio_oss="no"
-dv1394="no"
-ffserver="no"
-vhook="no"
-os2="yes"
-os2threads="yes"
-;;
-*)
-targetos="${targetos}-UNKNOWN"
-;;
+  BeOS|Haiku|Zeta)
+    PREFIX="$HOME/config"
+    # helps building libavcodec
+    add_cflags "-DPIC -fomit-frame-pointer"
+    # 3 gcc releases known for BeOS, each with ugly bugs
+    gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
+    case "$gcc_version" in
+      2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
+        mmx="no"
+        ;;
+      *20010315*) echo "BeBits gcc"
+        add_cflags "-fno-expensive-optimizations"
+        ;;
+    esac
+    LDCONFIG="echo ignoring ldconfig"
+    SHFLAGS=-nostart
+    # disable Linux things
+    dv1394="no"
+    # enable BeOS things
+    audio_beos="yes"
+    # no need for libm, but the inet stuff
+    # Check for BONE
+    # XXX: actually should check for NOT net_server
+    if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
+        extralibs="-lbind -lsocket"
+    else
+        beos_netserver="yes"
+        extralibs="-lnet"
+    fi ;;
+  SunOS)
+    dv1394="no"
+    FFLDFLAGS=""
+    FFSERVERLDFLAGS=""
+    SHFLAGS="-shared -Wl,-h,\$@"
+    add_extralibs "-lsocket -lnsl"
+    ;;
+  NetBSD)
+    dv1394="no"
+    add_extralibs "-lossaudio"
+    ;;
+  OpenBSD)
+    dv1394="no"
+    need_memalign="no"
+    LIBOBJFLAGS="\$(PIC)"
+    LDCONFIG="ldconfig -m \$(shlibdir)"
+    SHFLAGS='-shared'
+    SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
+    SLIBNAME_WITH_VERSION='$(SLIBNAME)'
+    SLIBNAME_WITH_MAJOR='$(SLIBNAME)'
+    add_extralibs "-lossaudio"
+    ;;
+  FreeBSD)
+    dv1394="no"
+    need_memalign="no"
+    add_cflags "-pthread"
+    ;;
+  GNU/kFreeBSD)
+    dv1394="no"
+    add_cflags "-pthread"
+    ;;
+  BSD/OS)
+    dv1394="no"
+    extralibs="-lpoll -lgnugetopt -lm"
+    strip="strip -d"
+    ;;
+  Darwin)
+    cc="cc"
+    dv1394="no"
+    need_memalign="no"
+    SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress"
+    VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
+    extralibs=""
+    strip="strip -x"
+    FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
+    SLIBSUF=".dylib"
+    SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
+    SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
+    FFSERVERLDFLAGS=-Wl,-bind_at_load
+    ;;
+  MINGW32*)
+    # Note: the rest of the mingw32 config is done afterwards as mingw32
+    # can be forced on the command line for Linux cross compilation.
+    mingw32="yes"
+    ;;
+  CYGWIN*)
+    targetos=CYGWIN
+    shlibdir="$bindir"
+    dv1394="no"
+    VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
+    VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
+    extralibs=""
+    EXESUF=".exe"
+    SLIBPREF="cyg"
+    SLIBSUF=".dll"
+    SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
+    SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
+    SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
+    ;;
+  Linux)
+    LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
+    ;;
+  IRIX*)
+    targetos=IRIX
+    ranlib="echo ignoring ranlib"
+    ;;
+  OS/2)
+    TMPE=$TMPE".exe"
+    ar="emxomfar -p128"
+    ranlib="echo ignoring ranlib"
+    strip="echo ignoring strip"
+    add_cflags "-Zomf"
+    FFLDFLAGS="-Zomf -Zstack 16384 -s"
+    SHFLAGS="-Zdll -Zomf"
+    FFSERVERLDFLAGS=""
+    LIBPREF=""
+    LIBSUF=".lib"
+    SLIBPREF=""
+    SLIBSUF=".dll"
+    EXESUF=".exe"
+    extralibs=""
+    pkg_requires=""
+    dv1394="no"
+    ffserver="no"
+    vhook="no"
+    os2="yes"
+    ;;
+  *)
+    targetos="${targetos}-UNKNOWN"
+    ;;
 esac
 
 # find source path
@@ -852,10 +959,7 @@ if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
     show_help
 fi
 
-FFMPEG_CONFIGURATION=" "
-for opt do
-  FFMPEG_CONFIGURATION="$FFMPEG_CONFIGURATION""$opt "
-done
+FFMPEG_CONFIGURATION="$@"
 
 ENCODER_LIST=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "$source_path/libavcodec/allcodecs.c"`
 DECODER_LIST=`sed -n 's/^[^#]*DEC.*, *\(.*\)).*/\1_decoder/p' "$source_path/libavcodec/allcodecs.c"`
@@ -886,7 +990,7 @@ for opt do
   ;;
   --cross-prefix=*) cross_prefix="$optval"
   ;;
-  --cross-compile) cross_compile=yes
+  --cross-compile) cross_compile="yes"
   ;;
   --cc=*) cc="$optval"
   ;;
@@ -910,6 +1014,8 @@ for opt do
   ;;
   --disable-armv5te) armv5te="no"
   ;;
+  --disable-armv6) armv6="no"
+  ;;
   --disable-iwmmxt) iwmmxt="no"
   ;;
   --disable-altivec) altivec="no"
@@ -928,15 +1034,15 @@ for opt do
   ;;
   --disable-dv1394) dv1394="no"
   ;;
-  --disable-network) network="no"; ffserver="no"
+  --disable-network) network="no"
   ;;
-  --disable-ipv6) ipv6="no";
+  --disable-ipv6) ipv6="no"
   ;;
   --disable-zlib) zlib="no"
   ;;
   --enable-a52) liba52="yes"
   ;;
-  --enable-a52bin) liba52bin="yes"
+  --enable-a52bin) liba52bin="yes";  liba52="yes"
   ;;
   --enable-dts) libdts="yes"
   ;;
@@ -944,13 +1050,16 @@ for opt do
   ;;
   --enable-libgsm) libgsm="yes"
   ;;
-  --enable-mp3lame) mp3lame="yes"
+  --enable-mp3lame) libmp3lame="yes"
   ;;
   --enable-libnut) libnut="yes"
   ;;
   --enable-libogg) libogg="yes"
     pkg_requires="$pkg_requires ogg >= 1.1"
   ;;
+  --enable-libtheora) libtheora="yes"
+    pkg_requires="$pkg_requires theora"
+  ;;
   --enable-vorbis) libvorbis="yes"
     pkg_requires="$pkg_requires vorbis vorbisenc"
   ;;
@@ -964,9 +1073,9 @@ for opt do
   ;;
   --enable-x264) x264="yes"
   ;;
-  --enable-avisynth) avisynth="yes";
+  --enable-avisynth) avisynth="yes"
   ;;
-  --enable-x11grab) x11grab="yes";
+  --enable-x11grab) x11grab="yes"
   ;;
   --enable-dc1394) dc1394="yes"
     pkg_requires="$pkg_requires libraw1394"
@@ -993,7 +1102,7 @@ for opt do
   ;;
   --disable-mpegaudio-hp) mpegaudio_hp="no"
   ;;
-  --disable-protocols) protocols="no"; network="no"; ffserver="no"
+  --disable-protocols) protocols="no"
   ;;
   --disable-ffmpeg) ffmpeg="no"
   ;;
@@ -1017,6 +1126,10 @@ for opt do
   ;;
   --enable-w32threads) w32threads="yes"
   ;;
+  --enable-beosthreads) beosthreads="yes"
+  ;;
+  --enable-os2threads) os2threads="yes"
+  ;;
   --enable-swscaler) swscaler="yes"
   ;;
   --enable-gpl) gpl="yes"
@@ -1041,7 +1154,7 @@ for opt do
   ;;
   --disable-muxer=*) disable ${optval}_muxer
   ;;
-  --disable-muxers) disable $MUXER_LIST; ffserver="no"
+  --disable-muxers) disable $MUXER_LIST
   ;;
   --enable-demuxer=*) enable ${optval}_demuxer
   ;;
@@ -1065,16 +1178,16 @@ for opt do
   esac
 done
 
-if test "$logging" != no; then
-    test "$logging" = yes || logfile="$logging"
+if ! disabled logging ; then
+    enabled logging || logfile="$logging"
     echo "# $0 $@" >$logfile
     set >>$logfile
 else
     logfile=/dev/null
 fi
 
-if test "$mingw32" = "yes" -o "$wince" = "yes"; then
-    if test "$lshared" = "yes" && test "$lstatic" = "yes" ; then
+if enabled_any mingw32 wince; then
+    if enabled_all lshared lstatic; then
         cat <<EOF
 You can only build one library type at once on MinGW.
 Specify --disable-static --enable-shared to only build
@@ -1083,14 +1196,11 @@ you do not need to pass additional options.
 EOF
         exit 1
     fi
-    video4linux="no"
-    video4linux2="no"
-    audio_oss="no"
     dv1394="no"
     dc1394="no"
     ffserver="no"
     network="no"
-    if test "$wince" = "yes"; then
+    if enabled wince; then
         protocols="no"
     fi
     SLIBPREF=""
@@ -1113,7 +1223,7 @@ ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
 
 # we need to build at least one lib type
-if test "$lstatic" = "no" && test "$lshared" = "no" ; then
+if disabled_all lstatic lshared; then
     cat <<EOF
 At least one library type must be built.
 Specify --enable-static to build the static libraries or --enable-shared to
@@ -1123,57 +1233,41 @@ EOF
     exit 1;
 fi
 
-if test "$libvorbis" = "yes" && test "$libogg" = "no"; then
-    die "libogg must be enabled to enable libvorbis."
+if disabled libogg; then
+    enabled libtheora && die "libogg must be enabled to enable libtheora."
+    enabled libvorbis && die "libogg must be enabled to enable libvorbis."
 fi
 
-if test "$gpl" != "yes"; then
-    if test "$pp" != "no"; then
-        die "The Postprocessing code is under GPL and --enable-gpl is not specified."
-    fi
-
-    if test "$liba52" != "no" -o "$liba52bin" != "no"; then
-        die "liba52 is under GPL and --enable-gpl is not specified."
-    fi
-
-    if test "$xvid" != "no"; then
-        die "libxvidcore is under GPL and --enable-gpl is not specified."
-    fi
-
-    if test "$x264" != "no"; then
-        die "x264 is under GPL and --enable-gpl is not specified."
-    fi
-
-    if test "$libdts" != "no"; then
-        die "libdts is under GPL and --enable-gpl is not specified."
-    fi
-
-    if test "$libfaad" != "no" -o "$libfaadbin" != "no"; then
-        if check_header faad.h; then
-            check_cc << EOF
-                #include <faad.h>
-                #ifndef FAAD2_VERSION
-                ok faad1
-                #endif
-                int main( void ) { return 0; }
+if enabled_any libfaad libfaadbin ; then
+    if check_header faad.h; then
+        check_cc << EOF
+#include <faad.h>
+#ifndef FAAD2_VERSION
+ok faad1
+#endif
+int main( void ) { return 0; }
 EOF
-            if test $? = 0 ; then
-                die "FAAD2 is under GPL and --enable-gpl is not specified."
-            fi
-        else
-            libfaad="no"
-            libfaadbin="no"
-            echo "FAAD test failed."
-        fi
+        test $? = 0 && enable libfaad2
+    else
+        die "FAAD test failed."
     fi
+fi
 
-    if test "$x11grab" != "no"; then
-        die "The X11 grabber is under GPL and --enable-gpl is not specified."
-    fi
 
-    if test "$swscaler" != "no"; then
-        die "The software scaler is under GPL and --enable-gpl is not specified."
-    fi
+if disabled gpl ; then
+    die_gpl_disabled(){
+        name=$1
+        shift
+        enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
+    }
+    die_gpl_disabled "The Postprocessing code" pp
+    die_gpl_disabled "liba52"                  liba52 liba52bin
+    die_gpl_disabled "libxvidcore"             xvid
+    die_gpl_disabled "x264"                    x264
+    die_gpl_disabled "libdts"                  libdts
+    die_gpl_disabled "FAAD2"                   libfaad2
+    die_gpl_disabled "The X11 grabber"         x11grab
+    die_gpl_disabled "The software scaler"     swscaler
 fi
 
 # compute MMX state
@@ -1200,13 +1294,13 @@ if test $targetos = Darwin; then
                 ;;
             *[34].*)
                 add_cflags "-no-cpp-precomp -pipe -force_cpusubtype_ALL -Wno-sign-compare"
-                if test "$lshared" = no; then
+                if disabled lshared; then
                    needmdynamicnopic="yes"
                 fi
                 ;;
             *)
                 add_cflags "-no-cpp-precomp -pipe"
-                if test "$lshared" = no; then
+                if disabled lshared; then
                    needmdynamicnopic="yes"
                 fi
                 ;;
@@ -1214,9 +1308,7 @@ if test $targetos = Darwin; then
     fi
 fi
 
-if test $optimize != "no"; then
-    add_cflags "-fomit-frame-pointer"
-fi
+disabled optimize || add_cflags -fomit-frame-pointer
 
 # Can only do AltiVec on PowerPC
 if test $altivec = "default"; then
@@ -1230,48 +1322,37 @@ fi
 # Add processor-specific flags
 POWERPCMODE="32bits"
 if test $cpu != "generic"; then
+    warn_altivec(){
+        $1 altivec && echo "WARNING: Tuning for $2 but AltiVec $1.";
+    }
     case $cpu in
         601|ppc601|PowerPC601)
             add_cflags "-mcpu=601"
-            if test $altivec = "yes"; then
-                echo "WARNING: Tuning for PPC601 but AltiVec enabled!";
-            fi
+            warn_altivec enabled PPC601
         ;;
         603*|ppc603*|PowerPC603*)
             add_cflags "-mcpu=603"
-            if test $altivec = "yes"; then
-                echo "WARNING: Tuning for PPC603 but AltiVec enabled!";
-            fi
+            warn_altivec enabled PPC603
         ;;
         604*|ppc604*|PowerPC604*)
             add_cflags "-mcpu=604"
-            if test $altivec = "yes"; then
-                echo "WARNING: Tuning for PPC604 but AltiVec enabled!";
-            fi
+            warn_altivec enabled PPC604
         ;;
         G3|g3|75*|ppc75*|PowerPC75*)
             add_cflags "-mcpu=750 -mpowerpc-gfxopt"
-            if test $altivec = "yes"; then
-                echo "WARNING: Tuning for PPC75x but AltiVec enabled!";
-            fi
+            warn_altivec enabled PPC75x
         ;;
         G4|g4|745*|ppc745*|PowerPC745*)
             add_cflags "-mcpu=7450 -mpowerpc-gfxopt"
-            if test $altivec = "no"; then
-                echo "WARNING: Tuning for PPC745x but AltiVec disabled!";
-            fi
+            warn_altivec disabled PPC745x
         ;;
         74*|ppc74*|PowerPC74*)
             add_cflags "-mcpu=7400 -mpowerpc-gfxopt"
-            if test $altivec = "no"; then
-                echo "WARNING: Tuning for PPC74xx but AltiVec disabled!";
-            fi
+            warn_altivec disabled PPC74xx
         ;;
         G5|g5|970|ppc970|PowerPC970|power4*|Power4*)
             add_cflags "-mcpu=970 -mpowerpc-gfxopt -mpowerpc64"
-            if test $altivec = "no"; then
-                echo "WARNING: Tuning for PPC970 but AltiVec disabled!";
-            fi
+            warn_altivec disabled PPC970
             POWERPCMODE="64bits"
         ;;
         # targets that do NOT support conditional mov (cmov)
@@ -1280,16 +1361,16 @@ if test $cpu != "generic"; then
             cmov="no"
         ;;
         # targets that do support conditional mov (cmov)
-        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx)
+        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2)
             add_cflags "-march=$cpu"
             cmov="yes"
-            cmov_is_fast="yes"
+            fast_cmov="yes"
         ;;
         # targets that do support conditional mov but on which it's slow
         pentium4|prescott|nocona)
             add_cflags "-march=$cpu"
             cmov="yes"
-            cmov_is_fast="no"
+            fast_cmov="no"
         ;;
         sparc64)
             add_cflags "-mcpu=v9"
@@ -1300,6 +1381,14 @@ if test $cpu != "generic"; then
     esac
 fi
 
+gnu_make(){
+    $1 --version 2>&1 | grep -q GNU
+}
+
+if ! gnu_make $make; then
+    gnu_make gmake && make=gmake || die "GNU make not found."
+fi
+
 # make sure we can execute files in $TMPDIR
 cat >$TMPE 2>>$logfile <<EOF
 #! /bin/sh
@@ -1323,7 +1412,7 @@ int main(){
 EOF
 if test "$?" != 0; then
     echo "$cc is unable to create an executable file."
-    if test -z "$cross_prefix" -a "$cross_compile" = no; then
+    if test -z "$cross_prefix" && disabled cross_compile ; then
         echo "If $cc is a cross-compiler, use the --cross-compile option."
         echo "Only do this if you know what cross compiling means."
     fi
@@ -1347,7 +1436,7 @@ fi
 
 # AltiVec flags: The FSF version of GCC differs from the Apple version
 if test $arch = "powerpc"; then
-    if test $altivec = "yes"; then
+    if enabled altivec; then
         if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
             add_cflags "-faltivec"
         else
@@ -1359,8 +1448,8 @@ fi
 check_header altivec.h
 
 # check if our compiler supports Motorola AltiVec C API
-if test $altivec = "yes"; then
-    if test $altivec_h = "yes"; then
+if enabled altivec; then
+    if enabled altivec_h; then
         inc_altivec_h="#include <altivec.h>"
     else
         inc_altivec_h=
@@ -1385,6 +1474,14 @@ if test $armv5te = "default" -a $arch = "armv4l"; then
 EOF
 fi
 
+if test $armv6 = "default" -a $arch = "armv4l"; then
+    check_cc <<EOF && armv6=yes || armv6=no
+int main(void) {
+    __asm__ __volatile__ ("sadd16 r0, r0, r0");
+}
+EOF
+fi
+
 # check iwmmxt support
 if test $iwmmxt = "default" -a $arch = "armv4l"; then
     iwmmxt=no
@@ -1414,7 +1511,7 @@ EOF
 
 # ---
 # big/little-endian test
-if test "$cross_compile" = "no"; then
+if disabled cross_compile; then
     check_ld <<EOF || die "endian test failed" && $TMPE && bigendian="yes"
 #include <inttypes.h>
 int main(int argc, char ** argv){
@@ -1435,8 +1532,7 @@ fi
 check_header malloc.h
 check_func memalign
 
-if test "$memalign" = "no" -a "$need_memalign" = "yes" -a \
-        "$memalign_hack" != "yes"; then
+if disabled_all memalign memalign_hack && enabled need_memalign ; then
     die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack."
 fi
 
@@ -1462,17 +1558,28 @@ if enabled pthreads; then
     fi
 fi
 
+for thread in pthreads beosthreads os2threads w32threads; do
+    if enabled $thread; then
+        if ! disabled thread_type ; then
+            die "ERROR: Only one thread type must be selected."
+        else
+            thread_type="$thread"
+        fi
+    fi
+done
+
 # these are off by default, so fail if requested and not available
-enabled libdts  && require libdts dts.h dts_init -ldts -lm
-enabled libgsm  && require libgsm gsm.h gsm_create -lgsm
-enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
-enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
-enabled libogg  && require libogg ogg/ogg.h ogg_sync_init -logg
-enabled libnut  && require libnut libnut.h nut_demuxer_init -lnut
-enabled xvid    && require XviD xvid.h xvid_global -lxvidcore
-enabled x264    && require x264 x264.h x264_encoder_open -lx264
-enabled dc1394  && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
-enabled mlib    && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
+enabled libdts     && require libdts dts.h dts_init -ldts -lm
+enabled libgsm     && require libgsm gsm.h gsm_create -lgsm
+enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
+enabled libtheora  && require libtheora theora/theora.h theora_info_init -ltheora -logg
+enabled libvorbis  && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
+enabled libogg     && require libogg ogg/ogg.h ogg_sync_init -logg
+enabled libnut     && require libnut libnut.h nut_demuxer_init -lnut
+enabled xvid       && require XviD xvid.h xvid_global -lxvidcore
+enabled x264       && require x264 x264.h x264_encoder_open -lx264
+enabled dc1394     && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
+enabled mlib       && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
 
 # Ugh, libfaac uses stdcall calling convention on win32 so we can't use
 # the generic test functions
@@ -1546,15 +1653,11 @@ elif check_func dlopen -ldl; then
     ldl=-ldl
 fi
 
-if test "$vhook" = "default"; then
-    vhook="$dlopen"
-fi
+test "$vhook" = "default" && vhook="$dlopen"
 
-if enabled_any vhook liba52bin libfaadbin; then
-    add_extralibs $ldl
-fi
+enabled_any vhook liba52bin libfaadbin && add_extralibs $ldl
 
-if test "$targetos" = "CYGWIN" -a "$lstatic" = "yes" ; then
+if test "$targetos" = "CYGWIN" && enabled lstatic ; then
     vhook="no"
     echo
     echo "At the moment vhooks don't work on Cygwin static builds."
@@ -1567,35 +1670,28 @@ if enabled vhook; then
     check_ldflags -export-dynamic
 fi
 
-if enabled audio_beos; then
-    add_extralibs "-lmedia -lbe"
-fi
+enabled audio_beos && add_extralibs "-lmedia -lbe"
 
 ##########################################
 # imlib check
 
-temp_extralibs -lImlib2
-check_ld <<EOF && imlib2=yes || imlib2=no
-#include <X11/Xlib.h>
-#include <Imlib2.h>
-int main( void ) { return (int) imlib_load_font("foo"); }
-EOF
-restore_flags
+imlib2=no
+if imlib2-config --version >/dev/null 2>&1; then
+    temp_cflags `imlib2-config --cflags`
+    temp_extralibs `imlib2-config --libs`
+    check_lib Imlib2.h imlib_load_font && enable imlib2
+    restore_flags
+fi
 
 ##########################################
 # FreeType check
 
 freetype2=no
-if test "x$targetos" != "xBeOS"; then
-  if (freetype-config --version) >/dev/null 2>&1 ; then
-      temp_cflags `freetype-config --cflags`
-      temp_extralibs `freetype-config --libs`
-      check_ld <<EOF && freetype2=yes
-#include <ft2build.h>
-int main( void ) { return (int) FT_Init_FreeType(0); }
-EOF
-      restore_flags
-  fi
+if freetype-config --version >/dev/null 2>&1; then
+    temp_cflags `freetype-config --cflags`
+    temp_extralibs `freetype-config --libs`
+    check_lib ft2build.h FT_Init_FreeType && enable freetype2
+    restore_flags
 fi
 
 ##########################################
@@ -1604,21 +1700,17 @@ fi
 sdl_too_old=no
 sdl=no
 SDL_CONFIG="${cross_prefix}sdl-config"
-if ("${SDL_CONFIG}" --version) >/dev/null 2>&1 ; then
-    temp_cflags `"${SDL_CONFIG}" --cflags`
+if "${SDL_CONFIG}" --version >/dev/null 2>&1; then
+    sdl_cflags=`"${SDL_CONFIG}" --cflags`
+    temp_cflags $sdl_cflags
     temp_extralibs `"${SDL_CONFIG}" --libs`
-    check_ld <<EOF
-#include <SDL.h>
-#undef main /* We don't want SDL to override our main() */
-int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
-EOF
-    if test $? = 0; then
+    if check_lib SDL.h SDL_Init; then
         _sdlversion=`"${SDL_CONFIG}" --version | sed 's/[^0-9]//g'`
         if test "$_sdlversion" -lt 121 ; then
             sdl_too_old=yes
         else
             sdl=yes
-            check_cc <<EOF && sdl_video_size=yes || sdl_video_size=no
+            check_cc $sdl_cflags <<EOF && enable sdl_video_size
 #include <SDL.h>
 int main(void){
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
@@ -1631,15 +1723,7 @@ EOF
     restore_flags
 fi
 
-enabled sdl || ffplay=no
-
-##########################################
-# texi2html check
-
-texi2html=no
-if (texi2html -version) >/dev/null 2>&1; then
-texi2html=yes
-fi
+texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html
 
 ##########################################
 # IPv6 check
@@ -1658,29 +1742,26 @@ int main( void ) {
 }
 EOF
 
-# check for video4linux2 --- V4L2_PIX_FMT_YUV420
-enabled video4linux2 && check_cc <<EOF || video4linux2="no"
-#include <sys/time.h>
-#include <asm/types.h>
-#include <linux/videodev2.h>
-int dummy = V4L2_PIX_FMT_YUV420;
-struct v4l2_buffer dummy1;
-EOF
+enabled video4linux  && check_header linux/videodev.h  || disable video4linux
+enabled video4linux2 && check_header linux/videodev2.h || disable video4linux2
 
 # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
 if enabled bktr; then
-    check_header dev/bktr/ioctl_meteor.h
-    check_header dev/bktr/ioctl_bt848.h
-
-    check_header machine/ioctl_meteor.h
-    check_header machine/ioctl_bt848.h
-
-    check_header dev/video/meteor/ioctl_meteor.h
-    check_header dev/video/bktr/ioctl_bt848.h
-
-    check_header dev/ic/bt8xx.h
+    { check_header dev/bktr/ioctl_meteor.h &&
+      check_header dev/bktr/ioctl_bt848.h; } ||
+    { check_header machine/ioctl_meteor.h &&
+      check_header machine/ioctl_bt848.h; } ||
+    { check_header dev/video/meteor/ioctl_meteor.h &&
+      check_header dev/video/bktr/ioctl_bt848.h; } ||
+    check_header dev/ic/bt8xx.h ||
+    disable bktr
 fi
 
+enabled audio_oss &&
+    check_header sys/soundcard.h ||
+    check_header soundcard.h ||
+    disable audio_oss
+
 # Deal with the x11 frame grabber
 enabled x11grab                         &&
 enabled gpl                             &&
@@ -1701,6 +1782,7 @@ check_cflags -Wno-switch
 check_cflags -Wdisabled-optimization
 check_cflags -Wpointer-arith
 check_cflags -Wredundant-decls
+check_cflags -Wno-pointer-sign
 enabled extrawarnings && check_cflags -Winline
 
 # add some linker flags
@@ -1719,22 +1801,22 @@ if enabled optimize; then
 fi
 
 # PIC flags for shared library objects where they are needed
-if test "$lshared" = "yes" ; then
+if enabled lshared; then
     # LIBOBJFLAGS may have already been set in the OS configuration
     if test -z "$LIBOBJFLAGS" ; then
         case "$arch" in
-            x86_64|ia64|alpha|sparc*) LIBOBJFLAGS="\$(PIC)" ;;
+            x86_64|ia64|alpha|sparc*|power*) LIBOBJFLAGS="\$(PIC)" ;;
         esac
     fi
 fi
 
-if test "$gprof" = "yes" ; then
+if enabled gprof; then
     add_cflags  "-p"
     add_ldflags "-p"
 fi
 
 VHOOKCFLAGS="-fPIC $CFLAGS"
-test "$needmdynamicnopic" = yes && add_cflags -mdynamic-no-pic
+enabled needmdynamicnopic && add_cflags -mdynamic-no-pic
 
 # find if .align arg is power-of-two or not
 if test $asmalign_pot = "unknown"; then
@@ -1755,10 +1837,11 @@ echo "big-endian                $bigendian"
 if test $arch = "x86_32" -o $arch = "x86_64"; then
     echo "MMX enabled               $mmx"
     echo "CMOV enabled              $cmov"
-    echo "CMOV is fast              $cmov_is_fast"
+    echo "CMOV is fast              $fast_cmov"
 fi
 if test $arch = "armv4l"; then
     echo "ARMv5TE enabled           $armv5te"
+    echo "ARMv6 enabled             $armv6"
     echo "IWMMXT enabled            $iwmmxt"
 fi
 if test $arch = "mips"; then
@@ -1777,17 +1860,17 @@ echo "shared                    $lshared"
 echo "postprocessing support    $pp"
 echo "software scaler enabled   $swscaler"
 echo "video hooking             $vhook"
-if test "$vhook" = "yes"; then
+if enabled vhook; then
     echo "Imlib2 support            $imlib2"
     echo "FreeType support          $freetype2"
 fi
 echo "network support           $network"
-if test "$network" = "yes" ; then
+if enabled network; then
     echo "IPv6 support              $ipv6"
 fi
-echo "pthreads support          $pthreads"
+echo "threading support         $thread_type"
 echo "SDL support               $sdl"
-if test $sdl_too_old = "yes"; then
+if enabled sdl_too_old; then
     echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support."
 fi
 echo "Sun medialib support      $mlib"
@@ -1799,18 +1882,19 @@ echo "libfaac enabled           $libfaac"
 echo "libfaad enabled           $libfaad"
 echo "faadbin enabled           $libfaadbin"
 echo "libgsm enabled            $libgsm"
-echo "libmp3lame enabled        $mp3lame"
+echo "libmp3lame enabled        $libmp3lame"
 echo "libnut enabled            $libnut"
 echo "libogg enabled            $libogg"
+echo "libtheora enabled         $libtheora"
 echo "libvorbis enabled         $libvorbis"
-echo "XviD enabled              $xvid"
 echo "x264 enabled              $x264"
+echo "XviD enabled              $xvid"
 echo "zlib enabled              $zlib"
 echo "AMR-NB float support      $amr_nb"
 echo "AMR-NB fixed support      $amr_nb_fixed"
 echo "AMR-WB float support      $amr_wb"
 echo "AMR-WB IF2 support        $amr_if2"
-if test "$gpl" = "no" ; then
+if disabled gpl; then
     echo "License: LGPL"
 else
     echo "License: GPL"
@@ -1820,7 +1904,7 @@ echo "Creating config.mak and config.h..."
 
 echo "# Automatically generated by configure - do not modify!" > config.mak
 echo "/* Automatically generated by configure - do not modify! */" > $TMPH
-echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
+echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
 
 echo "PREFIX=$PREFIX" >> config.mak
 echo "prefix=\$(DESTDIR)\${PREFIX}" >> config.mak
@@ -1833,12 +1917,10 @@ echo "MAKE=$make" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak
-if test "$dostrip" = "yes" ; then
+if enabled dostrip; then
     echo "STRIP=$strip" >> config.mak
-    echo "INSTALLSTRIP=$installstrip" >> config.mak
 else
     echo "STRIP=echo ignoring strip" >> config.mak
-    echo "INSTALLSTRIP=" >> config.mak
 fi
 
 echo "OPTFLAGS=$CFLAGS" >> config.mak
@@ -1854,7 +1936,7 @@ echo "BUILD_STATIC=$lstatic" >> config.mak
 echo "BUILDSUF=$BUILDSUF" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
 echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
-if test "$lstatic" = "yes" ; then
+if enabled lstatic; then
   echo "LIB=$LIB" >> config.mak
 else # Some Make complain if this variable does not exist.
   echo "LIB=" >> config.mak
@@ -1878,7 +1960,7 @@ case "$arch" in
         if test "$POWERPCMODE" = "64bits"; then
             echo "#define POWERPC_MODE_64BITS 1" >> $TMPH
         fi
-        if test "$powerpc_perf" = "yes"; then
+        if enabled powerpc_perf; then
             echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH
         fi
         ;;
@@ -1888,46 +1970,19 @@ case "$arch" in
         ;;
 esac
 
-if test "$bigendian" = "yes" ; then
+if enabled bigendian; then
   echo "WORDS_BIGENDIAN=yes" >> config.mak
   echo "#define WORDS_BIGENDIAN 1" >> $TMPH
 fi
-if test "$mmx" = "yes" ; then
-  echo "TARGET_MMX=yes" >> config.mak
-  echo "#define HAVE_MMX 1" >> $TMPH
+if enabled mmx; then
   echo "#define __CPU__ 586" >> $TMPH
 fi
-if test "$cmov" = "yes" ; then
-  echo "TARGET_CMOV=yes" >> config.mak
-  echo "#define HAVE_CMOV 1" >> $TMPH
-fi
-if test "$cmov_is_fast" = "yes" ; then
-  echo "TARGET_CMOV_IS_FAST=yes" >> config.mak
-  echo "#define CMOV_IS_FAST 1" >> $TMPH
-fi
-if test "$armv5te" = "yes" ; then
-  echo "TARGET_ARMV5TE=yes" >> config.mak
-  echo "#define HAVE_ARMV5TE 1" >> $TMPH
-fi
-if test "$iwmmxt" = "yes" ; then
-  echo "TARGET_IWMMXT=yes" >> config.mak
-  echo "#define HAVE_IWMMXT 1" >> $TMPH
-fi
-if test "$mmi" = "yes" ; then
-  echo "TARGET_MMI=yes" >> config.mak
-  echo "#define HAVE_MMI 1" >> $TMPH
-fi
-
-if test "$altivec" = "yes" ; then
-  echo "TARGET_ALTIVEC=yes" >> config.mak
-  echo "#define HAVE_ALTIVEC 1" >> $TMPH
-fi
 
-if test "$sdl" = "yes" ; then
+if enabled sdl; then
   echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak
   echo "SDL_CFLAGS=`"${SDL_CONFIG}" --cflags`" >> config.mak
 fi
-if test "$texi2html" = "yes"; then
+if enabled texi2html; then
   echo "BUILD_DOC=yes" >> config.mak
 fi
 
@@ -1939,7 +1994,7 @@ lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h
 
 
 
-if test "$lshared" = "yes" ; then
+if enabled lshared; then
   echo "BUILD_SHARED=yes" >> config.mak
   echo "PIC=-fPIC -DPIC" >> config.mak
   echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
@@ -1968,8 +2023,12 @@ enabled_any $DEMUXER_LIST && enable demuxers
 
 enabled_any pthreads beosthreads os2threads w32threads && enable threads
 
+check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \
+    $DEMUXER_LIST $MUXER_LIST
+
 print_config HAVE_   $TMPH config.mak $HAVE_LIST
 print_config CONFIG_ $TMPH config.mak $CONFIG_LIST
+print_config TARGET_ $TMPH config.mak $TARGET_LIST
 
 if test "$targetos" = "Darwin"; then
   echo "#define CONFIG_DARWIN 1"  >> $TMPH
@@ -1986,12 +2045,12 @@ echo "SRC_PATH=\"$source_path\"" >> config.mak
 echo "SRC_PATH_BARE=$source_path" >> config.mak
 echo "BUILD_ROOT=\"$PWD\"" >> config.mak
 
-if test "$amr_if2" = "yes" ; then
+if enabled amr_if2; then
   echo "AMR_CFLAGS=-DIF2=1" >> config.mak
 fi
 
 # Apparently it's not possible to portably echo a backslash.
-if test "$asmalign_pot" = "yes" ; then
+if enabled asmalign_pot; then
   printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH
 else
   printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH
@@ -2021,7 +2080,7 @@ fi
 rm -f $TMPO $TMPC $TMPE $TMPS $TMPH
 
 # build tree in object directory if source path is different from current one
-if test "$source_path_used" = "yes" ; then
+if enabled source_path_used; then
     DIRS="\
          doc \
          libavformat \
@@ -2066,6 +2125,7 @@ fi
 
 
 # build pkg-config files
+# FIXME: libdir and includedir are hardcoded and may differ from the real path.
 
 pkgconfig_generate(){
 name=$1
@@ -2122,12 +2182,12 @@ pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version"
 pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
 pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
 
-if test "$pp" = "yes"; then
+if enabled pp; then
   pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
   pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
 fi
 
-if test "$swscaler" != "no"; then
+if enabled swscaler; then
   pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "-lswscale" "libavutil = $lavu_version" swscale
   pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
 else