]> git.sesse.net Git - ffmpeg/blobdiff - configure
Fix for AVI files with odd sized 'movi' list
[ffmpeg] / configure
index 36c2d5936580a6bc06f8559f42f70ab032d773f3..6c9065f08ecdec18237510a1654fa256de72ccb7 100755 (executable)
--- a/configure
+++ b/configure
@@ -58,6 +58,7 @@ show_help(){
   echo "  --enable-dc1394          enable IIDC-1394 grabbing using libdc1394"
   echo "                           and libraw1394 [default=no]"
   echo "  --enable-swscaler        software scaler support [default=no]"
+  echo "  --enable-avisynth        allow reading AVISynth script files [default=no]"
   echo "  --enable-gpl             allow use of GPL code, the resulting libav*"
   echo "                           and ffmpeg will be under GPL [default=no]"
   echo ""
@@ -86,6 +87,7 @@ show_help(){
   echo "  --disable-bktr           disable bktr video grabbing [default=no]"
   echo "  --disable-dv1394         disable DV1394 grabbing [default=no]"
   echo "  --disable-network        disable network support [default=no]"
+  echo "  --disable-ipv6           disable ipv6 support [default=no]"
   echo "  --disable-zlib           disable zlib [default=no]"
   echo "  --disable-simple_idct    disable simple IDCT routines [default=no]"
   echo "  --disable-vhook          disable video hooking support"
@@ -352,7 +354,7 @@ case "$cpu" in
   ;;
   x86_64|amd64)
     cpu="x86"
-    canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
+    canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
         cpu="x86_64"
@@ -393,6 +395,9 @@ case "$cpu" in
   ia64)
     cpu="ia64"
   ;;
+  bfin)
+    cpu="bfin"
+  ;;
   *)
     cpu="unknown"
   ;;
@@ -406,6 +411,7 @@ audio_beos="no"
 dv1394="yes"
 dc1394="no"
 network="yes"
+ipv6="yes"
 zlib="yes"
 libgsm="no"
 mp3lame="no"
@@ -435,11 +441,12 @@ bigendian="no"
 inttypes="yes"
 emu_fast_int="no"
 vhook="default"
+avisynth="no"
 dlfcn="no"
 dlopen="no"
 mpegaudio_hp="yes"
 SHFLAGS='-shared -Wl,-soname,$@'
-VHOOKFLAGS="$SHFLAGS"
+VHOOKSHFLAGS="$SHFLAGS"
 netserver="no"
 need_inet_aton="no"
 protocols="yes"
@@ -477,7 +484,7 @@ case $targetos in
 BeOS)
 PREFIX="/boot/home/config"
 # helps building libavcodec
-CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer"
+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
@@ -485,7 +492,7 @@ case "$gcc_version" in
 mmx="no"
 ;;
 *20010315*) echo "BeBits gcc"
-CFLAGS="$CFLAGS -fno-expensive-optimizations"
+add_cflags "-fno-expensive-optimizations"
 ;;
 esac
 SHFLAGS=-nostart
@@ -515,7 +522,7 @@ FFLDFLAGS=""
 FFSERVERLDFLAGS=""
 SHFLAGS="-shared -Wl,-h,\$@"
 need_inet_aton="yes"
-extralibs="$extralibs -lsocket -lnsl"
+add_extralibs "-lsocket -lnsl"
 ;;
 NetBSD)
 v4l="no"
@@ -524,7 +531,7 @@ bktr="yes"
 audio_oss="yes"
 dv1394="no"
 make="gmake"
-extralibs="$extralibs -lossaudio"
+add_extralibs "-lossaudio"
 ;;
 OpenBSD)
 v4l="no"
@@ -535,7 +542,7 @@ dv1394="no"
 make="gmake"
 LIBOBJFLAGS="\$(PIC)"
 LDCONFIG="ldconfig -m \$(shlibdir)"
-extralibs="$extralibs -lossaudio"
+add_extralibs "-lossaudio"
 ;;
 FreeBSD)
 v4l="no"
@@ -544,7 +551,7 @@ bktr="yes"
 audio_oss="yes"
 dv1394="no"
 make="gmake"
-CFLAGS="$CFLAGS -pthread"
+add_cflags "-pthread"
 ;;
 GNU/kFreeBSD)
 v4l="no"
