]> git.sesse.net Git - ffmpeg/blobdiff - configure
swf can contain only one audio track, simplify
[ffmpeg] / configure
index be4e5747385bb364bba59c0e21ddfcd408b189f8..7a420ef9680e3546060872a7de5aef5966eec856 100755 (executable)
--- a/configure
+++ b/configure
@@ -62,36 +62,40 @@ 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 A52 support [default=no]"
-  echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
-  echo "  --enable-dts             enable GPLed DTS 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 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-x264            enable H.264 encoding via x264 [default=no]"
+  echo "  --enable-xvid            enable XviD support via xvidcore [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 ""
@@ -393,14 +397,18 @@ require(){
     check_lib $header $func "$@" || die "ERROR: $name not found"
 }
 
+apply(){
+    file=$1
+    shift
+    "$@" < "$file" > "$file.tmp" && mv "$file.tmp" "$file" || rm "$file.tmp"
+}
+
 CONFIG_LIST='
     encoders
     decoders
     parsers
     muxers
     demuxers
-    a52
-    a52bin
     amr
     amr_nb
     amr_nb_fixed
@@ -411,22 +419,24 @@ CONFIG_LIST='
     beos_netserver
     bktr
     dc1394
-    dts
     dv1394
-    faac
-    faad
-    faadbin
     ffmpeg
     ffplay
     ffserver
     gpl
     ipv6
+    liba52
+    liba52bin
+    libdts
+    libfaac
+    libfaad
+    libfaadbin
     libgsm
+    libmp3lame
     libnut
     libogg
     libvorbis
     memalign_hack
-    mp3lame
     mpegaudio_hp
     network
     pp
@@ -436,6 +446,7 @@ CONFIG_LIST='
     video4linux
     video4linux2
     wince
+    x11grab
     x264
     xvid
     zlib
@@ -446,6 +457,11 @@ HAVE_LIST='
     beosthreads
     byteswap_h
     dcbzl
+    dev_bktr_ioctl_bt848_h
+    dev_bktr_ioctl_meteor_h
+    dev_ic_bt8xx_h
+    dev_video_meteor_ioctl_meteor_h
+    dev_video_bktr_ioctl_bt848_h
     dlfcn_h
     dlopen
     freetype2
@@ -454,6 +470,8 @@ HAVE_LIST='
     inet_aton
     localtime_r
     lrintf
+    machine_ioctl_bt848_h
+    machine_ioctl_meteor_h
     malloc_h
     memalign
     mlib
@@ -568,24 +586,25 @@ video4linux2="yes"
 bktr="no"
 audio_oss="yes"
 audio_beos="no"
+x11grab="no"
 dv1394="yes"
 dc1394="no"
 network="yes"
 ipv6="yes"
 zlib="yes"
+liba52="no"
+liba52bin="no"
+libdts="no"
+libfaac="no"
+libfaad="no"
+libfaadbin="no"
 libgsm="no"
-mp3lame="no"
+libmp3lame="no"
 libnut="no"
 libogg="no"
 libvorbis="no"
-faad="no"
-faadbin="no"
-faac="no"
 xvid="no"
 x264="no"
-a52="no"
-a52bin="no"
-dts="no"
 pp="no"
 mingw32="no"
 wince="no"
@@ -631,7 +650,11 @@ amr_wb="no"
 amr_nb_fixed="no"
 amr_if2="no"
 mlib="no"
+beosthreads="no"
+os2threads="no"
 pthreads="no"
+w32threads="no"
+thread_type="no"
 swscaler="no"
 gpl="no"
 memalign_hack="no"
@@ -663,7 +686,6 @@ 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
@@ -744,7 +766,7 @@ 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)"
+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"
@@ -754,7 +776,6 @@ SLIBSUF=".dylib"
 SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
 SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
 FFSERVERLDFLAGS=-Wl,-bind_at_load
-LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"'
 ;;
 MINGW32*)
 # Note: the rest of the mingw32 config is done afterwards as mingw32
@@ -812,7 +833,6 @@ dv1394="no"
 ffserver="no"
 vhook="no"
 os2="yes"
-os2threads="yes"
 ;;
 *)
 targetos="${targetos}-UNKNOWN"
@@ -917,17 +937,17 @@ for opt do
   ;;
   --disable-zlib) zlib="no"
   ;;
-  --enable-a52) a52="yes"
+  --enable-a52) liba52="yes"
   ;;
-  --enable-a52bin) a52bin="yes"
+  --enable-a52bin) liba52bin="yes"
   ;;
