fix coverity warning CID: 255 (uninitalized variable used to build tables which arent...

[ffmpeg] / configure

diff --git a/configure b/configure
index db058bd67868675bde3d76b278ef7f2262c43493..0a9f867d13ae2477377bf59553fed6665e68b85d 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,6 +14,7 @@ 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 "  --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-libogg          enable Ogg support via libogg [default=no]"
@@ -66,6 +67,7 @@ echo "  --disable-altivec        disable AltiVec usage"
 echo "  --disable-audio-oss      disable OSS audio support [default=no]"
 echo "  --disable-audio-beos     disable BeOS audio support [default=no]"
 echo "  --disable-v4l            disable video4linux grabbing [default=no]"
+echo "  --disable-v4l2           disable video4linux2 grabbing [default=no]"
 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]"
@@ -115,6 +117,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
 # default parameters
 prefix="/usr/local"
 libdir=""
+incdir=""
 mandir=""
 bindir=""
 cross_prefix=""
@@ -183,6 +186,7 @@ case "$cpu" in
 esac
 gprof="no"
 v4l="yes"
+v4l2="yes"
 bktr="no"
 audio_oss="yes"
 audio_beos="no"
@@ -276,6 +280,7 @@ SHFLAGS=-nostart
 # disable Linux things
 audio_oss="no"
 v4l="no"
+v4l2="no"
 dv1394="no"
 # enable BeOS things
 audio_beos="yes"
@@ -290,6 +295,7 @@ extralibs="-lnet"
 fi ;;
 SunOS)
 v4l="no"
+v4l2="no"
 audio_oss="no"
 dv1394="no"
 make="gmake"
@@ -300,6 +306,7 @@ extralibs="$extralibs -lsocket -lnsl"
 ;;
 NetBSD)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -312,6 +319,7 @@ esac
 ;;
 OpenBSD)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -323,6 +331,7 @@ extralibs="$extralibs -lossaudio"
 ;;
 FreeBSD)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -332,6 +341,7 @@ LDFLAGS="$LDFLAGS -export-dynamic -pthread"
 ;;
 BSD/OS)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -343,6 +353,7 @@ installstrip=""
 Darwin)
 cc="cc"
 v4l="no"
+v4l2="no"
 audio_oss="no"
 dv1394="no"
 ffserver="no"
@@ -364,6 +375,7 @@ mingw32="yes"
 ;;
 CYGWIN*)
 v4l="no"
+v4l2="no"
 audio_oss="yes"
 dv1394="no"
 vhook="no"
@@ -377,6 +389,7 @@ LDFLAGS="$LDFLAGS -rdynamic"
 IRIX*)
 ranlib="echo ignoring ranlib"
 v4l="no"
+v4l2="no"
 audio_oss="no"
 make="gmake"
 ;;
@@ -397,9 +410,9 @@ EXESUF=".exe"
 extralibs=""
 pkg_requires=""
 v4l="no"
+v4l2="no"
 audio_oss="no"
 dv1394="no"
-network="no"
 ffserver="no"
 vhook="no"
 os2="yes"
@@ -452,6 +465,8 @@ for opt do
   ;;
   --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_libdir=yes
   ;;
+  --incdir=*) incdir=`echo $opt | cut -d '=' -f 2`;
+  ;;
   --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
   ;;
   --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
@@ -486,6 +501,8 @@ for opt do
   ;;
   --disable-v4l) v4l="no"
   ;;
+  --disable-v4l2) v4l2="no"
+  ;;
   --disable-bktr) bktr="no"
   ;;
   --disable-audio-oss) audio_oss="no"
@@ -900,6 +917,7 @@ EOF
         exit 1
     fi
     v4l="no"
+    v4l2="no"
     bktr="no"
     audio_oss="no"
     dv1394="no"
@@ -1092,6 +1110,19 @@ if $cc -msse -o $TMPO $TMPC 2> /dev/null ; then
   builtin_vector=yes
 fi
 
+# test for mm3dnow.h
+cat > $TMPC << EOF
+#include <mm3dnow.h>
+int main(void) {
+return 0;
+}
+EOF
+
+mm3dnow=no
+if $cc -march=athlon -o $TMPO $TMPC 2> /dev/null ; then
+  mm3dnow=yes
+fi
+
 # Probe for -Wdeclaration-after-statement
 if test "$cc" = "gcc"; then
   cat > $TMPC << EOF
@@ -1168,7 +1199,7 @@ int main( void ) { return (int) FT_Init_FreeType(0); }
 EOF
 
 freetype2=no
-if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then
+if test "x$targetos" != "xBeOS"; 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
@@ -1220,7 +1251,7 @@ int main( void ) {
   struct ipv6_mreq mreq6;
   getaddrinfo(0,0,0,0);
   getnameinfo(0,0,0,0,0,0,0);
-  IN6_IS_ADDR_MULTICAST(0);
+  IN6_IS_ADDR_MULTICAST((const struct in6_addr *)0);
 }
 EOF
 