@@ -552,7 +559,7 @@ v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
-CFLAGS="$CFLAGS -pthread"
+add_cflags "-pthread"
 ;;
 BSD/OS)
 v4l="no"
@@ -572,7 +579,7 @@ v4l2="no"
 audio_oss="no"
 dv1394="no"
 SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
-VHOOKFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
+VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
 extralibs=""
 strip="strip -x"
 installstrip=""
@@ -619,7 +626,7 @@ TMPE=$TMPE".exe"
 ar="emxomfar -p128"
 ranlib="echo ignoring ranlib"
 strip="echo ignoring strip"
-CFLAGS="$CFLAGS -Zomf"
+add_cflags "-Zomf"
 FFLDFLAGS="-Zomf -Zstack 16384 -s"
 SHFLAGS="-Zdll -Zomf"
 FFSERVERLDFLAGS=""
@@ -696,7 +703,7 @@ for opt do
   ;;
   --make=*) make="$optval"
   ;;
-  --extra-cflags=*) CFLAGS="$CFLAGS $optval"
+  --extra-cflags=*) add_cflags "$optval"
   ;;
   --extra-ldflags=*) EXTRALDFLAGS="$optval"
   ;;
@@ -732,6 +739,8 @@ for opt do
   ;;
   --disable-network) network="no"; ffserver="no"
   ;;
+  --disable-ipv6) ipv6="no";
+  ;;
   --disable-zlib) zlib="no"
   ;;
   --enable-a52) a52="yes"
@@ -762,6 +771,8 @@ for opt do
   ;;
   --enable-x264) x264="yes"
   ;;
+  --enable-avisynth) avisynth="yes";
+  ;;
   --enable-dc1394) dc1394="yes"
     pkg_requires="$pkg_requires libraw1394"
   ;;
@@ -890,7 +901,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)"
-    FFLDFLAGS="-Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)"
+    SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)"
     if test "$force_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi
     if test "$force_libdir" != yes; then bindir='${PREFIX}'; fi
     shlibdir='${PREFIX}'
@@ -1003,21 +1014,21 @@ fi
 needmdynamicnopic="no"
 if test $targetos = Darwin; then
     if test -n "`$cc -v 2>&1 | grep xlc`"; then
-        CFLAGS="$CFLAGS -qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
+        add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
     else
         gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
         case "$gcc_version" in
             *2.95*)
-                CFLAGS="$CFLAGS -no-cpp-precomp -pipe"
+                add_cflags "-no-cpp-precomp -pipe"
                 ;;
             *[34].*)
-                CFLAGS="$CFLAGS -no-cpp-precomp -pipe -force_cpusubtype_ALL -Wno-sign-compare"
+                add_cflags "-no-cpp-precomp -pipe -force_cpusubtype_ALL -Wno-sign-compare"
                 if test "$lshared" = no; then
                    needmdynamicnopic="yes"
                 fi
                 ;;
             *)
-                CFLAGS="$CFLAGS -no-cpp-precomp -pipe"
+                add_cflags "-no-cpp-precomp -pipe"
                 if test "$lshared" = no; then
                    needmdynamicnopic="yes"
                 fi
@@ -1025,7 +1036,7 @@ if test $targetos = Darwin; then
         esac
     fi
     if test $optimize != "no"; then
-        CFLAGS="$CFLAGS -fomit-frame-pointer"
+        add_cflags "-fomit-frame-pointer"
     fi
 fi
 
@@ -1044,49 +1055,49 @@ POWERPCMODE="32bits"
 if test $tune != "generic"; then
     case $tune in
         601|ppc601|PowerPC601)
-            CFLAGS="$CFLAGS -mcpu=601"
+            add_cflags "-mcpu=601"
             if test $altivec = "yes"; then
                 echo "WARNING: Tuning for PPC601 but AltiVec enabled!";
             fi
             TUNECPU=ppc601
         ;;
         603*|ppc603*|PowerPC603*)
-            CFLAGS="$CFLAGS -mcpu=603"
+            add_cflags "-mcpu=603"
             if test $altivec = "yes"; then
                 echo "WARNING: Tuning for PPC603 but AltiVec enabled!";
             fi
             TUNECPU=ppc603
         ;;
         604*|ppc604*|PowerPC604*)
