Automatic update of common submodule
[platform/upstream/gstreamer.git] / configure.ac
index 8dad1ea..d4e095b 100644 (file)
@@ -1,16 +1,16 @@
-AC_PREREQ(2.60)
+AC_PREREQ(2.62)
 
 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, 0.11.0.1,
+AC_INIT(GStreamer libav, 1.3.0.1,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
-    gst-ffmpeg)
+    gst-libav)
 
 AG_GST_INIT
 
 dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.10])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION
@@ -19,13 +19,13 @@ dnl check if this is a release version
 AS_NANO(GST_GIT="no", GST_GIT="yes")
 
 dnl can autoconf find the source ?
-AC_CONFIG_SRCDIR([ext/ffmpeg/gstffmpeg.c])
+AC_CONFIG_SRCDIR([ext/libav/gstav.c])
 
 dnl define the output header for config
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 dnl sets host_* variables
 AC_CANONICAL_HOST
@@ -36,19 +36,20 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
    AC_SUBST(AM_DEFAULT_VERBOSITY)])
 
 dnl our libraries and install dirs use major.minor as a version
-GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
+GST_API_VERSION=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
 dnl we override it here if we need to for the release candidate of new series
-GST_MAJORMINOR=0.11
-AC_SUBST(GST_MAJORMINOR)
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
 
 AG_GST_LIBTOOL_PREPARE
-
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AS_LIBTOOL(GST, 300, 0, 300)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.11.0
-ORC_REQ=0.4.6
+GST_REQ=1.3.0.1
+GST_PBREQ=1.3.0.1
+
+ORC_REQ=0.4.16
+ORC_CHECK([$ORC_REQ])
 
 dnl *** autotools stuff ****
 
@@ -60,10 +61,13 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
 
 dnl *** check for arguments to configure ***
 
+AG_GST_ARG_DISABLE_FATAL_WARNINGS
+
 AG_GST_ARG_WITH_PKG_CONFIG_PATH
 AG_GST_ARG_WITH_PACKAGE_NAME
 AG_GST_ARG_WITH_PACKAGE_ORIGIN
 AG_GST_ARG_VALGRIND
+AG_GST_ARG_GCOV
 
 dnl *** checks for platform ***
 
@@ -87,14 +91,14 @@ AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
 
 dnl check for documentation tools
 AG_GST_DOCBOOK_CHECK
-GTK_DOC_CHECK([1.3])
+GTK_DOC_CHECK([1.12])
 AS_PATH_PYTHON([2.1])
 AG_GST_PLUGIN_DOCS([1.3],[2.1])
 
 dnl *** checks for libraries ***
 
 dnl check for libm, for sin()
-AC_CHECK_LIBM
+LT_LIB_M
 AC_SUBST(LIBM)
 
 dnl *** checks for header files ***
@@ -114,25 +118,44 @@ dnl *** checks for dependancy libraries ***
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ])
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ])
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GST_REQ])
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ])
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ])
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GST_PBREQ])
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
 AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
 AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR)
 AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
 
-dnl orc is required for cpu detection for libpostproc
-ORC_CHECK([$ORC_REQ])
-
 dnl *** set variables based on configure arguments ***
 
 dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR
 
+dnl build static plugins or not
+AC_MSG_CHECKING([whether to build static plugins or not])
+AC_ARG_ENABLE(
+  static-plugins,
+  AC_HELP_STRING(
+    [--enable-static-plugins],
+    [build static plugins @<:@default=no@:>@]),
+  [AS_CASE(
+    [$enableval], [no], [], [yes], [],
+    [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])],
+  [enable_static_plugins=no])
+AC_MSG_RESULT([$enable_static_plugins])
+if test "x$enable_static_plugins" = xyes; then
+  AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1,
+    [Define if static plugins should be built])
+  GST_PLUGIN_LIBTOOLFLAGS=""
+else
+  GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static"
+fi
+AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS)
+AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes")
+
 dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
+AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [
     -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef
     -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition
     -Winit-self -Wmissing-include-dirs -Waddress
@@ -173,7 +196,7 @@ dnl FIXME: do we want to rename to GST_ALL_* ?
 dnl prefer internal headers to already installed ones
 dnl also add builddir include for enumtypes and marshal
 dnl add GST_OPTION_CFLAGS, but overridable
-GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
+GST_CFLAGS="$GST_CFLAGS"
 GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
 AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
@@ -183,7 +206,7 @@ AC_SUBST(GST_ALL_LDFLAGS)
 
 dnl this really should only contain flags, not libs - they get added before
 dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS"
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl Add MacOSX specific flags
@@ -199,136 +222,123 @@ esac
 AC_SUBST(DARWIN_LDFLAGS)
 
 dnl *** Check for bz2
-AG_GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzlibVersion, , bzlib.h, have_bz2=yes, have_bz2=no)
-AM_CONDITIONAL(HAVE_BZ2, test "x$have_bz2" = "xyes")
-if test "x$have_bz2" = "xno"; then
+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
 
+AC_ARG_ENABLE(lgpl,
+              [AC_HELP_STRING([--enable-lgpl], [build a LGPL licensed gst-libav])])
+AM_CONDITIONAL(GST_LIBAV_ENABLE_LGPL, test "x$enable_lgpl" = "xyes")
+if test "x$enable_lgpl" = "xyes"; then
+  AC_DEFINE([GST_LIBAV_ENABLE_LGPL], [], [Defined if building a LGPL-only version of gst-libav])
+fi
+
 dnl *** configure external libs ***
 
-HAVE_FFMPEG_UNINSTALLED=1
+HAVE_LIBAV_UNINSTALLED=1
 
-AC_ARG_WITH(system-ffmpeg,
-            [AC_HELP_STRING([--with-system-ffmpeg], [use system Libav libraries])])
+AC_ARG_WITH(system-libav,
+            [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
 
-if test "x$with_system_ffmpeg" = "xyes"; then
-  PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec libavutil) 
-  PKG_CHECK_MODULES(POSTPROC, libpostproc libavcodec libavutil)
+if test "x$with_system_libav" = "xyes"; then
+  PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil) 
   PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
   saved_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
   AC_CHECK_HEADERS([avi.h])
   CPPFLAGS="$saved_CPPFLAGS"
-  AC_DEFINE([FFMPEG_SOURCE], ["system install"], [Describes where the Libav libraries come from.])
-  HAVE_FFMPEG_UNINSTALLED=0
-  AC_MSG_NOTICE([Using system-installed FFMpeg code])
-  AC_MSG_WARN([
-  ======================================================================
-   WARNING: you have chosen to build gst-ffmpeg against a random
-   external version of Libav instead of building it against the tested
-   internal Libav snapshot that is included with gst-ffmpeg.
-   
-   This is a very bad idea.  So bad in fact that words cannot express
-   just how bad it is.  Suffice to say that it is BAD.
-   
-   The GStreamer developers cannot and will not support a gst-ffmpeg
-   built this way.  Any bug reports that indicate there is an external
-   version of Libav involved will be closed immediately without further
-   investigation.
-   
-   The reason such a setup can't be supported is that the Libav API
-   and ABI is in constant flux, yet there aren't any official releases
-   of the Libav library to develop against.  This makes it impossible
-   to guarantee that gst-ffmpeg will work reliably, or even compile,
-   with a randomly picked version Libav.  Even if gst-ffmpeg compiles
-   and superficially appears to work fine against your chosen external
-   Libav version, that might just not be the case on other systems, or
-   even the same system at a later time, or when using decoders,
-   encoders, demuxers or muxers that have not been tested.
-   
-   Please do not create or distribute binary packages of gst-Libav
-   that link against an external ffmpeg. Thank you!
-  ======================================================================
-  ])
-
-  dnl No, this is not too extreme, we want people to see and read the above
-  sleep 15
+  AC_DEFINE([LIBAV_SOURCE], ["system install"], [Describes where the Libav libraries come from.])
+  HAVE_LIBAV_UNINSTALLED=0
+  AC_MSG_NOTICE([Using system-installed libav code])
 else
-
   AC_MSG_NOTICE([Using local Libav snapshot])
   
