fix nonsens timestamp calculation

[ffmpeg] / configure

diff --git a/configure b/configure
index 0e21d327eafab5cec9e476cd230dbbe15250e16f..8b8ce6cdebddee029591ddc08fe55b222ddc481c 100755 (executable)
--- a/configure
+++ b/configure
@@ -13,13 +13,17 @@ 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]"
@@ -88,6 +92,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
 
 # default parameters
 prefix="/usr/local"
+libdir=""
 mandir=""
 bindir=""
 cross_prefix=""
@@ -149,11 +154,14 @@ 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"
@@ -190,6 +198,7 @@ EXESUF=""
 amr_nb="no"
 amr_wb="no"
 amr_nb_fixed="no"
+amr_if2="no"
 sunmlib="no"
 pthreads="no"
 gpl="no"
@@ -238,6 +247,17 @@ FFSLDFLAGS=""
 need_inet_aton="yes"
 extralibs="$extralibs -lsocket -lnsl"
 ;;
+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"
@@ -295,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"
@@ -313,7 +333,9 @@ audio_oss="no"
 dv1394="no"
 network="no"
 ffserver="no"
+vhook="no"
 os2="yes"
+
 ;;
 *) ;;
 esac
@@ -358,6 +380,8 @@ 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`
@@ -410,8 +434,12 @@ for opt do
   ;;
   --enable-mp3lame) mp3lame="yes"
   ;;
+  --enable-libogg) libogg="yes"
+  ;;
   --enable-vorbis) vorbis="yes"
   ;;
+  --enable-theora) theora="yes"
+  ;;
   --enable-faad) faad="yes"
   ;;
   --enable-faadbin) faadbin="yes"
@@ -420,6 +448,8 @@ for opt do
   ;;
   --enable-xvid) xvid="yes"
   ;;
+  --enable-x264) x264="yes"; extralibs="$extralibs -lx264"
+  ;;
   --enable-dc1394) dc1394="yes"
   ;;
   --disable-vhook) vhook="no"
@@ -448,6 +478,8 @@ for opt do
   ;;
   --enable-amr_wb) amr_wb="yes"
   ;; 
+  --enable-amr_if2) amr_if2="yes"
+  ;;
   --enable-sunmlib) sunmlib="yes"
   ;;
   --enable-pthreads) pthreads="yes"
@@ -461,6 +493,22 @@ for opt do
   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"
@@ -477,6 +525,11 @@ if test "$gpl" != "yes"; then
         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"
@@ -807,7 +860,7 @@ if (zlibVersion() != ZLIB_VERSION)
 return 0;
 }
 EOF
-$cc $CFLAGS -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
@@ -1015,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
@@ -1040,11 +1097,14 @@ 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"
@@ -1068,6 +1128,7 @@ 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"
@@ -1087,6 +1148,7 @@ 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
@@ -1335,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
@@ -1360,6 +1432,11 @@ if test "$xvid" = "yes" ; then
   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
@@ -1494,6 +1571,10 @@ else
   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