-            CFLAGS="$CFLAGS -mcpu=604"
+            add_cflags "-mcpu=604"
             if test $altivec = "yes"; then
                 echo "WARNING: Tuning for PPC604 but AltiVec enabled!";
             fi
             TUNECPU=ppc604
         ;;
         G3|g3|75*|ppc75*|PowerPC75*)
-            CFLAGS="$CFLAGS -mcpu=750 -mtune=750 -mpowerpc-gfxopt"
+            add_cflags "-mcpu=750 -mtune=750 -mpowerpc-gfxopt"
             if test $altivec = "yes"; then
                 echo "WARNING: Tuning for PPC75x but AltiVec enabled!";
             fi
             TUNECPU=ppc750
         ;;
         G4|g4|745*|ppc745*|PowerPC745*)
-            CFLAGS="$CFLAGS -mcpu=7450 -mtune=7450 -mpowerpc-gfxopt"
+            add_cflags "-mcpu=7450 -mtune=7450 -mpowerpc-gfxopt"
             if test $altivec = "no"; then
                 echo "WARNING: Tuning for PPC745x but AltiVec disabled!";
             fi
             TUNECPU=ppc7450
         ;;
         74*|ppc74*|PowerPC74*)
-            CFLAGS="$CFLAGS -mcpu=7400 -mtune=7400 -mpowerpc-gfxopt"
+            add_cflags "-mcpu=7400 -mtune=7400 -mpowerpc-gfxopt"
             if test $altivec = "no"; then
                 echo "WARNING: Tuning for PPC74xx but AltiVec disabled!";
             fi
             TUNECPU=ppc7400
         ;;
         G5|g5|970|ppc970|PowerPC970|power4*|Power4*)
-            CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
+            add_cflags "-mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
             if test $altivec = "no"; then
                 echo "WARNING: Tuning for PPC970 but AltiVec disabled!";
             fi
@@ -1094,10 +1105,10 @@ if test $tune != "generic"; then
             POWERPCMODE="64bits"
         ;;
         i[3456]86|pentium|pentiumpro|pentium-mmx|pentium[234]|prescott|k6|k6-[23]|athlon|athlon-tbird|athlon-4|athlon-[mx]p|winchip-c6|winchip2|c3|nocona|athlon64|k8|opteron|athlon-fx)
-            CFLAGS="$CFLAGS -march=$tune"
+            add_cflags "-march=$tune"
         ;;
         sparc64)
-            CFLAGS="$CFLAGS -mcpu=v9 -mtune=v9"
+            add_cflags "-mcpu=v9 -mtune=v9"
         ;;
         *)
         echo "WARNING: Unknown CPU \"$tune\", ignored."
@@ -1125,9 +1136,9 @@ fi
 if test $cpu = "powerpc"; then
     if test $altivec = "yes"; then
         if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
-            CFLAGS="$CFLAGS -faltivec"
+            add_cflags "-faltivec"
         else
-            CFLAGS="$CFLAGS -maltivec -mabi=altivec"
+            add_cflags "-maltivec -mabi=altivec"
         fi
     fi
 fi
@@ -1236,7 +1247,8 @@ if check_header malloc.h; then
 fi
 
 if test "$_memalign" = "no" -a "$mmx" = "yes" -a \
-        "$memalignhack" != "yes" -a "$targetos" != "Darwin" ; then
+        "$memalignhack" != "yes" -a "$targetos" != "Darwin" -a \
+        "$targetos" != "FreeBSD" ; then
     die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack."
 fi
 
@@ -1296,6 +1308,22 @@ EOF
     restore_flags
 fi
 
+# Ugh, avisynth uses WINAPI calls. Generic tests won't work.
+if enabled avisynth; then
+    save_flags
+    temp_extralibs -lvfw32
+    check_ld <<EOF && add_extralibs -lvfw32 || die "ERROR: vfw32 not found"
+#include <windows.h>
+#include <vfw.h>
+int main(){
+    AVIFileInit();
+    return 0;
+}
+EOF
+    restore_flags
+fi
+
+
 # test for lrintf in math.h
 check_exec <<EOF && have_lrintf=yes || have_lrintf=no
 #define _ISOC9X_SOURCE  1
@@ -1412,7 +1440,7 @@ fi
 ##########################################
 # IPv6 check
 