-  dnl libgstffmpeg.la: include dirs
-  FFMPEG_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libavutil \
-                -I \$(top_srcdir)/gst-libs/ext/libav/libavformat \
-                 -I \$(top_srcdir)/gst-libs/ext/libav/libavcodec \
-                -I \$(top_srcdir)/gst-libs/ext/libav \
-                -I \$(top_builddir)/gst-libs/ext/libav \
+  dnl libgstlibav.la: include dirs
+  LIBAV_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \
+                -I \$(top_builddir)/gst-libs/ext/libav \
                  -Wno-deprecated-declarations"
 
-  dnl libgstffmpeg.la: libs to statically link to        
-  FFMPEG_LIBS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
-               \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
-               \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
-  dnl
-  POSTPROC_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libpostproc    \
-                   -I \$(top_srcdir)/gst-libs/ext/libav/libavutil      \
-                   -I \$(top_srcdir)/gst-libs/ext/libav/libavcodec     \
-                   -I \$(top_srcdir)/gst-libs/ext/libav        \
-                  -I \$(top_builddir)/gst-libs/ext/libav \
-                   -Wno-deprecated-declarations"
-
-  dnl libgstpostproc.la: libs to statically link to
-  POSTPROC_LIBS="\$(top_builddir)/gst-libs/ext/libav/libpostproc/libpostproc.a \
-                \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
-                                
+  LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
+              \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
+              \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
+  if test "x$enable_static_plugins" = xyes; then
+      dnl with static linking we can't use the .a archive directly as they would
+      dnl be included in the final libgstlibav.a as a file and won't be usable.
+      dnl libav*.a must be copied to the final destination too
+      LIBAV_LIBS="-lavformat -lavcodec -lavutil"
+  else
+      dnl libgstlibav.la: libs to statically link to
+      LIBAV_LIBS="$LIBAV_DEPS"
+  fi
+
   dnl
-  SWSCALE_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libswscale      \
-                  -I \$(top_srcdir)/gst-libs/ext/libav/libavutil       \
-                  -I \$(top_srcdir)/gst-libs/ext/libav         \
-                  -I \$(top_builddir)/gst-libs/ext/libav \
+  SWSCALE_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \
+                  -I \$(top_builddir)/gst-libs/ext/libav \
                   -Wno-deprecated-declarations"
 
-  dnl libgstswscale.la: libs to statically link to
-  SWSCALE_LIBS="\$(top_builddir)/gst-libs/ext/libav/libswscale/libswscale.a \
+  SWSCALE_DEPS="\$(top_builddir)/gst-libs/ext/libav/libswscale/libswscale.a \
                 \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
+  if test "x$enable_static_plugins" = xyes; then
+      dnl with static linking we can't use the .a archive directly as they would
+      dnl be included in the final libgstswscale.a as a file and won't be usable.
+      dnl libav*.a must be copied to the final destination too
+      SWSCALE_LIBS="-lswscale -lavutil"
+  else
+      dnl libgstswscale.la: libs to statically link to
+      SWSCALE_LIBS="$SWSCALE_DEPS"
+  fi
 
-  FFMPEG_SUBDIRS=gst-libs
+  LIBAV_SUBDIRS=gst-libs
   AC_DEFINE(HAVE_AVI_H)
-  AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
+  AC_DEFINE([LIBAV_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
 
-  AC_ARG_WITH(ffmpeg-extra-configure, 
-      AC_HELP_STRING([--with-ffmpeg-extra-configure="xxx"],
-      [extra configure options for internal ffmpeg ./configure script]),,
-      with_ffmpeg_extra_configure=no)
+  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)
 
   # basic arguments
-  embffmpeg_configure_args="--prefix=$prefix"
+  emblibav_configure_args="--prefix=$prefix"
 
   # Enable pic and static so that we get .a files, but with PIC code.
-  embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffserver --disable-ffplay\
-        --disable-ffmpeg --disable-ffprobe --enable-postproc --enable-gpl --enable-static --enable-pic \
+  emblibav_configure_args="$emblibav_configure_args --disable-avserver --disable-avplay\
+        --disable-avconv --disable-avprobe --enable-static --enable-pic \
        --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
-       --disable-network --disable-hwaccels --disable-filters --disable-doc\
-       --enable-optimizations"
+       --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau\
+       --disable-filters --disable-doc --enable-optimizations"
+
+  if test "x$enable_lgpl" != "xyes"; then
+    emblibav_configure_args="$emblibav_configure_args --enable-gpl"
+  fi
+
+  # if we are cross-compiling, tell libav so
+  case $host in
+      *android*)
+        target_os=linux
+      ;;
+      *darwin*)
+        target_os=darwin
+      ;;
+      *)
+        target_os=`echo $host_os | sed 's/-gnu//'`
+      ;;
+  esac
 
