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

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

diff --git a/configure.ac b/configure.ac
index a670614..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.2,
+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, 902, 0, 902)
+AS_LIBTOOL(GST, 1100, 0, 1100)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.9.2
-GST_PBREQ=1.9.2
+GST_REQ=1.11.0.1
+GST_PBREQ=1.11.0.1
 
 ORC_REQ=0.4.16
 ORC_CHECK([$ORC_REQ])
@@ -244,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")
@@ -282,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)
@@ -309,6 +287,28 @@ if test "x$with_system_libav" = "xyes"; then
 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 \
@@ -466,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)