-enabled network && check_ld <<EOF && ipv6=yes || ipv6=no
+enabled network && enabled ipv6 && check_ld <<EOF && ipv6=yes || ipv6=no
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -1441,6 +1469,10 @@ enabled debug && add_cflags -g
 check_cflags -Wdeclaration-after-statement
 check_cflags -Wall
 check_cflags -Wno-switch
+check_cflags -Wdisabled-optimization
+check_cflags -Wpointer-arith
+check_cflags -Wredundant-decls
+check_cflags -Winline
 
 # add some linker flags
 check_ldflags '-Wl,--as-needed' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavformat' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
@@ -1450,10 +1482,10 @@ test "$optimize" = "small" && check_cflags -Os
 
 if enabled optimize; then
     if test -n "`$cc -v 2>&1 | grep xlc`"; then
-        CFLAGS="$CFLAGS -O5"
-        LDFLAGS="$LDFLAGS -O5"
+        add_cflags  "-O5"
+        add_ldflags "-O5"
     else
-        CFLAGS="-O3 $CFLAGS"
+        add_cflags "-O3"
     fi
 fi
 
@@ -1468,8 +1500,8 @@ if test "$lshared" = "yes" ; then
 fi
 
 if test "$gprof" = "yes" ; then
-    CFLAGS="$CFLAGS -p"
-    LDFLAGS="$LDFLAGS -p"
+    add_cflags  "-p"
+    add_ldflags "-p"
 fi
 
 # find if .align arg is power-of-two or not
@@ -1519,6 +1551,7 @@ 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"
@@ -1578,18 +1611,16 @@ else
     echo "INSTALLSTRIP=" >> config.mak
 fi
 
-# SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic, used when building
-# shared modules on OS/X (vhook/Makefile).
-SHCFLAGS="$CFLAGS"
+VHOOKCFLAGS="-fPIC $CFLAGS"
 test "$needmdynamicnopic" = yes && add_cflags -mdynamic-no-pic
 
 echo "OPTFLAGS=$CFLAGS" >> config.mak
-echo "SHCFLAGS=$SHCFLAGS">>config.mak
+echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "LDCONFIG=$LDCONFIG" >> config.mak
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
-echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak
+echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
 echo "BUILD_STATIC=$lstatic" >> config.mak
 echo "BUILDSUF=$BUILDSUF" >> config.mak
@@ -1653,6 +1684,9 @@ elif test "$cpu" = "m68k" ; then
 elif test "$cpu" = "ia64" ; then
   echo "TARGET_ARCH_IA64=yes" >> config.mak
   echo "#define ARCH_IA64 1" >> $TMPH
+elif test "$cpu" = "bfin" ; then
+  echo "TARGET_ARCH_BFIN=yes" >> config.mak
+  echo "#define ARCH_BFIN 1" >> $TMPH
 fi
 echo "#define TUNECPU $TUNECPU" >> $TMPH
 if test "$bigendian" = "yes" ; then
@@ -1926,6 +1960,11 @@ if test "$x264" = "yes" ; then
   echo "CONFIG_X264=yes" >> config.mak
 fi
 
+if test "$avisynth" = "yes" ; then
+  echo "#define CONFIG_AVISYNTH 1" >> $TMPH
+  echo "CONFIG_AVISYNTH=yes" >> config.mak
+fi
+
 if test "$mingw32" = "yes" ; then
   echo "CONFIG_MINGW=yes" >> config.mak
   echo "HAVE_W32THREADS=yes" >> config.mak
@@ -2107,16 +2146,18 @@ if test "$amr_if2" = "yes" ; 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
-  echo '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t"' >> $TMPH
+  printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH
 else
-  echo '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"' >> $TMPH
+  printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH
 fi
 
 
+# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
 for codec in $DECODER_LIST $ENCODER_LIST $PARSER_LIST $DEMUXER_LIST $MUXER_LIST; do
-    echo "#define CONFIG_`echo $codec | tr a-z A-Z` 1" >> $TMPH
-    echo "CONFIG_`echo $codec | tr a-z A-Z`=yes" >> config.mak
+    echo "#define CONFIG_`echo $codec | tr '[a-z]' '[A-Z]'` 1" >> $TMPH
+    echo "CONFIG_`echo $codec | tr '[a-z]' '[A-Z]'`=yes" >> config.mak
 done
 
 # Do not overwrite config.h if unchanged to avoid superfluous rebuilds.