-  # if we are cross-compiling, tell ffmpeg so
-  target_os=`echo $host_os | sed 's/-gnu//'`
   if test "x$cross_compiling" = xyes; then
-    embffmpeg_configure_args="$embffmpeg_configure_args --enable-cross-compile \
+    emblibav_configure_args="$emblibav_configure_args --enable-cross-compile \
         --target-os=$target_os --arch=$host_cpu --cross-prefix=$host_alias-"
   fi
 
   case $host_os in
-    # Unfortunately, in Mac OS 10.5 the current rev of ffmpeg builds
-    # some non-PIC code into the .a file. See
-    # http://trac.macosforge.org/projects/macports/ticket/13725 for more
-    # info.
-    darwin*) 
-      embffmpeg_configure_args="$embffmpeg_configure_args --disable-mmx --disable-altivec"
-      ;;
     mingw32*)
-      embffmpeg_configure_args="$embffmpeg_configure_args --enable-memalign-hack"
+      emblibav_configure_args="$emblibav_configure_args --enable-memalign-hack"
       WIN32_LIBS="-lws2_32"
       ;;
     *)
@@ -336,71 +346,90 @@ else
       ;;
   esac
 
+  if test x"$AR" != x; then
+    emblibav_configure_args="$emblibav_configure_args --ar=\\\"\\\$AR\\\""
+  fi
+
+  if test x"$AS" != x; then
+    emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$CC\\\""
+  fi
+
+  if test x"$CC" != x; then
+    emblibav_configure_args="$emblibav_configure_args --cc=\\\"\\\$CC\\\""
+  fi
+
+  if test x"$LD" != x; then
+    emblibav_configure_args="$emblibav_configure_args --ld=\\\"\\\$CC\\\""
+  fi
+
+  if test x"$NM" != x; then
+    emblibav_configure_args="$emblibav_configure_args --nm=\\\"\\\$NM\\\""
+  fi
+
   dnl checks for extra enable/disable flags
-  FFMPEG_OPTS="(cd $srcdir/gst-libs/ext/libav && ./configure --help)"
-  # Let's check if we can disable the building of the ffmpeg binary
-  can_disable=`echo "$FFMPEG_OPTS" | grep 'disable-ffmpeg'`
+  LIBAV_OPTS=`cd $srcdir/gst-libs/ext/libav && ./configure --help`
+  # Let's check if we can disable the building of the libav binary
+  can_disable=`echo "$LIBAV_OPTS" | grep 'disable-ffmpeg'`
   if test "$can_disable" != ""; then
-    embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffmpeg"
+    emblibav_configure_args="$emblibav_configure_args --disable-ffmpeg"
   fi
   dnl check if libswscale needs enabling explicitly
-  can_enable=`echo "$FFMPEG_OPTS" | grep 'enable-swscale'`
+  can_enable=`echo "$LIBAV_OPTS" | grep 'enable-swscale'`
   if test "$can_enable" != ""; then
-    embffmpeg_configure_args="$embffmpeg_configure_args --enable-swscale"
+    emblibav_configure_args="$emblibav_configure_args --enable-swscale"
   fi
 
-  # append extra configure options to embffmpeg_configure_args if needed
-  if test "x$with_ffmpeg_extra_configure" != "xno"; then
-    embffmpeg_configure_args="$embffmpeg_configure_args $with_ffmpeg_extra_configure"
+  # append extra configure options to emblibav_configure_args if needed
+  if test "x$with_libav_extra_configure" != "xno"; then
+    emblibav_configure_args="$emblibav_configure_args $with_libav_extra_configure"
   fi
 