-  --enable-dts) dts="yes"
+  --enable-dts) libdts="yes"
   ;;
   --enable-pp) pp="yes"
   ;;
   --enable-libgsm) libgsm="yes"
   ;;
-  --enable-mp3lame) mp3lame="yes"
+  --enable-mp3lame) libmp3lame="yes"
   ;;
   --enable-libnut) libnut="yes"
   ;;
@@ -937,11 +957,11 @@ for opt do
   --enable-vorbis) libvorbis="yes"
     pkg_requires="$pkg_requires vorbis vorbisenc"
   ;;
-  --enable-faad) faad="yes"
+  --enable-faad) libfaad="yes"
   ;;
-  --enable-faadbin) faadbin="yes"
+  --enable-faadbin) libfaadbin="yes"
   ;;
-  --enable-faac) faac="yes"
+  --enable-faac) libfaac="yes"
   ;;
   --enable-xvid) xvid="yes"
   ;;
@@ -949,6 +969,8 @@ for opt do
   ;;
   --enable-avisynth) avisynth="yes";
   ;;
+  --enable-x11grab) x11grab="yes";
+  ;;
   --enable-dc1394) dc1394="yes"
     pkg_requires="$pkg_requires libraw1394"
   ;;
@@ -996,6 +1018,12 @@ for opt do
   ;;
   --enable-pthreads) pthreads="yes"
   ;;
+  --enable-w32threads) w32threads="yes"
+  ;;
+  --enable-beosthreads) beosthreads="yes"
+  ;;
+  --enable-os2threads) os2threads="yes"
+  ;;
   --enable-swscaler) swscaler="yes"
   ;;
   --enable-gpl) gpl="yes"
@@ -1064,15 +1092,11 @@ EOF
     fi
     video4linux="no"
     video4linux2="no"
-    bktr="no"
     audio_oss="no"
     dv1394="no"
     dc1394="no"
     ffserver="no"
     network="no"
-    if enabled mingw32; then
-        w32threads="yes"
-    fi
     if test "$wince" = "yes"; then
         protocols="no"
     fi
@@ -1082,6 +1106,7 @@ EOF
     SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
     SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
     SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
+    SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"\$(shlibdir)/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\""
     SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc"
 fi
 
@@ -1105,40 +1130,32 @@ EOF
     exit 1;
 fi
 
-if test "$libvorbis" = "yes" ; then
-    if test "$libogg" = "no"; then
-        echo "libogg must be enabled to enable Vorbis."
-        fail="yes"
-    fi
+if test "$libvorbis" = "yes" && test "$libogg" = "no"; then
+    die "libogg must be enabled to enable libvorbis."
 fi
 
 if test "$gpl" != "yes"; then
     if test "$pp" != "no"; then
-        echo "The Postprocessing code is under GPL and --enable-gpl is not specified."
-        fail="yes"
+        die "The Postprocessing code is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$a52" != "no" -o "$a52bin" != "no"; then
-        echo "liba52 is under GPL and --enable-gpl is not specified."
-        fail="yes"
+    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
-        echo "libxvidcore is under GPL and --enable-gpl is not specified."
-        fail="yes"
+        die "libxvidcore is under GPL and --enable-gpl is not specified."
     fi
 
     if test "$x264" != "no"; then
-        echo "x264 is under GPL and --enable-gpl is not specified."
-        fail="yes"
+        die "x264 is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$dts" != "no"; then
-        echo "libdts is under GPL and --enable-gpl is not specified."
-        fail="yes"
+    if test "$libdts" != "no"; then
+        die "libdts is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$faad" != "no" -o "$faadbin" != "no"; then
+    if test "$libfaad" != "no" -o "$libfaadbin" != "no"; then
         if check_header faad.h; then
             check_cc << EOF
                 #include <faad.h>
@@ -1148,24 +1165,22 @@ if test "$gpl" != "yes"; then
                 int main( void ) { return 0; }
 EOF
             if test $? = 0 ; then
-                echo "FAAD2 is under GPL and --enable-gpl is not specified."
-                fail="yes"
+                die "FAAD2 is under GPL and --enable-gpl is not specified."
             fi
         else
-            faad="no"
-            faadbin="no"
+            libfaad="no"
+            libfaadbin="no"
             echo "FAAD test failed."
         fi
     fi
 
-    if test "$swscaler" != "no"; then
-        echo "The software scaler is under GPL and --enable-gpl is not specified."
-        fail="yes"
+    if test "$x11grab" != "no"; then
+        die "The X11 grabber is under GPL and --enable-gpl is not specified."
     fi