@@ -1230,6 +1261,16 @@ ipv6=yes
 fi
 fi
 
+if test "$v4l2" = "yes"; then
+# check for video4linux2 --- V4L2_PIX_FMT_YUV420
+cat > $TMPC << EOF
+#include <sys/time.h>
+#include <linux/videodev.h>
+int dummy = V4L2_PIX_FMT_YUV420;
+EOF
+$cc -c -o $TMPE $TMPC 2> /dev/null || v4l2="no"
+fi
+
 case "`$cc -v 2>&1 | grep version`" in
     *gcc*)
         CFLAGS="-Wall -Wno-switch $CFLAGS"
@@ -1278,6 +1319,10 @@ if test x"$libdir" = x""; then
 libdir="${prefix}/lib"
 fi
 
+if test x"$incdir" = x""; then
+incdir="${prefix}/include/ffmpeg"
+fi
+
 if test x"$mandir" = x""; then
 mandir="${prefix}/man"
 fi
@@ -1296,6 +1341,7 @@ echo "broken inttypes.h $emu_fast_int"
 if test $cpu = "x86" -o $cpu = "x86_64"; then
 echo "MMX enabled      $mmx"
 echo "Vector Builtins  $builtin_vector"
+echo "3DNow! Builtins  $mm3dnow"
 fi
 if test $cpu = "armv4l"; then
 echo "IWMMXT enabled   $iwmmxt"
@@ -1364,6 +1410,7 @@ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
 
 echo "prefix=\$(DESTDIR)$prefix" >> config.mak
 echo "libdir=\$(DESTDIR)$libdir" >> config.mak
+echo "incdir=\$(DESTDIR)$incdir" >> config.mak
 echo "bindir=\$(DESTDIR)$bindir" >> config.mak
 echo "mandir=\$(DESTDIR)$mandir" >> config.mak
 echo "MAKE=$make" >> config.mak
@@ -1392,11 +1439,14 @@ echo "LDCONFIG=$LDCONFIG" >> config.mak
 echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
+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
   echo "LIB=$LIB" >> config.mak
+else # Some Make complain if this variable does not exist.
+  echo "LIB=" >> config.mak
 fi
 echo "SLIBPREF=$SLIBPREF" >> config.mak
 echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
@@ -1472,6 +1522,10 @@ if test "$builtin_vector" = "yes" ; then
   echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak
   echo "#define HAVE_BUILTIN_VECTOR 1" >> $TMPH
 fi
+if test "$mm3dnow" = "yes" ; then
+  echo "TARGET_BUILTIN_3DNOW=yes" >> config.mak
+  echo "#define HAVE_MM3DNOW 1" >> $TMPH
+fi
 if test "$iwmmxt" = "yes" ; then
   echo "TARGET_IWMMXT=yes" >> config.mak
   echo "#define HAVE_IWMMXT 1" >> $TMPH
@@ -1613,6 +1667,11 @@ if test "$v4l" = "yes" ; then
   echo "CONFIG_VIDEO4LINUX=yes" >> config.mak
 fi
 
+if test "$v4l2" = "yes" ; then
+  echo "#define CONFIG_VIDEO4LINUX2 1" >> $TMPH
+  echo "CONFIG_VIDEO4LINUX2=yes" >> config.mak
+fi
+
 if test "$bktr" = "yes" ; then
   echo "#define CONFIG_BKTR 1" >> $TMPH
   echo "CONFIG_BKTR=yes" >> config.mak
@@ -1739,6 +1798,9 @@ fi
 if test "$os2" = "yes" ; then
   echo "#define CONFIG_OS2 1" >> $TMPH
   echo "CONFIG_OS2=yes" >> config.mak
+  echo "HAVE_OS2THREADS=yes" >> config.mak
+  echo "#define HAVE_OS2THREADS 1" >> $TMPH
+  echo "#define HAVE_THREADS 1" >> $TMPH
 fi
 
 if test "$TARGET_OS" = "SunOS" ; then
@@ -1846,10 +1908,9 @@ if test "$source_path_used" = "yes" ; then
     for f in $FILES ; do
         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
+echo "BUILD_ROOT=$PWD" >> config.mak
 
 if test "$amr_wb" = "yes" ; then
   echo "#define AMR_WB 1" >> $TMPH
@@ -1896,8 +1957,9 @@ for codec in $CODEC_LIST ; do
     echo "CONFIG_`echo $codec | tr a-z A-Z`=yes" >> config.mak
 done
 
+# Do not overwrite config.h if unchanged to avoid superfluous rebuilds.
 diff $TMPH config.h >/dev/null 2>&1
-if test $? -ne 0 ; then
+if test "$?" != "0" ; then
         mv -f $TMPH config.h
 else
         echo "config.h is unchanged"