-  AC_SUBST(FFMPEG_CO_DIR)
-  AC_SUBST(FFMPEG_SVN)
-  AC_SUBST(FFMPEG_REVISION)
-  AC_SUBST(FFMPEG_EXTERNALS_REVISION)
-  AC_CONFIG_COMMANDS([configure-embedded-ffmpeg],
-    [echo "Configuring included Libav instance with args $embffmpeg_configure_args"
+  AC_SUBST(LIBAV_CO_DIR)
+  AC_SUBST(LIBAV_SVN)
+  AC_SUBST(LIBAV_REVISION)
+  AC_SUBST(LIBAV_EXTERNALS_REVISION)
+  AC_CONFIG_COMMANDS([configure-embedded-libav],
+    [echo "Configuring included Libav instance with args $emblibav_configure_args"
      origdir=`pwd`
      dnl Don't put path on the configure call when not needed, as FFmpeg's configure relies on it
      dnl to detect out-of-tree builds
      if test -z "$srcdir" -o "$srcdir" = .; then
        confcmd=./configure
      else
-       confcmd="$origdir"/"$ac_top_srcdir"/gst-libs/ext/libav/configure
+       confcmd="$ac_abs_top_srcdir"/gst-libs/ext/libav/configure
      fi
 
      AS_MKDIR_P(["$ac_top_build_prefix"gst-libs/ext/libav])
      cd "$ac_top_build_prefix"gst-libs/ext/libav &&
-         eval "$confcmd $embffmpeg_configure_args" ||
+         eval "$confcmd $emblibav_configure_args" ||
          AC_MSG_ERROR([Failed to configure embedded Libav tree])
      cd "$origdir"
     ],
-    [embffmpeg_configure_args="$embffmpeg_configure_args"])
+    [emblibav_configure_args="$emblibav_configure_args"])
   AC_MSG_NOTICE([Using included Libav code])
 fi
 
-AC_SUBST(FFMPEG_CFLAGS)
-AC_SUBST(FFMPEG_LIBS)
-AC_SUBST(FFMPEG_SUBDIRS)
-AC_SUBST(POSTPROC_CFLAGS)
-AC_SUBST(POSTPROC_LIBS)
+AC_SUBST(LIBAV_CFLAGS)
+AC_SUBST(LIBAV_DEPS)
+AC_SUBST(LIBAV_LIBS)
+AC_SUBST(LIBAV_SUBDIRS)
 AC_SUBST(SWSCALE_CFLAGS)
+AC_SUBST(SWSCALE_DEPS)
 AC_SUBST(SWSCALE_LIBS)
 AC_SUBST(WIN32_LIBS)
  
-if test x$HAVE_FFMPEG_UNINSTALLED = x1; then
-  AC_DEFINE(HAVE_FFMPEG_UNINSTALLED, [], [Defined if building against uninstalled Libav source])
+if test x$HAVE_LIBAV_UNINSTALLED = x1; then
+  AC_DEFINE(HAVE_LIBAV_UNINSTALLED, [], [Defined if building against uninstalled Libav source])
 fi
-AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1)
+AM_CONDITIONAL(HAVE_LIBAV_UNINSTALLED, test x$HAVE_LIBAV_UNINSTALLED = x1)
 
 AC_CONFIG_FILES(
 Makefile
 common/Makefile
 common/m4/Makefile
-gst-ffmpeg.spec
+gst-libav.spec
 ext/Makefile
-ext/ffmpeg/Makefile
-ext/libpostproc/Makefile
+ext/libav/Makefile
 ext/libswscale/Makefile
 gst-libs/Makefile
 gst-libs/ext/Makefile
@@ -409,6 +438,8 @@ docs/version.entities
 tests/Makefile
 tests/check/Makefile
 tests/files/Makefile
+pkgconfig/Makefile
+pkgconfig/gstreamer-plugins-libav-uninstalled.pc
 )
 AC_OUTPUT