-fi
 
-if test "$fail" = "yes"; then
-    exit 1
+    if test "$swscaler" != "no"; then
+        die "The software scaler is under GPL and --enable-gpl is not specified."
+    fi
 fi
 
 # compute MMX state
@@ -1272,7 +1287,7 @@ 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"
@@ -1454,10 +1469,20 @@ if enabled pthreads; then
     fi
 fi
 
+for thread in pthreads beosthreads os2threads w32threads; do
+    if enabled $thread; then
+        if test $thread_type != "no"; 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 dts     && require libdts dts.h dts_init -ldts -lm
+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 libmp3lame && 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
@@ -1466,9 +1491,9 @@ 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, faac uses stdcall calling convention on win32 so we can't use
+# Ugh, libfaac uses stdcall calling convention on win32 so we can't use
 # the generic test functions
-if enabled faac; then
+if enabled libfaac; then
     save_flags
     temp_extralibs -lfaac
     check_ld <<EOF && add_extralibs -lfaac || die "ERROR: libfaac not found"
@@ -1485,7 +1510,7 @@ fi
 
 # Ugh, recent faad2 versions have renamed all functions and #define the
 # old names in faad.h.  Generic tests won't work.
-if enabled faad; then
+if enabled libfaad; then
     save_flags
     temp_extralibs -lfaad
     check_ld <<EOF && add_extralibs -lfaad || die "ERROR: libfaad not found"
@@ -1542,7 +1567,7 @@ if test "$vhook" = "default"; then
     vhook="$dlopen"
 fi
 
-if enabled_any vhook a52bin faadbin; then
+if enabled_any vhook liba52bin libfaadbin; then
     add_extralibs $ldl
 fi
 
@@ -1659,6 +1684,31 @@ int dummy = V4L2_PIX_FMT_YUV420;
 struct v4l2_buffer dummy1;
 EOF
 
+# 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
+fi
+
+# Deal with the x11 frame grabber
+enabled x11grab                         &&
+enabled gpl                             &&
+enabled x11_grab_device_demuxer         &&
+check_header X11/Xlib.h                 &&
+check_header X11/extensions/XShm.h      &&
+check_func XOpenDisplay -lX11           &&
+check_func XShmCreateImage -lX11 -lXext &&
+add_extralibs -lX11 -lXext              ||
+disable x11_grab_device_demuxer
+
 enabled debug && add_cflags -g
 
 # add some useful compiler flags if supported
@@ -1709,75 +1759,74 @@ if test $asmalign_pot = "unknown"; then
     echo 'asm (".align 3");' | check_cc && asmalign_pot="yes"
 fi
 
-echo "install prefix   $PREFIX"
-echo "source path      $source_path"
-echo "C compiler       $cc"
-echo "make             $make"
-echo "ARCH             $arch ($cpu)"
+echo "install prefix            $PREFIX"
+echo "source path               $source_path"
+echo "C compiler                $cc"
+echo "make                      $make"
+echo ".align is power-of-two    $asmalign_pot"
+echo "ARCH                      $arch ($cpu)"
 if test "$BUILDSUF" != ""; then
-    echo "build suffix     $BUILDSUF"
+    echo "build suffix              $BUILDSUF"
 fi
-echo "big-endian       $bigendian"
+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 "MMX enabled               $mmx"
+    echo "CMOV enabled              $cmov"
+    echo "CMOV is fast              $cmov_is_fast"
 fi
 if test $arch = "armv4l"; then
-    echo "ARMv5TE enabled  $armv5te"
-    echo "IWMMXT enabled   $iwmmxt"
+    echo "ARMv5TE enabled           $armv5te"
+    echo "IWMMXT enabled            $iwmmxt"
 fi
 if test $arch = "mips"; then
-    echo "MMI enabled      $mmi"
+    echo "MMI enabled               $mmi"
 fi
 if test $arch = "powerpc"; then
