X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=8b8ce6cdebddee029591ddc08fe55b222ddc481c;hb=caf5fb95ae8b3507ee64d24561a848840e6a8fc3;hp=0972a9e6371c6fb37e372cbb607f8d3bed88a1b4;hpb=747a0554ea8ad09404c1f5b80239ebd8d71b291e;p=ffmpeg diff --git a/configure b/configure index 0972a9e6371..8b8ce6cdebd 100755 --- a/configure +++ b/configure @@ -13,15 +13,21 @@ EOF echo "Standard options:" echo " --help print this message" echo " --prefix=PREFIX install in PREFIX [$prefix]" +echo " --libdir=DIR install libs in DIR [PREFIX/lib]" echo " --mandir=DIR man documentation in DIR [PREFIX/man]" echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no]" -echo " --enable-vorbis enable vorbis support via libvorbisenc [default=no]" +echo " --enable-libogg enable ogg support via libogg [default=no]" +echo " --enable-vorbis enable vorbis support via libvorbis [default=no]" +echo " --enable-theora enable theora support via libtheora [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-xvid enable xvid support via xvidcore [default=no]" +echo " --enable-x264 enable H.264 encoding via x264 [default=no]" echo " --enable-mingw32 enable mingw32 native/cross windows compile" echo " --enable-a52 enable GPL'ed A52 support [default=no]" echo " --enable-a52bin open liba52.so.0 at runtime [default=no]" +echo " --enable-dts enable GPL'ed DTS support [default=no]" echo " --enable-pp enable GPL'ed post processing support [default=no]" echo " --enable-shared-pp use libpostproc.so [default=no]" echo " --enable-shared build shared libraries [default=no]" @@ -29,6 +35,9 @@ 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-sunmlib use Sun medialib [default=no]" +echo " --enable-pthreads use pthreads [default=no]" +echo " --enable-dc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [default=no]" +echo " --enable-gpl allow use of gpl code, the resulting libav* and ffmpeg will be under gpl [default=no]" echo "" echo "Advanced options (experts only):" echo " --source-path=PATH path of source code [$source_path]" @@ -58,8 +67,9 @@ echo " --disable-mpegaudio-hp faster (but less accurate)" echo " mpegaudio decoding [default=no]" echo " --disable-ffserver disable ffserver build" echo " --disable-ffplay disable ffplay build" -echo " --disable-risky disables patent encumbered codecs" echo " --enable-small optimize for size instead of speed" +echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" +echo " --disable-strip disable stripping of executables and shared libraries" echo "" echo "NOTE: The object files are build at the place where configure is launched" exit 1 @@ -82,6 +92,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" # default parameters prefix="/usr/local" +libdir="" mandir="" bindir="" cross_prefix="" @@ -100,6 +111,14 @@ case "$cpu" in i386|i486|i586|i686|i86pc|BePC) cpu="x86" ;; + x86_64) + if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \ + -z "`echo $CFLAGS | grep -- -m32`" ]; then + cpu="x86_64" + else + cpu="x86" + fi + ;; # armv4l is a subset of armv5tel armv4l|armv5tel) cpu="armv4l" @@ -113,9 +132,12 @@ case "$cpu" in mips) cpu="mips" ;; - sun4u) + sun4u|sparc64) cpu="sparc64" ;; + sparc) + cpu="sparc" + ;; sh4) cpu="sh4" ;; @@ -128,15 +150,21 @@ v4l="yes" audio_oss="yes" audio_beos="no" dv1394="yes" +dc1394="no" network="yes" zlib="yes" mp3lame="no" +libogg="no" vorbis="no" +theora="no" faad="no" faadbin="no" faac="no" +xvid="no" +x264="no" a52="no" a52bin="no" +dts="no" pp="no" shared_pp="no" mingw32="no" @@ -145,6 +173,7 @@ os2="no" lshared="no" optimize="yes" debug="yes" +dostrip="yes" extralibs="-lm" simpleidct="yes" bigendian="no" @@ -166,11 +195,14 @@ LIBSUF=".a" SLIBPREF="lib" SLIBSUF=".so" EXESUF="" -risky="yes" amr_nb="no" amr_wb="no" amr_nb_fixed="no" +amr_if2="no" sunmlib="no" +pthreads="no" +gpl="no" +memalignhack="no" # OS specific targetos=`uname -s` @@ -215,12 +247,24 @@ FFSLDFLAGS="" need_inet_aton="yes" extralibs="$extralibs -lsocket -lnsl" ;; -FreeBSD) +NetBSD) v4l="no" audio_oss="yes" dv1394="no" make="gmake" LDFLAGS="$LDFLAGS -export-dynamic" +case `uname -r` in +2.*) extralibs="-lossaudio" +;; +esac +;; +FreeBSD) +v4l="no" +audio_oss="yes" +dv1394="no" +make="gmake" +CFLAGS="-pthread" +LDFLAGS="$LDFLAGS -export-dynamic -pthread" ;; BSD/OS) v4l="no" @@ -239,7 +283,7 @@ SHFLAGS="-dynamiclib" extralibs="" darwin="yes" strip="strip -x" -LDFLAGS="-Wl,-d" +LDFLAGS="-Wl,-d,-search_paths_first" FFSLDFLAGS=-Wl,-bind_at_load ;; MINGW32*) @@ -251,12 +295,14 @@ CYGWIN*) v4l="no" audio_oss="yes" dv1394="no" +ffserver="no" extralibs="" cygwin="yes" +EXESUF=".exe" test -f /usr/include/inttypes.h || \ test -f /usr/local/include/inttypes.h || \ echo "Missing inttypes.h, please copy cygwin_inttypes.h to" \ - "/usr/include/inttypes.h !!!" + "/usr/local/include/inttypes.h !!!" ;; Linux) LDFLAGS="$LDFLAGS -rdynamic" @@ -269,12 +315,12 @@ make="gmake" ;; OS/2) TMPE=$TMPE".exe" -ar="emxomfar -p64" +ar="emxomfar -p128" ranlib="echo ignoring ranlib" strip="echo ignoring strip" CFLAGS="-Zomf" LDFLAGS="-Zomf -Zstack 16384 -s" -SHFLAGS="" +SHFLAGS="-Zdll -Zomf" FFSLDFLAGS="" LIBPREF="" LIBSUF=".lib" @@ -287,7 +333,9 @@ audio_oss="no" dv1394="no" network="no" ffserver="no" +vhook="no" os2="yes" + ;; *) ;; esac @@ -297,7 +345,7 @@ esac # of AltiVec on PowerPC TARGET_OS=`( uname -s ) 2>&1` case "$TARGET_OS" in - Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU) + Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS) ;; IRIX*) TARGET_OS=IRIX @@ -323,10 +371,17 @@ if test -z "$source_path" -o "$source_path" = "." ; then source_path_used="no" fi +FFMPEG_CONFIGURATION=" " +for opt do + FFMPEG_CONFIGURATION="$FFMPEG_CONFIGURATION""$opt " +done + for opt do case "$opt" in --prefix=*) prefix=`echo $opt | cut -d '=' -f 2` ;; + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2` + ;; --mandir=*) mandir=`echo $opt | cut -d '=' -f 2` ;; --source-path=*) source_path=`echo $opt | cut -d '=' -f 2` @@ -337,9 +392,9 @@ for opt do ;; --make=*) make=`echo $opt | cut -d '=' -f 2` ;; - --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}" + --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}" ;; - --extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=} + --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}" ;; --extra-libs=*) extralibs=${opt#--extra-libs=} ;; @@ -363,7 +418,7 @@ for opt do ;; --disable-dv1394) dv1394="no" ;; - --disable-network) network="no" + --disable-network) network="no"; ffserver="no" ;; --disable-zlib) zlib="no" ;; @@ -371,20 +426,32 @@ for opt do ;; --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs" ;; + --enable-dts) dts="yes" ; extralibs="$extralibs -ldts" + ;; --enable-pp) pp="yes" ;; --enable-shared-pp) shared_pp="yes" ;; --enable-mp3lame) mp3lame="yes" ;; + --enable-libogg) libogg="yes" + ;; --enable-vorbis) vorbis="yes" ;; + --enable-theora) theora="yes" + ;; --enable-faad) faad="yes" ;; --enable-faadbin) faadbin="yes" ;; --enable-faac) faac="yes" ;; + --enable-xvid) xvid="yes" + ;; + --enable-x264) x264="yes"; extralibs="$extralibs -lx264" + ;; + --enable-dc1394) dc1394="yes" + ;; --disable-vhook) vhook="no" ;; --disable-simple_idct) simpleidct="no" @@ -403,8 +470,6 @@ for opt do ;; --disable-ffplay) ffplay="no" ;; - --disable-risky) risky="no" - ;; --enable-small) optimize="small" ;; --enable-amr_nb) amr_nb="yes" @@ -413,14 +478,97 @@ for opt do ;; --enable-amr_wb) amr_wb="yes" ;; + --enable-amr_if2) amr_if2="yes" + ;; --enable-sunmlib) sunmlib="yes" ;; + --enable-pthreads) pthreads="yes" + ;; + --enable-gpl) gpl="yes" + ;; + --enable-memalign-hack) memalignhack="yes" + ;; + --disable-strip) dostrip="no" + ;; esac done +if test "$theora" = "yes" ; then + if test "$libogg" = "no"; then + echo "libogg must be enabled to enable Theora" + fail="yes" + theora="no" + fi +fi + +if test "$vorbis" = "yes" ; then + if test "$libogg" = "no"; then + echo "libogg must be enabled to enable Vorbis" + fail="yes" + vorbis="no" + fi +fi + +if test "$gpl" != "yes"; then + if test "$pp" != "no" -o "$shared_pp" != "no"; then + echo "The Postprocessing code is under GPL and --enable-gpl is not specified" + fail="yes" + fi + + if test "$a52" != "no" -o "$a52bin" != "no"; then + echo "liba52 is under GPL and --enable-gpl is not specified" + fail="yes" + fi + + if test "$xvid" != "no"; then + echo "libxvidcore is under GPL and --enable-gpl is not specified" + fail="yes" + fi + + if test "$x264" != "no"; then + echo "x264 is under GPL and --enable-gpl is not specified" + fail="yes" + fi + + if test "$dts" != "no"; then + echo "libdts is under GPL and --enable-gpl is not specified" + fail="yes" + fi + + if test "$faad" != "no" -o "$faadbin" != "no"; then + cat > $TMPC << EOF + #include + int main( void ) { return 0; } +EOF + + if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then + cat > $TMPC << EOF + #include + #ifndef FAAD2_VERSION + ok faad1 + #endif + int main( void ) { return 0; } +EOF + if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then + echo "faad2 is under GPL and --enable-gpl is not specified" + fail="yes" + fi + else + faad="no" + faadbin="no" + echo "faad test failed" + fi + fi + + + if test "$fail" = "yes"; then + exit 1 + fi +fi + # compute mmx state if test $mmx = "default"; then - if test $cpu = "x86"; then + if test $cpu = "x86" -o $cpu = "x86_64"; then mmx="yes" else mmx="no" @@ -465,6 +613,7 @@ fi # Add processor-specific flags TUNECPU="generic" +POWERPCMODE="32bits" if test $tune != "generic"; then case $tune in 601|ppc601|PowerPC601) @@ -510,11 +659,12 @@ if test $tune != "generic"; then TUNECPU=ppc7400 ;; G5|g5|970|ppc970|PowerPC970|power4*|Power4*) - CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc64 -force_cpusubtype_ALL " + CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64" if test $altivec = "no"; then echo "WARNING: tuning for PPC970 but altivec disabled !"; fi TUNECPU=ppc970 + POWERPCMODE="64bits" ;; *) echo "WARNING: unknown CPU "$tune", ignored" @@ -591,6 +741,7 @@ if test "$mingw32" = "yes" ; then v4l="no" audio_oss="no" dv1394="no" + dc1394="no" ffserver="no" network="no" LIBPREF="" @@ -672,6 +823,7 @@ _malloc_h=yes _memalign=yes # check for memalign - atmos cat > $TMPC << EOF +#include #include int main ( void ) { char *string = NULL; @@ -682,6 +834,11 @@ EOF $cc -o $TMPE $TMPC 2> /dev/null || _memalign=no fi +if test "$_memalign" = "no" -a "$mmx" = "yes" -a "$memalignhack" != "yes"; then + echo "error, no memalign() but sse enabled, either disable it or use --enable-memalign-hack" + exit 1 +fi + cat > $TMPC << EOF #include int main( void ) { localtime_r(NULL, NULL); } @@ -703,7 +860,7 @@ if (zlibVersion() != ZLIB_VERSION) return 0; } EOF -$cc -o $TMPE $TMPC -lz 2> /dev/null || zlib="no" +$cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lz 2> /dev/null || zlib="no" # $TMPE 2> /dev/null > /dev/null || zlib="no" # XXX: more tests needed - runtime test fi @@ -721,7 +878,11 @@ EOF have_lrintf="no" if $cc $extralibs -o $TMPE $TMPC 2> /dev/null ; then have_lrintf="yes" - $TMPE 2> /dev/null > /dev/null || have_lrintf="no" + # allanc@chickenandporn.com: cannot execute cross-compiled + # code on the host. Only execute if not cross-compiling. + if test -z "$cross_prefix" ; then + $TMPE 2> /dev/null > /dev/null || have_lrintf="no" + fi fi _restrict= @@ -736,6 +897,7 @@ done # test gcc version to see if vector builtins can be used # currently only used on i386 for MMX builtins cat > $TMPC << EOF +#include int main(void) { #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) return 0; @@ -797,7 +959,7 @@ int main( void ) { return (int) imlib_load_font("foo"); } EOF imlib2=no -if $cc -o $TMPE $TMPC -lImlib2 > /dev/null 2>&1 ; then +if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then imlib2=yes fi @@ -811,7 +973,7 @@ EOF freetype2=no if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then - if test "`which freetype-config`" != ""; then + if (freetype-config --version) >/dev/null 2>&1 ; then if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` > /dev/null 2>&1 ; then freetype2=yes fi @@ -829,6 +991,7 @@ EOF sdl_too_old=no sdl=no +if (sdl-config --version) >/dev/null 2>&1 ; then if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs` > /dev/null 2>&1 ; then _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'` if test "$_sdlversion" -lt 121 ; then @@ -837,10 +1000,43 @@ else sdl=yes fi fi +fi + +########################################## +# texi2html probe + +texi2html=no +if (texi2html -version) >/dev/null 2>&1; then +texi2html=yes +fi + +if test "$network" = "yes" ; then +########################################## +# IPv6 probe + +cat > $TMPC << EOF +#include +#include +#include +#include +int main( void ) { + struct sockaddr_storage saddr; + struct ipv6_mreq mreq6; + getaddrinfo(0,0,0,0); + getnameinfo(0,0,0,0,0,0,0); + IN6_IS_ADDR_MULTICAST(0); +} +EOF + +ipv6=no +if $cc -o $TMPE $TMPC > /dev/null 2>&1 ; then +ipv6=yes +fi +fi case "`$cc -v 2>&1 | grep version`" in *gcc*) - CFLAGS="-Wall $CFLAGS" + CFLAGS="-Wall -Wno-switch $CFLAGS" ;; *) ;; @@ -851,7 +1047,7 @@ if test "$sdl" = "no" ; then fi if test "$debug" = "yes"; then - CFLAGS="$CFLAGS -g" + CFLAGS="-g $CFLAGS" fi if test "$optimize" = "small"; then @@ -864,7 +1060,7 @@ if test "$optimize" = "yes"; then CFLAGS="$CFLAGS -O5" LDFLAGS="$LDFLAGS -O5" else - CFLAGS="$CFLAGS -O3" + CFLAGS="-O3 $CFLAGS" fi fi @@ -872,6 +1068,10 @@ if test x"$bindir" = x""; then bindir="${prefix}/bin" fi +if test x"$libdir" = x""; then +libdir="${prefix}/lib" +fi + if test x"$mandir" = x""; then mandir="${prefix}/man" fi @@ -884,7 +1084,7 @@ echo "CPU $cpu ($tune)" echo "Big Endian $bigendian" echo "inttypes.h $inttypes" echo "broken inttypes.h $emu_fast_int" -if test $cpu = "x86"; then +if test $cpu = "x86" -o $cpu = "x86_64"; then echo "MMX enabled $mmx" echo "Vector Builtins $builtin_vector" fi @@ -897,14 +1097,20 @@ fi echo "gprof enabled $gprof" echo "zlib enabled $zlib" echo "mp3lame enabled $mp3lame" +echo "libogg enabled $libogg" echo "vorbis enabled $vorbis" +echo "theora enabled $theora" 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 "debug symbols $debug" +echo "strip symbols $dostrip" echo "optimize $optimize" echo "shared pp $shared_pp" echo "Video hooking $vhook" @@ -912,30 +1118,50 @@ 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 "risky / patent encumbered codecs $risky" if test "$vhook" = "yes" ; then echo "Imlib2 support $imlib2" echo "freetype support $freetype2" fi echo "Sun medialib support" $sunmlib +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" +if test "$network" = "yes" ; then +echo "IPv6 support $ipv6" +fi +if test "$gpl" = "no" ; then +echo "License: LGPL" +else +echo "License: GPL" +fi echo "Creating config.mak and config.h" +date >> config.log +echo " $0 $FFMPEG_CONFIGURATION" >> config.log 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 "prefix=$prefix" >> config.mak +echo "libdir=$libdir" >> config.mak echo "bindir=$bindir" >> config.mak echo "mandir=$mandir" >> config.mak 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 echo "STRIP=$strip" >> config.mak +echo "INSTALLSTRIP=-s" >> config.mak +else +echo "STRIP=echo ignoring strip" >> config.mak +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). @@ -958,6 +1184,9 @@ echo "TARGET_OS=$TARGET_OS" >> config.mak if test "$cpu" = "x86" ; then echo "TARGET_ARCH_X86=yes" >> config.mak echo "#define ARCH_X86 1" >> $TMPH +elif test "$cpu" = "x86_64" ; then + echo "TARGET_ARCH_X86_64=yes" >> config.mak + echo "#define ARCH_X86_64 1" >> $TMPH elif test "$cpu" = "armv4l" ; then echo "TARGET_ARCH_ARMV4L=yes" >> config.mak echo "#define ARCH_ARMV4L 1" >> $TMPH @@ -967,9 +1196,19 @@ elif test "$cpu" = "alpha" ; then elif test "$cpu" = "sparc64" ; then echo "TARGET_ARCH_SPARC64=yes" >> config.mak echo "#define ARCH_SPARC64 1" >> $TMPH + echo "TARGET_ARCH_SPARC=yes" >> config.mak + echo "#define ARCH_SPARC 1" >> $TMPH +elif test "$cpu" = "sparc" ; then + echo "TARGET_ARCH_SPARC=yes" >> config.mak + echo "#define ARCH_SPARC 1" >> $TMPH elif test "$cpu" = "powerpc" ; then echo "TARGET_ARCH_POWERPC=yes" >> config.mak echo "#define ARCH_POWERPC 1" >> $TMPH + if test $POWERPCMODE = "32bits"; then + echo "#define POWERPC_MODE_32BITS 1" >> $TMPH + else + echo "#define POWERPC_MODE_64BITS 1" >> $TMPH + fi if test "$powerpc_perf" = "yes"; then echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH fi @@ -1033,11 +1272,22 @@ if test "$sunmlib" = "yes" ; then echo "#define HAVE_MLIB 1" >> $TMPH extralibs="$extralibs -lmlib" fi +if test "$pthreads" = "yes" ; then + echo "HAVE_PTHREADS=yes" >> config.mak + echo "#define HAVE_PTHREADS 1" >> $TMPH + echo "#define HAVE_THREADS 1" >> $TMPH + if test $targetos != FreeBSD; then + extralibs="$extralibs -lpthread" + fi +fi if test "$sdl" = "yes" ; then echo "CONFIG_SDL=yes" >> config.mak echo "SDL_LIBS=`sdl-config --libs`" >> config.mak echo "SDL_CFLAGS=`sdl-config --cflags`" >> config.mak fi +if test "$texi2html" = "yes"; then + echo "BUILD_DOC=yes" >> config.mak +fi if test "$have_lrintf" = "yes" ; then echo "#define HAVE_LRINTF 1" >> $TMPH fi @@ -1051,7 +1301,7 @@ if test "$lshared" = "yes" ; then echo "PIC=-fPIC" >> config.mak fi echo "EXTRALIBS=$extralibs" >> config.mak -version=`grep '#define FFMPEG_VERSION ' $source_path/libavcodec/avcodec.h | +version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" | cut -d '"' -f 2` echo "VERSION=$version" >>config.mak # if you do not want to use encoders, disable that. @@ -1073,6 +1323,12 @@ if test "$a52" = "yes" ; then fi fi +# DTS +if test "$dts" = "yes" ; then + echo "#define CONFIG_DTS 1" >> $TMPH + echo "CONFIG_DTS=yes" >> config.mak +fi + # PP if test "$pp" = "yes" ; then echo "#define CONFIG_PP 1" >> $TMPH @@ -1099,6 +1355,11 @@ if test "$dv1394" = "yes" ; then echo "CONFIG_DV1394=yes" >> config.mak fi +if test "$dc1394" = "yes" ; then + echo "#define CONFIG_DC1394 1" >> $TMPH + echo "CONFIG_DC1394=yes" >> config.mak +fi + if test "$dlopen" = "yes" ; then echo "#define CONFIG_HAVE_DLOPEN 1" >> $TMPH fi @@ -1122,6 +1383,10 @@ if test "$network" = "yes" ; then echo "CONFIG_NETWORK=yes" >> config.mak fi +if test "$ipv6" = "yes" ; then + echo "#define CONFIG_IPV6 1" >> $TMPH +fi + if test "$zlib" = "yes" ; then echo "#define CONFIG_ZLIB 1" >> $TMPH echo "CONFIG_ZLIB=yes" >> config.mak @@ -1132,9 +1397,19 @@ if test "$mp3lame" = "yes" ; then echo "CONFIG_MP3LAME=yes" >> config.mak fi +if test "$libogg" = "yes" ; then + echo "#define CONFIG_LIBOGG 1" >> $TMPH + echo "CONFIG_LIBOGG=yes" >> config.mak +fi + if test "$vorbis" = "yes" ; then - echo "#define CONFIG_VORBIS 1" >> $TMPH - echo "CONFIG_VORBIS=yes" >> config.mak + echo "#define CONFIG_LIBVORBIS 1" >> $TMPH + echo "CONFIG_LIBVORBIS=yes" >> config.mak +fi + +if test "$theora" = "yes" ; then + echo "#define CONFIG_LIBTHEORA 1" >> $TMPH + echo "CONFIG_LIBTHEORA=yes" >> config.mak fi if test "$faad" = "yes" ; then @@ -1152,9 +1427,22 @@ if test "$faac" = "yes" ; then echo "CONFIG_FAAC=yes" >> config.mak fi +if test "$xvid" = "yes" ; then + echo "#define CONFIG_XVID 1" >> $TMPH + echo "CONFIG_XVID=yes" >> config.mak +fi + +if test "$x264" = "yes" ; then + echo "#define CONFIG_X264 1" >> $TMPH + echo "CONFIG_X264=yes" >> config.mak +fi + if test "$mingw32" = "yes" ; then echo "#define CONFIG_WIN32 1" >> $TMPH echo "CONFIG_WIN32=yes" >> config.mak + echo "HAVE_W32THREADS=yes" >> config.mak + echo "#define HAVE_W32THREADS 1" >> $TMPH + echo "#define HAVE_THREADS 1" >> $TMPH echo "#ifndef __MINGW32__" >> $TMPH echo "#define __MINGW32__ 1" >> $TMPH echo "#endif" >> $TMPH @@ -1169,6 +1457,12 @@ if test "$TARGET_OS" = "SunOS" ; then echo "#define CONFIG_SUNOS 1" >> $TMPH fi +if test "$TARGET_OS" = "BeOS" ; then + echo "HAVE_BEOSTHREADS=yes" >> config.mak + echo "#define HAVE_BEOSTHREADS 1" >> $TMPH + echo "#define HAVE_THREADS 1" >> $TMPH +fi + if test "$darwin" = "yes"; then echo "#define CONFIG_DARWIN 1" >> $TMPH echo "CONFIG_DARWIN=yes" >> config.mak @@ -1186,6 +1480,11 @@ else echo "#undef HAVE_MEMALIGN" >> $TMPH fi +if test "$memalignhack" = "yes" ; then + echo "#define MEMALIGN_HACK 1" >> $TMPH +fi + + if test "$netserver" = "yes" ; then echo "#define CONFIG_BEOS_NETSERVER 1" >> $TMPH echo "CONFIG_BEOS_NETSERVER=yes" >> config.mak @@ -1208,26 +1507,35 @@ if test "$ffplay" = "yes" ; then echo "CONFIG_FFPLAY=yes" >> config.mak fi -if test "$risky" = "yes" ; then - echo "#define CONFIG_RISKY 1" >> $TMPH - echo "CONFIG_RISKY=yes" >> config.mak +if test "$gpl" = "yes" ; then + echo "#define CONFIG_GPL 1" >> $TMPH + echo "CONFIG_GPL=yes" >> config.mak fi echo "#define restrict $_restrict" >> $TMPH +if test "$optimize" = "small"; then + echo "#define always_inline" >> $TMPH +fi + # build tree in object directory if source path is different from current one if test "$source_path_used" = "yes" ; then - DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \ - libavcodec/ppc libavcodec/liba52 libavcodec/mlib libavcodec/libpostproc tests vhook" - FILES="Makefile libavformat/Makefile libavcodec/Makefile libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile" + DIRS="doc libavformat libavcodec libavcodec/alpha libavcodec/armv4l \ + libavcodec/i386 libavcodec/sparc libavcodec/mlib \ + libavcodec/ppc libavcodec/liba52 libavcodec/libpostproc tests vhook" + FILES="Makefile libavformat/Makefile libavcodec/Makefile \ + libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile \ + doc/Makefile doc/texi2pod.pl" for dir in $DIRS ; do mkdir -p $dir done for f in $FILES ; do - ln -sf $source_path/$f $f + ln -sf "$source_path/$f" $f done + echo "SRC_PATH=$source_path" >> config.mak +else + echo "SRC_PATH='$source_path'" >> config.mak fi -echo "SRC_PATH=$source_path" >> config.mak if test "$amr_wb" = "yes" ; then echo "#define AMR_WB 1" >> $TMPH @@ -1249,7 +1557,7 @@ if test "$amr_nb_fixed" = "yes" ; then echo "#define AMR_NB_FIXED 1" >> $TMPH echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 " echo "REL-5 version 5.1.0 from " - echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-510.zip" + echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-5??.zip" echo "and extracted src to libavcodec/amr" echo "You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile." echo "i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO" @@ -1257,12 +1565,16 @@ if test "$amr_nb_fixed" = "yes" ; then else echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104" echo "REL-5 V5.1.0 from " - echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-510.zip" + echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip" echo "and extracted the source to libavcodec/amr_float" echo "and if u try this on an alpha, u may need to change Word32 to int in amr/typedef.h" echo fi +if test "$amr_if2" = "yes" ; then + echo "AMR_CFLAGS=-DIF2=1" >> config.mak +fi + fi diff $TMPH config.h >/dev/null 2>&1