avcodecmap: It's interlace-mode, not interlaced-mode

[platform/upstream/gst-libav.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d9d43a1..17825f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.69)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer libav, 1.9.1,
+AC_INIT(GStreamer libav, 1.11.0.1,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-libav)
 
@@ -40,11 +40,11 @@ GST_API_VERSION=1.0
 AC_SUBST(GST_API_VERSION)
 
 AG_GST_LIBTOOL_PREPARE
-AS_LIBTOOL(GST, 901, 0, 901)
+AS_LIBTOOL(GST, 1100, 0, 1100)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.9.1
-GST_PBREQ=1.9.1
+GST_REQ=1.11.0.1
+GST_PBREQ=1.11.0.1
 
 ORC_REQ=0.4.16
 ORC_CHECK([$ORC_REQ])
@@ -98,6 +98,9 @@ dnl check for libm, for sin()
 LT_LIB_M
 AC_SUBST(LIBM)
 
+dnl check for pthreads
+AX_PTHREAD
+
 dnl *** checks for header files ***
 
 dnl check if we have ANSI C header files
@@ -241,30 +244,6 @@ case $host_os in
 esac
 AC_SUBST(DARWIN_LDFLAGS)
 
-dnl *** Check for bz2
-save_LIBS=$LIBS
-LIBS="$LIBS -lbz2"
-AC_MSG_CHECKING([for BZ2_bzlibVersion in -lbz2])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <bzlib.h>]], [[const char *version = BZ2_bzlibVersion ();]])],[HAVE_BZ2=yes],[HAVE_BZ2=no])
-AC_MSG_RESULT($HAVE_BZ2)
-LIBS=$save_LIBS
-AM_CONDITIONAL(HAVE_BZ2, test "x$HAVE_BZ2" = "xyes")
-if test "x$HAVE_BZ2" = "xno"; then
-  AC_WARN([libbz2 not found, matroska demuxer will not be able to read bz2 tracks])
-fi
-
-dnl *** Check for lzma
-save_LIBS=$LIBS
-LIBS="$LIBS -llzma"
-AC_MSG_CHECKING([for lzma_version_string in -llzma])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <lzma.h>]], [[const char *version = lzma_version_string ();]])],[HAVE_LZMA=yes],[HAVE_LZMA=no])
-AC_MSG_RESULT($HAVE_LZMA)
-LIBS=$save_LIBS
-AM_CONDITIONAL(HAVE_LZMA, test "x$HAVE_LZMA" = "xyes")
-if test "x$HAVE_LZMA" = "xno"; then
-    AC_WARN([lzma not found, tiff reader will not be able to read lzma files])
-fi
-
 AC_ARG_ENABLE(gpl,
               [AC_HELP_STRING([--enable-gpl], [build a GPL licensed gst-libav])])
 AM_CONDITIONAL(GST_LIBAV_ENABLE_GPL, test "x$enable_gpl" = "xyes")
@@ -279,6 +258,8 @@ HAVE_LIBAV_UNINSTALLED=1
 AC_ARG_WITH(system-libav,
             [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
 
+HAVE_LZMA="no"
+HAVE_BZ2="no"
 if test "x$with_system_libav" = "xyes"; then
   PKG_CHECK_MODULES(LIBAV, libavfilter libavformat libavcodec libavutil)
   PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
@@ -305,7 +286,29 @@ if test "x$with_system_libav" = "xyes"; then
   fi
 else
   AC_MSG_NOTICE([Using local Libav snapshot])
-  
+
+  dnl *** Check for bz2
+  save_LIBS=$LIBS
+  LIBS="$LIBS -lbz2"
+  AC_MSG_CHECKING([for BZ2_bzlibVersion in -lbz2])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <bzlib.h>]], [[const char *version = BZ2_bzlibVersion ();]])],[HAVE_BZ2=yes],[HAVE_BZ2=no])
+  AC_MSG_RESULT($HAVE_BZ2)
+  LIBS=$save_LIBS
+  if test "x$HAVE_BZ2" = "xno"; then
+    AC_WARN([libbz2 not found, matroska demuxer will not be able to read bz2 tracks])
+  fi
+
+  dnl *** Check for lzma
+  save_LIBS=$LIBS
+  LIBS="$LIBS -llzma"
+  AC_MSG_CHECKING([for lzma_version_string in -llzma])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <lzma.h>]], [[const char *version = lzma_version_string ();]])],[HAVE_LZMA=yes],[HAVE_LZMA=no])
+  AC_MSG_RESULT($HAVE_LZMA)
+  LIBS=$save_LIBS
+  if test "x$HAVE_LZMA" = "xno"; then
+    AC_WARN([lzma not found, tiff reader will not be able to read lzma files])
+  fi
+
   dnl libgstlibav.la: include dirs
   LIBAV_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \
                 -I \$(top_builddir)/gst-libs/ext/libav \
@@ -347,7 +350,7 @@ else
   AC_DEFINE(HAVE_AVI_H)
   AC_DEFINE([LIBAV_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
 
-  AC_ARG_WITH(libav-extra-configure, 
+  AC_ARG_WITH(libav-extra-configure,
       AC_HELP_STRING([--with-libav-extra-configure="xxx"],
       [extra configure options for internal libav ./configure script]),,
       with_libav=no)
@@ -363,7 +366,7 @@ else
         --disable-encoder=flac --disable-protocols --disable-devices \
         --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau \
         --disable-filters --enable-filter=yadif --disable-doc --disable-vda --disable-d3d11va --disable-dxva2 \
-       --disable-audiotoolbox --disable-videotoolbox --disable-vaapi \
+        --disable-audiotoolbox --disable-videotoolbox --disable-vaapi --disable-crystalhd \
         --disable-mediacodec --disable-nvenc --disable-mmal --disable-omx \
         --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx \
         --disable-libnpp --disable-iconv --disable-jni --enable-optimizations"
@@ -463,6 +466,9 @@ else
   AC_MSG_NOTICE([Using included Libav code])
 fi
 
+AM_CONDITIONAL(HAVE_BZ2, test "x$HAVE_BZ2" = "xyes")
+AM_CONDITIONAL(HAVE_LZMA, test "x$HAVE_LZMA" = "xyes")
+
 AC_SUBST(LIBAV_CFLAGS)
 AC_SUBST(LIBAV_DEPS)
 AC_SUBST(LIBAV_LIBS)
@@ -471,7 +477,7 @@ AC_SUBST(SWSCALE_CFLAGS)
 AC_SUBST(SWSCALE_DEPS)
 AC_SUBST(SWSCALE_LIBS)
 AC_SUBST(WIN32_LIBS)
- 
+
 if test x$HAVE_LIBAV_UNINSTALLED = x1; then
   AC_DEFINE(HAVE_LIBAV_UNINSTALLED, [], [Defined if building against uninstalled Libav source])
 fi