-    echo "AltiVec enabled  $altivec"
-    echo "dcbzl available  $dcbzl"
-fi
-echo "gprof enabled    $gprof"
-echo "zlib enabled     $zlib"
-echo "libgsm enabled   $libgsm"
-echo "mp3lame enabled  $mp3lame"
-echo "libnut enabled   $libnut"
-echo "libogg enabled   $libogg"
-echo "Vorbis enabled   $libvorbis"
-echo "FAAD enabled     $faad"
-echo "faadbin enabled  $faadbin"
-echo "FAAC enabled     $faac"
-echo "XviD enabled     $xvid"
-echo "x264 enabled     $x264"
-echo "a52 support      $a52"
-echo "a52 dlopened     $a52bin"
-echo "DTS support      $dts"
-echo "pp support       $pp"
-echo "Software Scaler enabled $swscaler"
-echo "AVISynth enabled $avisynth"
-echo "debug symbols    $debug"
-echo "strip symbols    $dostrip"
-echo "optimize         $optimize"
-echo "static           $lstatic"
-echo "shared           $lshared"
-echo "video hooking    $vhook"
-echo "SDL support      $sdl"
-if test $sdl_too_old = "yes"; then
-    echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support."
-fi
-
+    echo "AltiVec enabled           $altivec"
+    echo "dcbzl available           $dcbzl"
+fi
+echo "gprof enabled             $gprof"
+echo "debug symbols             $debug"
+echo "strip symbols             $dostrip"
+echo "optimize                  $optimize"
+echo "static                    $lstatic"
+echo "shared                    $lshared"
+echo "postprocessing support    $pp"
+echo "software scaler enabled   $swscaler"
+echo "video hooking             $vhook"
 if test "$vhook" = "yes"; then
-    echo "Imlib2 support   $imlib2"
-    echo "FreeType support $freetype2"
-fi
-echo "Sun medialib support"  $mlib
-echo "pthreads support"      $pthreads
-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
-echo "network support      $network"
+    echo "Imlib2 support            $imlib2"
+    echo "FreeType support          $freetype2"
+fi
+echo "network support           $network"
 if test "$network" = "yes" ; then
-    echo "IPv6 support         $ipv6"
+    echo "IPv6 support              $ipv6"
+fi
+echo "threading support         $thread_type"
+echo "SDL support               $sdl"
+if test $sdl_too_old = "yes"; then
+    echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support."
 fi
-echo ".align is power-of-two" $asmalign_pot
+echo "Sun medialib support      $mlib"
+echo "AVISynth enabled          $avisynth"
+echo "liba52 support            $liba52"
+echo "liba52 dlopened           $liba52bin"
+echo "libdts support            $libdts"
+echo "libfaac enabled           $libfaac"
+echo "libfaad enabled           $libfaad"
+echo "faadbin enabled           $libfaadbin"
+echo "libgsm enabled            $libgsm"
+echo "libmp3lame enabled        $libmp3lame"
+echo "libnut enabled            $libnut"
+echo "libogg enabled            $libogg"
+echo "libvorbis enabled         $libvorbis"
+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
     echo "License: LGPL"
 else
@@ -1924,6 +1973,7 @@ if test "$lshared" = "yes" ; then
   echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
   echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
   echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak
+  echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak
 fi
 echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
 echo "EXTRALIBS=$extralibs" >> config.mak
@@ -2001,6 +2051,9 @@ if test "$source_path_used" = "yes" ; then
          libavcodec/mlib \
          libavcodec/ppc \
          libavcodec/liba52 \
+         libavcodec/amr \
+         libavcodec/amr_float \
+         libavcodec/amrwb_float \
          libpostproc \
          libavutil \
          libswscale \
@@ -2028,168 +2081,76 @@ if test "$source_path_used" = "yes" ; then
     done
 fi
 
-# build pkg-config files libav*.pc and libpostproc.pc
-# libavutil.pc
-cat <<EOF >libavutil.pc
-prefix=$PREFIX
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libavutil
-Description: FFmpeg utility library
-Version: $lavu_version
-Requires:
-Conflicts:
-Libs: -L\${libdir} -lavutil
-Cflags: -I\${includedir} -I\${includedir}/ffmpeg
-EOF
-
-cat <<EOF >libavutil-uninstalled.pc
-prefix=
-exec_prefix=
-libdir=\${pcfiledir}/libavutil
-includedir=\${pcfiledir}/libavutil
 
-Name: libavutil
-Description: FFmpeg utility library
-Version: $lavu_version
-Requires:
-Conflicts:
-Libs: \${libdir}/${LIBPREF}avutil${LIBSUF}
-Cflags: -I\${includedir}
-EOF
-
-# libavcodec.pc
-cat <<EOF >libavcodec.pc
-prefix=$PREFIX
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libavcodec
-Description: FFmpeg codec library
-Version: $lavc_version
-Requires: $pkg_requires libavutil = $lavu_version
-Conflicts:
-Libs: -L\${libdir} -lavcodec $extralibs
-Cflags: -I\${includedir} -I\${includedir}/ffmpeg
-EOF
-
-cat <<EOF >libavcodec-uninstalled.pc
-prefix=
-exec_prefix=
-libdir=\${pcfiledir}/libavcodec
-includedir=\${pcfiledir}/libavcodec
-
-Name: libavcodec
-Description: FFmpeg codec library
-Version: $lavc_version
-Requires: $pkg_requires libavutil = $lavu_version
-Conflicts:
-Libs: \${libdir}/${LIBPREF}avcodec${LIBSUF} $extralibs
-Cflags: -I\${includedir}
-EOF
+# build pkg-config files
+# FIXME: libdir and includedir are hardcoded and may differ from the real path.
 
-# libavformat.pc
-cat <<EOF >libavformat.pc
+pkgconfig_generate(){
+name=$1
+comment=$2
+version=$3
+libs=$4
+requires=$5
+include=$6
+cat <<EOF >$name.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
 libdir=\${exec_prefix}/lib
 includedir=\${prefix}/include
 
-Name: libavformat
-Description: FFmpeg container format library
-Version: $lavf_version
-Requires: $pkg_requires libavcodec = $lavc_version
+Name: $name
+Description: $comment
+Version: $version
+Requires: $requires
 Conflicts:
-Libs: -L\${libdir} -lavformat $extralibs
-Cflags: -I\${includedir} -I\${includedir}/ffmpeg
+Libs: -L\${libdir} $libs
+Cflags: -I\${includedir} -I\${includedir}/$include
 EOF
+}
 
-cat <<EOF >libavformat-uninstalled.pc
+pkgconfig_generate_uninstalled(){
+name=$1
+shortname=${name#lib}
+comment=$2
+version=$3
+libs=$4
+requires=$5
+cat <<EOF >$name-uninstalled.pc
 prefix=
 exec_prefix=
-libdir=\${pcfiledir}/libavformat
-includedir=\${pcfiledir}/libavformat
+libdir=\${pcfiledir}/$name
+includedir=\${pcfiledir}/$name
 
-Name: libavformat
-Description: FFmpeg container format library
-Version: $lavf_version
-Requires: $pkg_requires libavcodec = $lavc_version
+Name: $name
+Description: $comment
+Version: $version
+Requires: $requires
 Conflicts:
-Libs: \${libdir}/${LIBPREF}avformat${LIBSUF} $extralibs
+Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
 Cflags: -I\${includedir}
 EOF
+}
 
+pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
+pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
 
-# libpostproc.pc
-cat <<EOF >libpostproc.pc
-prefix=$PREFIX
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libpostproc
-Description: FFmpeg post processing library
-Version: $pp_version
-Requires:
-Conflicts:
-Libs: -L\${libdir} -lpostproc
-Cflags: -I\${includedir} -I\${includedir}/postproc
-EOF
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
 
-cat <<EOF >libpostproc-uninstalled.pc
-prefix=
-exec_prefix=
-libdir=\${pcfiledir}/libpostproc
-includedir=\${pcfiledir}/libpostproc
+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"
 
-Name: libpostproc
-Description: FFmpeg post processing library
-Version: $pp_version
-Requires:
-Conflicts:
-Libs: \${libdir}/${LIBPREF}postproc${LIBSUF}
-Cflags: -I\${includedir}
-EOF
+if test "$pp" = "yes"; 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
-  sws_pc_libs="-L\${libdir} -lswscale"
-  sws_pc_uninstalled_libs="\${libdir}/${LIBPREF}swscale${LIBSUF}"
-  sws_pc_requires="$pkg_requires libavutil = $lavu_version"
+  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
-  sws_pc_libs=""
-  sws_pc_uninstalled_libs=""
-  sws_pc_requires="$pkg_requires libavcodec = $lavc_version"
+  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" swscale
+  pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
+  apply libswscale.pc sed s/^Libs:.*$/Libs:/
+  apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
 fi
-# libswscale.pc
-cat <<EOF >libswscale.pc
-prefix=$PREFIX
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libswscale
-Description: FFmpeg image rescaling library
-Version: $sws_version
-Requires: $sws_pc_requires
-Conflicts:
-Libs: $sws_pc_libs
-Cflags: -I\${includedir} -I\${includedir}/swscale
-EOF
-
-cat <<EOF >libswscale-uninstalled.pc
-prefix=
-exec_prefix=
-libdir=\${pcfiledir}/libswscale
-includedir=\${pcfiledir}/libswscale
-
-Name: libswscale
-Description: FFmpeg image rescaling library
-Version: $sws_version
-Requires: $sws_pc_requires
-Conflicts:
-Libs: $sws_pc_uninstalled_libs
-Cflags: -I\${includedir}
-EOF