Remove autotools build system

2024-06-10 10:09:28 +00:00 · 2019-06-09 00:30:53 +01:00 · 2019-06-09 00:30:53 +01:00 · 3cd445a490
parent 3f24460e37
commit 3cd445a490
62 changed files with 51 additions and 3197 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,42 +1,5 @@
-aclocal.m4
-autom4te.cache
-config.h
-config.h.in
-config.log
-config.status
-config.guess
-config.sub
-config.rpath
-configure
-libtool
-stamp-h
-stamp-h.in
-stamp-h1
-gst-element-check-*.m4
-ltmain.sh
-missing
-mkinstalldirs
-compile
-install-sh
-depcomp
-autoregen.sh
-ABOUT-NLS
-/INSTALL
-_stdint.h
-gst-plugins-ugly-*.tar.*
-
-.deps
-.libs
-*.lo
-*.la
-*.o
-*~
-/m4
-Makefile.in
-Makefile
 *~
 *.bak
-*.gc??

 Build
 *.user
@ -46,10 +9,7 @@ Build
 *.opensdf
 *.DS_Store

-/test-driver
-*.log
-*.trs
-
 # Meson
 /build
+/_build
 /subprojects
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "common"]
-        path = common
-        url = https://gitlab.freedesktop.org/gstreamer/common.git
--- a/Makefile.am
+++ b/Makefile.am
@ -1,56 +0,0 @@
-SUBDIRS = \
-	gst-libs gst ext m4 tests common pkgconfig po
-	
-EXTRA_DIST = \
-	depcomp \
-	AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
-	ChangeLog gst-plugins-ugly.doap autogen.sh \
-	$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
-	meson_options.txt
-
-DISTCLEANFILES = _stdint.h
-
-ACLOCAL_AMFLAGS = -I m4 -I common/m4
-
-include $(top_srcdir)/common/release.mak
-include $(top_srcdir)/common/po.mak
-
-check-valgrind:
-	$(MAKE) -C tests/check check-valgrind
-
-if HAVE_GST_CHECK
-check-torture:
-	$(MAKE) -C tests/check torture
-build-checks:
-	$(MAKE) -C tests/check build-checks
-else
-check-torture:
-	true
-build-checks:
-	true
-endif
-
-include $(top_srcdir)/common/coverage/lcov.mak
-
-# cruft: plugins that have been merged or moved or renamed
-
-CRUFT_FILES = \
-	$(top_builddir)/gst-plugins-ugly.spec \
-	$(top_builddir)/common/shave \
-	$(top_builddir)/common/shave-libtool \
-	$(top_builddir)/ext/mpg123/.libs/libgstmpg123.so \
-	$(top_builddir)/ext/lame/.libs/libgstlame.so \
-	$(top_builddir)/ext/twolame/.libs/libgsttwolame.so \
-	$(top_builddir)/gst/realmedia/.libs/libgstrmdemux.so
-
-CRUFT_DIRS = \
-	$(top_builddir)/tests/check/pipelines \
-	$(top_srcdir)/ext/mpg123/ \
-	$(top_srcdir)/ext/lame/ \
-	$(top_srcdir)/ext/twolame/ \
-	$(top_builddir)/win32 \
-	$(top_srcdir)/win32
-
-include $(top_srcdir)/common/cruft.mak
-
-all-local: check-cruft
--- a/103
+++ b/103
@ -9,17 +9,22 @@ WHERE TO START
 --------------

 We have a website at
-http://gstreamer.freedesktop.org/

-You should start by going through our FAQ at
-http://gstreamer.freedesktop.org/data/doc/gstreamer/head/faq/html/
+  https://gstreamer.freedesktop.org

-There is more documentation; go to
-http://gstreamer.freedesktop.org/documentation
+Our documentation, including tutorials, API reference and FAQ can be found at

-You can subscribe to our mailing lists; see the website for details.
+  https://gstreamer.freedesktop.org/documentation/

-We track bugs in GNOME's bugzilla; see the website for details.
+You can subscribe to our mailing lists:
+
+  https://lists.freedesktop.org/mailman/listinfo/gstreamer-announce
+
+  https://lists.freedesktop.org/mailman/listinfo/gstreamer-devel
+
+We track bugs, feature requests and merge requests (patches) in GitLab at
+
+  https://gitlab.freedesktop.org/gstreamer/

 You can join us on IRC - #gstreamer on irc.freenode.org

@ -137,12 +142,11 @@ PLATFORMS
 ---------

 - Linux is of course fully supported
- FreeBSD is reported to work; other BSDs should work too
- Solaris is reported to work; a specific sunaudiosink plugin has been written
- MacOSX works, binary 1.x packages can be built using the cerbero build tool
+- FreeBSD is reported to work; other BSDs should work too; same for Solaris
+- MacOS works, binary 1.x packages can be built using the cerbero build tool
 - Windows works; binary 1.x packages can be built using the cerbero build tool
  - MSys/MinGW builds
-  - Microsoft Visual Studio builds are not yet available or supported
+  - Microsoft Visual Studio builds are also available and supported
 - Android works, binary 1.x packages can be built using the cerbero build tool
 - iOS works

@ -151,36 +155,49 @@ INSTALLING FROM PACKAGES

 You should always prefer installing from packages first.  GStreamer is
 well-maintained for a number of distributions, including Fedora, Debian,
-Ubuntu, Mandrake, Gentoo, ...
+Ubuntu, Mandrake, Arch Linux, Gentoo, ...

 Only in cases where you:
- want to hack on GStreamer
- want to verify that a bug has been fixed
- do not have a sane distribution
+
+ - want to hack on GStreamer
+ - want to verify that a bug has been fixed
+ - do not have a sane distribution
+
 should you choose to build from source tarballs or git.

 Find more information about the various packages at
-http://gstreamer.freedesktop.org/download/
+
+  https://gstreamer.freedesktop.org/download/

 COMPILING FROM SOURCE TARBALLS
 ------------------------------

- again, make sure that you really need to install from source !
+- again, make sure that you really need to install from source!
  If GStreamer is one of your first projects ever that you build from source,
  consider taking on an easier project.

- check output of ./configure --help to see if any options apply to you
+- you need a recent version of Meson installed, see
+
+    http://mesonbuild.com/Getting-meson.html
+
+  and
+
+    https://gitlab.freedesktop.org/gstreamer/gst-build/blob/master/README.md
+
 - run
-  ./configure
-  make
+
+    meson build
+    ninja -C build

  to build GStreamer.
+
 - if you want to install it (not required, but what you usually want to do), run
-  make install
+
+    ninja -C build install

 - try out a simple test:
-  gst-launch -v fakesrc num_buffers=5 ! fakesink
-  (If you didn't install GStreamer, prefix gst-launch with tools/)
+  gst-launch-1.0 -v fakesrc num_buffers=5 ! fakesink
+  (If you didn't install GStreamer, run `./build/tools/gst-launch-1.0`)

  If it outputs a bunch of messages from fakesrc and fakesink, everything is
  ok.
@ -196,45 +213,25 @@ COMPILING FROM SOURCE TARBALLS
 COMPILING FROM GIT
 ------------------

-When building from git sources, you will need to run autogen.sh to generate
-the build system files.
+You can build an uninstalled GStreamer from git for development or testing
+purposes without affecting your system installation.

-You will need a set of additional tools typical for building from git,
-including:
- autoconf
- automake
- libtool
+Get started with:

-autogen.sh will check for recent enough versions and complain if you don't have
-them.  You can also specify specific versions of automake and autoconf with
--with-automake and --with-autoconf
+    git clone https://gitlab.freedesktop.org/gstreamer/gst-build
+    meson build
+    ninja -C build
+    ninja -C build uninstalled

-Check autogen.sh options by running autogen.sh --help
+For more information, see the `gst-build` module and its documentation:

-autogen.sh can pass on arguments to configure
-
-When you have done this once, you can use autoregen.sh to re-autogen with
-the last passed options as a handy shortcut.  Use it.
-
-After the autogen.sh stage, you can follow the directions listed in
-"COMPILING FROM SOURCE"
-
-You can also run your whole git stack uninstalled in your home directory,
-so that you can quickly test changes without affecting your system setup or
-interfering with GStreamer installed from packages.  Many GStreamer developers
-use an uninstalled setup for their work.
-
-There is a 'create-uninstalled-setup.sh' script in
-
-  http://cgit.freedesktop.org/gstreamer/gstreamer/tree/scripts/
-
-to easily create an uninstalled setup from scratch.
+  https://gitlab.freedesktop.org/gstreamer/gst-build/blob/master/README.md


 PLUG-IN DEPENDENCIES AND LICENSES
 ---------------------------------

-GStreamer is developed under the terms of the LGPL (see LICENSE file for
+GStreamer is developed under the terms of the LGPL (see COPYING file for
 details). Some of our plug-ins however rely on libraries which are available
 under other licenses. This means that if you are distributing an application
 which has a non-GPL compatible license (for instance a closed-source
--- a/autogen.sh
+++ b/autogen.sh
@ -1,124 +0,0 @@
-#!/bin/sh
-#
-# gst-plugins-ugly autogen.sh
-#
-# Run this to generate all the initial makefiles, etc.
-#
-# This file has been generated from common/autogen.sh.in via common/update-autogen
-
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-package=gst-plugins-ugly
-srcfile=gst-plugins-ugly.doap
-
-# Make sure we have common
-if test ! -f common/gst-autogen.sh;
-then
-  echo "+ Setting up common submodule"
-  git submodule init
-fi
-git submodule update
-
-# source helper functions
-if test ! -f common/gst-autogen.sh;
-then
-  echo There is something wrong with your source tree.
-  echo You are missing common/gst-autogen.sh
-  exit 1
-fi
-. common/gst-autogen.sh
-
-# install pre-commit hook for doing clean commits
-if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
-then
-    rm -f .git/hooks/pre-commit
-    if ! ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit 2> /dev/null
-    then
-        echo "Failed to create commit hook symlink, copying instead ..."
-        cp common/hooks/pre-commit.hook .git/hooks/pre-commit
-    fi
-fi
-
-# GNU gettext automake support doesn't get along with git.
-# https://bugzilla.gnome.org/show_bug.cgi?id=661128
-if test -d po ; then
-  touch -t 200001010000 po/gst-plugins-ugly-1.0.pot
-fi
-
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
-
-if test "x$package" = "xgstreamer"; then
-  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --enable-failing-tests --enable-poisoning"
-elif test "x$package" = "xgst-plugins-bad"; then
-  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-player-tests"
-fi
-
-autogen_options $@
-
-printf "+ check for build tools"
-if test -z "$NOCHECK"; then
-  echo
-
-  printf "  checking for autoreconf ... "
-  echo
-  which "autoreconf" 2>/dev/null || {
-    echo "not found! Please install the autoconf package."
-    exit 1
-  }
-
-  printf "  checking for pkg-config ... "
-  echo
-  which "pkg-config" 2>/dev/null || {
-    echo "not found! Please install pkg-config."
-    exit 1
-  }
-else
-  echo ": skipped version checks"
-fi
-
-# if no arguments specified then this will be printed
-if test -z "$*" && test -z "$NOCONFIGURE"; then
-  echo "+ checking for autogen.sh options"
-  echo "  This autogen script will automatically run ./configure as:"
-  echo "  ./configure $CONFIGURE_DEF_OPT"
-  echo "  To pass any additional options, please specify them on the $0"
-  echo "  command line."
-fi
-
-toplevel_check $srcfile
-
-# autopoint
-if test -d po && grep ^AM_GNU_GETTEXT_VERSION configure.ac >/dev/null ; then
-  tool_run "autopoint" "--force"
-fi
-
-# aclocal
-if test -f acinclude.m4; then rm acinclude.m4; fi
-
-autoreconf --force --install || exit 1
-
-test -n "$NOCONFIGURE" && {
-  echo "+ skipping configure stage for package $package, as requested."
-  echo "+ autogen.sh done."
-  exit 0
-}
-
-cd "$olddir"
-
-echo "+ running configure ... "
-test ! -z "$CONFIGURE_DEF_OPT" && echo "  default flags:  $CONFIGURE_DEF_OPT"
-test ! -z "$CONFIGURE_EXT_OPT" && echo "  external flags: $CONFIGURE_EXT_OPT"
-echo
-
-echo "$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
-"$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
-        echo "  configure failed"
-        exit 1
-}
-
-echo "Now type 'make' to compile $package."
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 59cb678164719ff59dcf6c8b93df4617a1075d11
--- a/configure.ac
+++ b/configure.ac
@ -1,432 +0,0 @@
-AC_PREREQ([2.69])
-
-dnl please read gstreamer/docs/random/autotools before changing this file
-
-dnl initialize autoconf
-dnl releases only do -Wall, cvs and prerelease does -Werror too
-dnl use a three digit version number for releases, and four for cvs/prerelease
-AC_INIT([GStreamer Ugly Plug-ins],[1.17.0.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly])
-
-AG_GST_INIT
-
-dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.14 no-dist-gzip dist-xz tar-ustar subdir-objects])
-
-dnl define PACKAGE_VERSION_* variables
-AS_VERSION
-
-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([gst/asfdemux/gstasfdemux.c])
-
-dnl define the output header for config
-AC_CONFIG_HEADERS(config.h)
-
-dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
-AM_MAINTAINER_MODE([enable])
-
-dnl sets host_* variables
-AC_CANONICAL_HOST
-
-dnl use pretty build output with automake >= 1.11
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
-  [AM_DEFAULT_VERBOSITY=1
-   AC_SUBST(AM_DEFAULT_VERBOSITY)])
-
-dnl our libraries and install dirs use GST_API_VERSION in the filename
-dnl to allow side-by-side installation of different API versions
-GST_API_VERSION=1.0
-AC_SUBST(GST_API_VERSION)
-AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
-  [GStreamer API Version])
-
-AS_LIBTOOL(GST, 1700, 0, 1700)
-
-dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.17.0.1
-GSTPB_REQ=1.17.0.1
-
-dnl *** autotools stuff ****
-
-dnl allow for different autotools
-AS_AUTOTOOLS_ALTERNATE
-
-dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
-
-dnl set up gettext
-dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION(0.17)
-AM_GNU_GETTEXT([external])
-AG_GST_GETTEXT([gst-plugins-ugly-$GST_API_VERSION])
-
-dnl *** check for arguments to configure ***
-
-AG_GST_ARG_DISABLE_FATAL_WARNINGS
-AG_GST_ARG_ENABLE_EXTRA_CHECKS
-
-AG_GST_ARG_DEBUG
-AG_GST_ARG_PROFILING
-AG_GST_ARG_VALGRIND
-AG_GST_ARG_GCOV
-
-AG_GST_ARG_EXAMPLES
-
-AG_GST_ARG_WITH_PKG_CONFIG_PATH
-AG_GST_ARG_WITH_PACKAGE_NAME
-AG_GST_ARG_WITH_PACKAGE_ORIGIN
-
-AG_GST_ARG_WITH_PLUGINS
-
-AG_GST_ARG_ENABLE_EXTERNAL
-
-AG_GST_ARG_ENABLE_EXPERIMENTAL
-
-dnl *** checks for platform ***
-
-dnl * hardware/architecture *
-
-dnl common/m4/gst-arch.m4
-dnl check CPU type
-AG_GST_ARCH
-
-dnl Determine endianness
-AC_C_BIGENDIAN
-
-dnl *** software ***
-
-dnl check for large file support
-dnl affected plugins must include config.h
-AC_SYS_LARGEFILE
-
-dnl *** checks for programs ***
-
-dnl find a compiler
-AC_PROG_CC
-AC_PROG_CC_STDC
-
-dnl determine c++ compiler
-AC_PROG_CXX
-dnl determine if c++ is available on this system
-AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
-
-dnl check if the compiler supports '-c' and '-o' options
-AM_PROG_CC_C_O
-
-AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
-AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
-
-dnl check if the compiler supports do while(0) macros
-AG_GST_CHECK_DOWHILE_MACROS
-
-dnl *** checks for libraries ***
-
-dnl check for libm, for sin()
-LT_LIB_M
-AC_SUBST(LIBM)
-
-dnl *** checks for header files ***
-
-dnl used by ext/a52dec
-AX_CREATE_STDINT_H
-
-dnl Check for malloc.h
-AC_CHECK_HEADERS([malloc.h])
-
-dnl *** checks for types/defines ***
-
-dnl *** checks for structures ***
-
-dnl *** checks for compiler characteristics ***
-
-dnl *** checks for library functions ***
-
-dnl Check for a way to display the function name in debug output
-AG_GST_CHECK_FUNCTION
-
-dnl *** checks for dependency libraries ***
-
-dnl GLib is required
-GLIB_REQ=2.44.0
-AG_GST_GLIB_CHECK([$GLIB_REQ])
-
-ORC_CHECK([0.4.16])
-
-dnl checks for gstreamer
-dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes)
-AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes)
-AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes)
-AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
-
-dnl Check for documentation xrefs
-GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
-GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_API_VERSION`"
-AC_SUBST(GLIB_PREFIX)
-AC_SUBST(GST_PREFIX)
-AC_SUBST(GSTPB_PREFIX)
-
-dnl Needed by plugins that use g_module_*() API
-PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
-
-dnl Check for -Bsymbolic-functions linker flag used to avoid
-dnl intra-library PLT jumps, if available.
-AC_ARG_ENABLE(Bsymbolic,
-              [AS_HELP_STRING([--disable-Bsymbolic],[avoid linking with -Bsymbolic])],,
-              [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
-               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-               LDFLAGS=-Wl,-Bsymbolic-functions
-               LIBS=
-               AC_TRY_LINK([], [return 0],
-                           AC_MSG_RESULT(yes)
-                           enable_Bsymbolic=yes,
-                           AC_MSG_RESULT(no)
-                           enable_Bsymbolic=no)
-               LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
-
-dnl *** set variables based on configure arguments ***
-
-dnl set license and copyright notice
-GST_LICENSE="LGPL"
-AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
-AC_SUBST(GST_LICENSE)
-
-dnl set location of plugin directory
-AG_GST_SET_PLUGINDIR
-
-dnl set release date/time
-AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
-  ["${srcdir}/gst-plugins-ugly.doap"],
-  [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
-
-dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [
-    -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
-    -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition
-    -Winit-self -Wmissing-include-dirs -Waddress
-    -Waggregate-return -Wno-multichar -Wnested-externs ])
-
-dnl define an ERROR_CXXFLAGS Makefile variable
-AG_GST_SET_ERROR_CXXFLAGS($FATAL_WARNINGS, [
-    -Wmissing-declarations -Wredundant-decls
-    -Wwrite-strings -Wformat-nonliteral -Wformat-security
-    -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return
-    -Wno-multichar])
-
-dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
-
-dnl used in examples
-AG_GST_DEFAULT_ELEMENTS
-
-dnl *** plug-ins to include ***
-
-dnl these are all the gst plug-ins, compilable without additional libs
-AG_GST_CHECK_PLUGIN(asfdemux)
-AG_GST_CHECK_PLUGIN(dvdlpcmdec)
-AG_GST_CHECK_PLUGIN(dvdsub)
-AG_GST_CHECK_PLUGIN(xingmux)
-AG_GST_CHECK_PLUGIN(realmedia)
-
-AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
-
-if test "x$HAVE_WINSOCK2_H" = "xyes"; then
-  WIN32_LIBS="-lws2_32"
-  AC_SUBST(WIN32_LIBS)
-fi
-
-dnl *** ext plug-ins ***
-dnl keep this list sorted alphabetically !
-
-if test "x$BUILD_EXTERNAL" = "xyes"; then
-
-echo
-AC_MSG_NOTICE([Checking libraries for plugins in ext/])
-echo
-
-dnl *** a52dec ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_A52DEC, true)
-AG_GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
-  AC_CHECK_A52DEC(HAVE_A52DEC=yes, HAVE_A52DEC=no)
-])
-
-dnl *** amr-nb ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
-AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
-  AG_GST_PKG_CHECK_MODULES(AMRNB, opencore-amrnb >= 0.1.3)
-])
-
-dnl *** amr-wb dec ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
-AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
-  AG_GST_PKG_CHECK_MODULES(AMRWB, opencore-amrwb >= 0.1.3)
-])
-
-dnl *** cdio ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_CDIO, true)
-AG_GST_CHECK_FEATURE(CDIO, [cdio library], cdio, [
-  AG_GST_PKG_CHECK_MODULES(CDIO, libcdio >= 0.76)
-])
-
-dnl *** dvdread ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true)
-AG_GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdreadsrc, [
-  AG_GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread")
-  AC_SUBST(DVDREAD_LIBS)
-])
-
-dnl *** mpeg2dec ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true)
-AG_GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
-  AG_GST_PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.5.1)
-])
-
-dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
-AG_GST_CHECK_FEATURE(SIDPLAY, [libsidplay], sid, [
-  GST_PATH_SIDPLAY()
-])
-
-dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
-AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
-  AG_GST_PKG_CHECK_MODULES(X264, x264 >= 0.120)
-
-  dnl Paths to additional x264 library variants, e.g. 10/12 bit
-  AC_ARG_WITH([x264-libraries],
-    AS_HELP_STRING([--with-x264-libraries=PATHS], [Colon separated list of additional x264 library paths, e.g. for 10-bit version]),
-    [
-      if test "x$withval" != "x"
-      then
-        AC_DEFINE_UNQUOTED(HAVE_X264_ADDITIONAL_LIBRARIES, "$withval", [Additional x264 libraries])
-      fi
-    ], []
-  )
-])
-
-else
-
-dnl not building plugins with external dependencies,
-dnl but we still need to set the conditionals
-
-AM_CONDITIONAL(USE_A52DEC, false)
-AM_CONDITIONAL(USE_AMRNB, false)
-AM_CONDITIONAL(USE_AMRWB, false)
-AM_CONDITIONAL(USE_CDIO, false)
-AM_CONDITIONAL(USE_DVDREAD, false)
-AM_CONDITIONAL(USE_MPEG2DEC, false)
-AM_CONDITIONAL(USE_SIDPLAY, false)
-AM_CONDITIONAL(USE_X264, false)
-
-fi dnl of EXT plugins
-
-dnl *** finalize CFLAGS, LDFLAGS, LIBS
-
-dnl Overview:
-dnl GST_OPTION_CFLAGS:  common flags for profiling, debugging, errors, ...
-dnl GST_*:              flags shared by built objects to link against GStreamer
-dnl GST_ALL_LDFLAGS:    linker flags shared by all
-dnl GST_LIB_LDFLAGS:    additional linker flags for all libaries
-dnl GST_LT_LDFLAGS:     library versioning of our libraries
-dnl GST_PLUGIN_LDFLAGS: flags to be used for all plugins
-
-dnl GST_OPTION_CFLAGS
-if test "x$USE_DEBUG" = xyes; then
-   PROFILE_CFLAGS="-g"
-fi
-AC_SUBST(PROFILE_CFLAGS)
-
-if test "x$PACKAGE_VERSION_NANO" = "x1"; then
-  dnl Define _only_ during CVS (not pre-releases or releases)
-  DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
-else
-  DEPRECATED_CFLAGS=""
-fi
-AC_SUBST(DEPRECATED_CFLAGS)
-
-VISIBILITY_CFLAGS=""
-AS_COMPILER_FLAG([-fvisibility=hidden], [VISIBILITY_CFLAGS="-fvisibility=hidden"])
-AC_SUBST(VISIBILITY_CFLAGS)
-
-VISIBILITY_CXXFLAGS=""
-if test "x$HAVE_CXX" = "xyes"; then
-  AS_CXX_COMPILER_FLAG([-fvisibility=hidden], [VISIBILITY_CXXFLAGS="-fvisibility=hidden"])
-fi
-AC_SUBST(VISIBILITY_CXXFLAGS)
-
-dnl disable strict aliasing
-AS_COMPILER_FLAG([-fno-strict-aliasing], [EXTRA_CFLAGS="-fno-strict-aliasing"])
-AC_SUBST(EXTRA_CFLAGS)
-
-dnl every flag in GST_OPTION_CFLAGS and GST_OPTION_CXXFLAGS can be overridden
-dnl at make time with e.g. make ERROR_CFLAGS=""
-GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
-GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
-AC_SUBST(GST_OPTION_CFLAGS)
-AC_SUBST(GST_OPTION_CXXFLAGS)
-
-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"
-GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(VISIBILITY_CXXFLAGS)"
-GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS) \$(VISIBILITY_CFLAGS)"
-AC_SUBST(GST_CFLAGS)
-AC_SUBST(GST_CXXFLAGS)
-AC_SUBST(GST_LIBS)
-
-dnl LDFLAGS 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_ALL_LDFLAGS="-no-undefined"
-if test "x${enable_Bsymbolic}" = "xyes"; then
-  GST_ALL_LDFLAGS="$GST_ALL_LDFLAGS -Wl,-Bsymbolic-functions"
-fi
-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 $GST_ALL_LDFLAGS"
-AC_SUBST(GST_PLUGIN_LDFLAGS)
-
-dnl *** output files ***
-
-AC_CONFIG_FILES(
-Makefile
-common/Makefile
-common/m4/Makefile
-gst-libs/Makefile
-gst-libs/gst/Makefile
-gst/Makefile
-gst/asfdemux/Makefile
-gst/dvdlpcmdec/Makefile
-gst/dvdsub/Makefile
-gst/realmedia/Makefile
-gst/xingmux/Makefile
-ext/Makefile
-ext/a52dec/Makefile
-ext/amrnb/Makefile
-ext/amrwbdec/Makefile
-ext/cdio/Makefile
-ext/dvdread/Makefile
-ext/mpeg2dec/Makefile
-ext/sidplay/Makefile
-ext/x264/Makefile
-tests/Makefile
-tests/check/Makefile
-tests/files/Makefile
-m4/Makefile
-po/Makefile.in
-pkgconfig/Makefile
-pkgconfig/gstreamer-plugins-ugly-uninstalled.pc
-)
-
-AC_OUTPUT
-
-AG_GST_OUTPUT_PLUGINS
-
-ORC_OUTPUT
--- a/docs/.gitignore
+++ b/docs/.gitignore
@ -1 +0,0 @@
-version.entities
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@ -1,2 +0,0 @@
-<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
-<!ENTITY GST_VERSION "@VERSION@">
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@ -1,69 +0,0 @@
-if USE_A52DEC
-A52DEC_DIR = a52dec
-else
-A52DEC_DIR =
-endif
-
-if USE_AMRNB
- AMRNB_DIR = amrnb
-else
- AMRNB_DIR =
-endif
-
-if USE_AMRWB
- AMRWB_DIR = amrwbdec
-else
- AMRWB_DIR =
-endif
-
-if USE_CDIO
-CDIO_DIR = cdio
-else
-CDIO_DIR = 
-endif
-
-if USE_DVDREAD
- DVDREAD_DIR = dvdread
-else
- DVDREAD_DIR =
-endif
-
-if USE_MPEG2DEC
-MPEG2DEC_DIR = mpeg2dec
-else
-MPEG2DEC_DIR =
-endif
-
-if USE_SIDPLAY
-SIDPLAY_DIR = sidplay
-else
-SIDPLAY_DIR =
-endif
-
-if USE_X264
-X264_DIR=x264
-else
-X264_DIR=
-endif
-
-SUBDIRS = \
-	$(A52DEC_DIR) \
-	$(AMRNB_DIR) \
-	$(AMRWB_DIR) \
-	$(CDIO_DIR) \
-	$(DVDREAD_DIR) \
-	$(MPEG2DEC_DIR) \
-	$(SIDPLAY_DIR) \
-	$(X264_DIR)
-
-DIST_SUBDIRS = \
-	a52dec \
-	amrnb \
-	amrwbdec \
-	cdio \
-	dvdread \
-	mpeg2dec \
-	sidplay \
-	x264
-
-include $(top_srcdir)/common/parallel-subdirs.mak
--- a/ext/a52dec/Makefile.am
+++ b/ext/a52dec/Makefile.am
@ -1,19 +0,0 @@
-plugin_LTLIBRARIES = libgsta52dec.la
-
-libgsta52dec_la_SOURCES = gsta52dec.c
-libgsta52dec_la_CFLAGS = \
-	$(GST_PLUGINS_BASE_CFLAGS) \
-        $(GST_BASE_CFLAGS) \
-        $(GST_CFLAGS) \
-	$(ORC_CFLAGS) \
-	$(A52DEC_CFLAGS)
-libgsta52dec_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
-        $(GST_BASE_LIBS) \
-        $(GST_LIBS) \
-        -lgstaudio-$(GST_API_VERSION) \
-	$(ORC_LIBS) \
-	$(A52DEC_LIBS)
-libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gsta52dec.h
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@ -1,22 +0,0 @@
-plugin_LTLIBRARIES = libgstamrnb.la
-
-libgstamrnb_la_SOURCES = \
-	amrnb.c \
-	amrnbdec.c \
-	amrnbenc.c
-
-libgstamrnb_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS)
-libgstamrnb_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-        -lgstaudio-@GST_API_VERSION@ \
-        $(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
-libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = \
-	amrnbdec.h \
-	amrnbenc.h
-
-presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
-preset_DATA = GstAmrnbEnc.prs
-
-EXTRA_DIST = $(preset_DATA)
--- a/ext/amrwbdec/Makefile.am
+++ b/ext/amrwbdec/Makefile.am
@ -1,16 +0,0 @@
-plugin_LTLIBRARIES = libgstamrwbdec.la
-
-libgstamrwbdec_la_SOURCES = \
-	amrwb.c \
-	amrwbdec.c
-
-libgstamrwbdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS)
-libgstamrwbdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-	$(GST_BASE_LIBS) \
-	-lgstaudio-@GST_API_VERSION@ \
-	$(GST_LIBS) $(AMRWB_LIBS)
-libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = \
-	amrwbdec.h
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@ -1,22 +0,0 @@
-plugin_LTLIBRARIES = libgstcdio.la
-
-libgstcdio_la_SOURCES = \
-	gstcdio.c \
-	gstcdiocddasrc.c
-
-libgstcdio_la_CFLAGS = \
-	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_BASE_CFLAGS) \
-	$(GST_CFLAGS) \
-	$(CDIO_CFLAGS)
-
-libgstcdio_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) \
-	$(GST_BASE_LIBS) \
-	$(CDIO_LIBS)
-
-libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
-
-noinst_HEADERS = \
-	gstcdio.h \
-	gstcdiocddasrc.h
--- a/ext/dvdread/Makefile.am
+++ b/ext/dvdread/Makefile.am
@ -1,11 +0,0 @@
-plugin_LTLIBRARIES = libgstdvdread.la
-
-libgstdvdread_la_SOURCES = dvdreadsrc.c
-libgstdvdread_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(DVDREAD_CFLAGS)
-libgstdvdread_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \
-	$(GMODULE_NO_EXPORT_LIBS) $(DVDREAD_LIBS)
-libgstdvdread_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = dvdreadsrc.h
-
-EXTRA_DIST = README demo-play
--- a/ext/mpeg2dec/.gitignore
+++ b/ext/mpeg2dec/.gitignore
@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*.lo
-*.la
-.deps
-.libs
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@ -1,10 +0,0 @@
-plugin_LTLIBRARIES = libgstmpeg2dec.la
-
-libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c
-libgstmpeg2dec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CFLAGS) $(MPEG2DEC_CFLAGS)
-libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
-	$(GST_LIBS) $(MPEG2DEC_LIBS)
-libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstmpeg2dec.h
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@ -1,10 +0,0 @@
-plugin_LTLIBRARIES = libgstsid.la
-
-libgstsid_la_SOURCES = gstsiddec.cc
-libgstsid_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
-libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS) \
-		      -lgstaudio-$(GST_API_VERSION)
-libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstsiddec.h
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@ -1,22 +0,0 @@
-plugin_LTLIBRARIES = libgstx264.la
-
-libgstx264_la_SOURCES = gstx264enc.c
-libgstx264_la_CFLAGS = \
-	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CFLAGS) \
-	$(X264_CFLAGS)
-libgstx264_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstvideo-$(GST_API_VERSION) \
-	-lgstpbutils-$(GST_API_VERSION) \
-	$(GST_LIBS) \
-	$(X264_LIBS) \
-	$(GMODULE_NO_EXPORT_LIBS)
-libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstx264enc.h
-
-presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
-preset_DATA = GstX264Enc.prs
-
-EXTRA_DIST = $(preset_DATA)
--- a/gst-libs/Makefile.am
+++ b/gst-libs/Makefile.am
@ -1 +0,0 @@
-SUBDIRS = gst 
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@ -1 +0,0 @@
-noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@ -1,4 +0,0 @@
-SUBDIRS=$(GST_PLUGINS_SELECTED)
-DIST_SUBDIRS=$(GST_PLUGINS_ALL)
-
-include $(top_srcdir)/common/parallel-subdirs.mak
--- a/gst/asfdemux/.gitignore
+++ b/gst/asfdemux/.gitignore
@ -1 +0,0 @@
-libgstasf_la-gstasfmux.loT
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@ -1,13 +0,0 @@
-plugin_LTLIBRARIES = libgstasf.la
-
-libgstasf_la_SOURCES = gstasfdemux.c gstasf.c asfheaders.c asfpacket.c gstrtpasfdepay.c gstrtspwms.c
-libgstasf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-                -lgstvideo-@GST_API_VERSION@ \
-		-lgstriff-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
-		-lgstrtp-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ -lgsttag-@GST_API_VERSION@ \
-		$(GST_BASE_LIBS) $(GST_LIBS) \
-		$(WIN32_LIBS)
-libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@ -1,9 +0,0 @@
-
-plugin_LTLIBRARIES = libgstdvdlpcmdec.la
-
-libgstdvdlpcmdec_la_SOURCES = gstdvdlpcmdec.c
-libgstdvdlpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
-libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstdvdlpcmdec.h
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@ -1,10 +0,0 @@
-plugin_LTLIBRARIES = libgstdvdsub.la
-
-libgstdvdsub_la_SOURCES = gstdvdsubdec.c gstdvdsubparse.c
-libgstdvdsub_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
-	$(GST_BASE_LIBS) $(GST_LIBS)
-libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h
--- a/gst/realmedia/.gitignore
+++ b/gst/realmedia/.gitignore
@ -1 +0,0 @@
-asmrules
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@ -1,24 +0,0 @@
-plugin_LTLIBRARIES = libgstrealmedia.la
-
-libgstrealmedia_la_SOURCES = rademux.c rmdemux.c  \
-			   rmutils.c rdtdepay.c rdtmanager.c \
-			   rtspreal.c realhash.c asmrules.c \
-			   rdtjitterbuffer.c gstrdtbuffer.c \
-			   pnmsrc.c realmedia.c
-
-
-libgstrealmedia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrealmedia_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-				-lgstrtsp-@GST_API_VERSION@ \
-				-lgstsdp-@GST_API_VERSION@ \
-				-lgstpbutils-@GST_API_VERSION@ \
-				$(GST_BASE_LIBS) $(GST_LIBS)
-libgstrealmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = rademux.h rmdemux.h rmutils.h rdtdepay.h rdtmanager.h \
-		 rdtjitterbuffer.h rtspreal.h realhash.h asmrules.h gstrdtbuffer.h \
-		 pnmsrc.h
-
-noinst_PROGRAMS = asmrules
-asmrules_CFLAGS = $(GST_CFLAGS) -DTEST
-asmrules_LDADD = $(GST_LIBS) $(LIBM)
--- a/gst/xingmux/Makefile.am
+++ b/gst/xingmux/Makefile.am
@ -1,10 +0,0 @@
-# FIXME 0.11: element should move somewhere else really, such as
-# gst-plugins-good/gst/tags/ or so
-plugin_LTLIBRARIES = libgstxingmux.la
-
-libgstxingmux_la_SOURCES = plugin.c gstxingmux.c
-libgstxingmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstxingmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
-libgstxingmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstxingmux.h
--- a/m4/.gitignore
+++ b/m4/.gitignore
@ -1,17 +0,0 @@
-codeset.m4
-gettext.m4
-glibc21.m4
-iconv.m4
-intdiv0.m4
-inttypes-pri.m4
-inttypes.m4
-inttypes_h.m4
-isc-posix.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-progtest.m4
-stdint_h.m4
-uintmax_t.m4
-ulonglong.m4
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@ -1,32 +0,0 @@
-GETTEXT_M4 = \
-	codeset.m4 \
-	gettext.m4 \
-	glibc21.m4 \
-	iconv.m4 \
-	intdiv0.m4 \
-	inttypes_h.m4 \
-	inttypes-pri.m4 \
-	lcmessage.m4 \
-	lib-ld.m4 \
-	lib-link.m4 \
-	lib-prefix.m4 \
-	lrintf.m4 \
-	lrint.m4 \
-	progtest.m4 \
-	stdint_h.m4 \
-	uintmax_t.m4
-
-EXTRA_DIST = \
-	a52.m4 \
-	aalib.m4 \
-	as-slurp-ffmpeg.m4 \
-	check-libheader.m4 \
-	freetype2.m4 \
-	glib.m4 \
-	gst-fionread.m4 \
-	gst-sdl.m4 \
-	gst-shout2.m4 \
-	gst-sid.m4 \
-	gtk.m4 \
-	libfame.m4 \
-	libmikmod.m4
--- a/m4/README
+++ b/m4/README
@ -1,3 +0,0 @@
-All aclocal .m4 files we need are put here and cat'd to acinclude.m4 in 
-the source root.  Official ones (taken from the relevant devel packages) 
-are named as-is, unofficial ones (or changed ones) get a gst-prefix.
--- a/m4/a52.m4
+++ b/m4/a52.m4
@ -1,112 +0,0 @@
-dnl
-dnl A52_CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME,
-dnl                     ACTION-IF-FOUND, ACTION-IF-NOT-FOUND,
-dnl                     EXTRA-LDFLAGS, EXTRA-CPPFLAGS)
-dnl
-dnl FEATURE-NAME        - feature name; library and header files are treated
-dnl                       as feature, which we look for
-dnl LIB-NAME            - library name as in AC_CHECK_LIB macro
-dnl LIB-FUNCTION        - library symbol as in AC_CHECK_LIB macro
-dnl HEADER-NAME         - header file name as in AC_CHECK_HEADER
-dnl ACTION-IF-FOUND     - when feature is found then execute given action
-dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action
-dnl EXTRA-LDFLAGS       - extra linker flags (-L or -l)
-dnl EXTRA-CPPFLAGS      - extra C preprocessor flags, i.e. -I/usr/X11R6/include
-dnl
-dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1.
-dnl
-AC_DEFUN([A52_CHECK_LIBHEADER],
-[
-  AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7])
-  check_libheader_feature_name=translit([$1], A-Z, a-z)
-
-  if test "x$HAVE_[$1]" = "xyes"; then
-    check_libheader_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="[$8] $CPPFLAGS"
-    AC_CHECK_HEADER([$4], :, HAVE_[$1]=no)
-    CPPFLAGS=$check_libheader_save_CPPFLAGS
-  fi
-
-  if test "x$HAVE_[$1]" = "xyes"; then
-    ifelse([$5], , :, [$5])
-  else
-    ifelse([$6], , :, [$6])
-  fi
-]
-)
-
-dnl
-dnl AC_CHECK_A52DEC(ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl ACTION-IF-FOUND     - when feature is found then execute given action
-dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action
-dnl
-dnl Defines HAVE_A52DEC to yes if liba52 is found
-dnl
-dnl CFLAGS and LDFLAGS for the library are stored in A52DEC_CFLAGS and
-dnl A52DEC_LIBS, respectively
-dnl
-dnl Based on GST_CHECK_A52DEC from gstreamer plugins 0.3.3.1
-dnl Thomas Vander Stichele <thomas@apestaart.org>, Andy Wingo <wingo@pobox.com>
-dnl
-AC_DEFUN([AC_CHECK_A52DEC], 
-[dnl
-AC_ARG_WITH(a52dec-prefix,
-    AC_HELP_STRING([--with-a52dec-prefix=PFX],
-                   [prefix where a52dec is installed (optional)]),
-    a52dec_config_prefix="$withval", a52dec_config_prefix="")
-
-if test "x$a52dec_config_prefix" = "x" ; then
-    A52_CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h,
-        A52DEC_LIBS="-la52 -lm", , -lm)
-else
-    A52_CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h, [
-            A52DEC_LIBS="-la52 -L$a52dec_config_prefix/lib -lm"
-            A52DEC_CFLAGS="-I$a52dec_config_prefix/include"
-        ], , -L$a52dec_config_prefix/lib, -I$a52dec_config_prefix/include)
-fi
-
-if test "x$HAVE_A52DEC" = "xyes"; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $A52DEC_CFLAGS"
-    LIBS="$A52DEC_LIBS $LIBS"
-    AC_TRY_RUN([
-#include <inttypes.h>
-#include <a52dec/a52.h>
-
-int 
-main ()
-{
-  a52_state_t *state;
-#if defined(A52_ACCEL_DETECT)
-  state = a52_init ();
-#else
-  state = a52_init (0);
-#endif
-  a52_free (state);
-  return 0;
-}
-        ],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
-
-    if test "x$HAVE_A52DEC" = "xno"; then
-        echo "*** Your a52dec is borked somehow. Please update to 0.7.4 or newer."
-    fi
-    CFLAGS="$ac_save_CFLAGS"
-    LIBS="$ac_save_LIBS"
-fi
-
-if test "x$HAVE_A52DEC" = "xno"; then
-    A52DEC_CFLAGS=""
-    A52DEC_LIBS=""
-fi
-
-if test "x$HAVE_A52DEC" = "xyes"; then
-  ifelse([$1], , :, [$1])
-else
-  ifelse([$2], , :, [$2])
-fi
-
-AC_SUBST(A52DEC_CFLAGS)
-AC_SUBST(A52DEC_LIBS)
-])
--- a/m4/aalib.m4
+++ b/m4/aalib.m4
@ -1,178 +0,0 @@
-# Configure paths for AALIB
-# touched up for clean output by Thomas Vander Stichele
-# Jan Hubicka 4/22/2001
-# stolen from Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
-dnl
-AC_DEFUN([AM_PATH_AALIB],
-[dnl 
-dnl Get the cflags and libraries from the aalib-config script
-dnl
-AC_ARG_WITH(aalib-prefix,
-  AC_HELP_STRING([--with-aalib-prefix=PFX],
-                 [prefix where AALIB is installed (optional)]),
-  aalib_prefix="$withval", aalib_prefix="")
-
-AC_ARG_WITH(aalib-exec-prefix,
-  AC_HELP_STRING([--with-aalib-exec-prefix=PFX],
-                 [exec prefix where AALIB is installed (optional)]),
-  aalib_exec_prefix="$withval", aalib_exec_prefix="")
-
-AC_ARG_ENABLE(aalibtest, 
-  AC_HELP_STRING([--disable-aalibtest],
-                 [do not try to compile and run a test AALIB program]),
-  , enable_aalibtest=yes)
-
-  if test x$aalib_exec_prefix != x ; then
-     aalib_args="$aalib_args --exec-prefix=$aalib_exec_prefix"
-     if test x${AALIB_CONFIG+set} != xset ; then
-        AALIB_CONFIG=$aalib_exec_prefix/bin/aalib-config
-     fi
-  fi
-  if test x$aalib_prefix != x ; then
-     aalib_args="$aalib_args --prefix=$aalib_prefix"
-     if test x${AALIB_CONFIG+set} != xset ; then
-        AALIB_CONFIG=$aalib_prefix/bin/aalib-config
-     fi
-  fi
-
-  AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
-  min_aalib_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for AALIB - version >= $min_aalib_version)
-  no_aalib=""
-  if test "$AALIB_CONFIG" = "no" ; then
-    no_aalib=yes
-  else
-    AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
-    AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
-
-    aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_aalibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $AALIB_CFLAGS"
-      LIBS="$LIBS $AALIB_LIBS"
-dnl
-dnl Now check if the installed AALIB is sufficiently new. (Also sanity
-dnl checks the results of aalib-config to some extent
-dnl
-      rm -f conf.aalibtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "aalib.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.aalibtest");
-  */
-  { FILE *fp = fopen("conf.aalibtest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_aalib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_aalib_version");
-     exit(1);
-   }
-
-   if (($aalib_major_version > major) ||
-      (($aalib_major_version == major) && ($aalib_minor_version > minor)) ||
-      (($aalib_major_version == major) && ($aalib_minor_version == minor) && ($aalib_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'aalib-config --version' returned %d.%d.%d, but the minimum version\n", $aalib_major_version, $aalib_minor_version, $aalib_micro_version);
-      printf("*** of AALIB required is %d.%d.%d. If aalib-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If aalib-config was wrong, set the environment variable AALIB_CONFIG\n");
-      printf("*** to point to the correct copy of aalib-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_aalib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$AALIB_CONFIG" = "no" ; then
-       echo "*** The aalib-config script installed by AALIB could not be found"
-       echo "*** If AALIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the AALIB_CONFIG environment variable to the"
-       echo "*** full path to aalib-config."
-     else
-       if test -f conf.aalibtest ; then
-        :
-       else
-          echo "*** Could not run AALIB test program, checking why..."
-          CFLAGS="$CFLAGS $AALIB_CFLAGS"
-          LIBS="$LIBS $AALIB_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "AALIB.h"
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding AALIB or finding the wrong"
-          echo "*** version of AALIB. If it is not finding AALIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means AALIB was incorrectly installed"
-          echo "*** or that you have moved AALIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the aalib-config script: $AALIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     AALIB_CFLAGS=""
-     AALIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(AALIB_CFLAGS)
-  AC_SUBST(AALIB_LIBS)
-  rm -f conf.aalibtest
-])
--- a/m4/as-ffmpeg.m4
+++ b/m4/as-ffmpeg.m4
@ -1,99 +0,0 @@
-# CFLAGS and library paths for FFMPEG
-# taken from Autostar Sandbox, http://autostars.sourceforge.net/
-
-dnl Usage:
-dnl AM_PATH_FFMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl FIXME: version checking does not work currently
-dnl
-dnl Example:
-dnl AM_PATH_FFMPEG(0.4.6, , AC_MSG_ERROR([*** FFMPEG >= 0.4.6 not installed)) 
-dnl
-dnl Defines FFMPEG_LIBS
-dnl FIXME: should define FFMPEG_VERSION
-dnl
-
-AC_DEFUN([AM_PATH_FFMPEG],
-[
-  dnl allow for specification of a source path (for uninstalled)
-  AC_ARG_WITH(ffmpeg-source,
-    AC_HELP_STRING([--with-ffmpeg-source=DIR],
-                   [Directory where FFmpeg source is (optional)]),
-    ffmpeg_source="$withval")
-
-  dnl save CFLAGS and LIBS here
-  CFLAGS_save=$CFLAGS
-  LIBS_save=$LIBS
-  if test "x$ffmpeg_source" != "x"; then
-    dnl uninstalled FFmpeg copy
-    AC_MSG_NOTICE([Looking for FFmpeg source in $ffmpeg_source])
-    CFLAGS="-I$ffmpeg_source/libav -I$ffmpeg_source/libavcodec"
-    LIBS="-L$ffmpeg_source/libav -L$ffmpeg_source/libavcodec"
-    AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
-                       [defined if we compile against uninstalled FFmpeg])
-    FFMPEG_COMMON_INCLUDE="#include <common.h>"
-  else
-    FFMPEG_COMMON_INCLUDE="#include <ffmpeg/common.h>"
-  fi
-  
-  dnl check for libavcodec
-  AC_CHECK_LIB(avcodec, avcodec_init, HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
-  
-  dnl check for avcodec.h and avformat.h
-  if test "x$ffmpeg_source" != "x"; then
-    dnl uninstalled
-    AC_CHECK_HEADER(avcodec.h, , HAVE_FFMPEG=no, [/* only compile */])
-    AC_CHECK_HEADER(avformat.h, , HAVE_FFMPEG=no, [/* only compile */])
-  else
-    AC_CHECK_HEADER(ffmpeg/avcodec.h, , HAVE_FFMPEG=no)
-    AC_CHECK_HEADER(ffmpeg/avformat.h, , HAVE_FFMPEG=no)
-  fi
-
-dnl now check if it's sufficiently new
-
-  AC_LANG_SAVE()
-  AC_LANG_C()
-
-  dnl FIXME: we use strcmp, which we know is going to break if ffmpeg ever uses
-  dnl two digits for any of their version numbers.  It makes the test so much
-  dnl easier though so let's ignore that
-  AC_TRY_RUN([
-$FFMPEG_COMMON_INCLUDE
-#include <stdio.h>
-#include <string.h>
-
-int
-main ()
-{
-  if (strcmp (FFMPEG_VERSION, "$1") == -1)
-  {
-    fprintf (stderr,
-             "ERROR: your copy of ffmpeg is too old (%s)\n", FFMPEG_VERSION);
-    return 1;
-  }
-  else
-    return 0;
-}
-], , HAVE_FFMPEG=no)
-
-dnl now do the actual "do we have it ?" test
-  if test "x$HAVE_FFMPEG" = "xyes"; then
-    FFMPEG_LIBS="$LIBS -lavcodec -lavformat"
-    FFMPEG_CFLAGS="$CFLAGS"
-    AC_MSG_NOTICE(we have ffmpeg)
-    dnl execute what we have to because it's found
-    ifelse([$2], , :, [$2])
-  else
-    FFMPEG_LIBS=""
-    FFMPEG_CFLAGS=""
-    dnl execute what we have to because it's not found
-    ifelse([$3], , :, [$3])
-  fi
-
-dnl make variables available
-  AC_SUBST(FFMPEG_LIBS)
-  AC_SUBST(FFMPEG_CFLAGS)
-  AC_SUBST(HAVE_FFMPEG)
-  AC_LANG_RESTORE()
-  CFLAGS=$CFLAGS_save
-  LIBS=$LIBS_save
-])
--- a/m4/as-slurp-ffmpeg.m4
+++ b/m4/as-slurp-ffmpeg.m4
@ -1,59 +0,0 @@
-dnl slurp-ffmpeg.m4 0.1.1
-dnl a macro to slurp in ffmpeg's cvs source inside a project tree
-dnl taken from Autostar Sandbox, http://autostars.sourceforge.net/
-
-dnl Usage:
-dnl AS_SLURP_FFMPEG(DIRECTORY, DATE, [ACTION-IF-WORKED [, ACTION-IF-NOT-WORKED]]])
-dnl
-dnl Example:
-dnl AM_PATH_FFMPEG(lib/ffmpeg, 2002-12-14 12:00 GMT)
-dnl
-dnl make sure you have a Tag file in the dir where you check out that
-dnl is the Tag of CVS you want to have checked out
-dnl it should correspond to the DATE argument you supply, ie resolve to
-dnl the same date
-dnl (in an ideal world, cvs would understand it's own Tag file format as
-dnl a date spec)
-
-AC_DEFUN([AS_SLURP_FFMPEG],
-[
-  # save original dir
-  FAILED=""
-  DIRECTORY=`pwd`
-  # get/update cvs
-  if test ! -d $1; then mkdir -p $1; fi
-  dnl we need to check $srcdir/$1 or it will always checkout ffmpeg even if it is there
-  dnl at least when top_srcdir != top_builddir.
-  dnl FIXME: unfortunately this makes the checkout go into top_srcdir
-  cd $srcdir/$1
-
-  if test ! -e ffmpeg/README; then
-    # check out cvs code
-    AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1)
-    cvs -Q -z4 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes
-  else
-    # compare against Tag file and see if it needs updating
-    if test "`cat Tag`" == "$2"; then
-      AC_MSG_NOTICE(ffmpeg cvs code in sync)
-    else
-      cd ffmpeg 
-      AC_MSG_NOTICE(updating ffmpeg cvs code to $2)
-      cvs -Q -z4 update -dP -D '$2' || FAILED=yes
-      cd ..
-    fi
-  fi
-  if test "x$FAILED" != "xyes"; then
-    echo "$2" > Tag 
-  fi
-  
-  # now go back
-  cd $DIRECTORY
-
-  if test "x$FAILED" == "xyes"; then
-    [$4]
-    false
-  else
-    [$3]
-    true
-  fi
-])
--- a/m4/check-libheader.m4
+++ b/m4/check-libheader.m4
@ -1,39 +0,0 @@
-dnl
-dnl CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME,
-dnl                 ACTION-IF-FOUND, ACTION-IF-NOT-FOUND,
-dnl                 EXTRA-LDFLAGS, EXTRA-CPPFLAGS)
-dnl
-dnl FEATURE-NAME        - feature name; library and header files are treated
-dnl                       as feature, which we look for
-dnl LIB-NAME            - library name as in AC_CHECK_LIB macro
-dnl LIB-FUNCTION        - library symbol as in AC_CHECK_LIB macro
-dnl HEADER-NAME         - header file name as in AC_CHECK_HEADER
-dnl ACTION-IF-FOUND     - when feature is found then execute given action
-dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action
-dnl EXTRA-LDFLAGS       - extra linker flags (-L or -l)
-dnl EXTRA-CPPFLAGS      - extra C preprocessor flags, i.e. -I/usr/X11R6/include
-dnl
-dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1.
-dnl
-AC_DEFUN([CHECK_LIBHEADER],
-[
-  AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7])
-  check_libheader_feature_name=translit([$1], A-Z, a-z)
-
-  if test "x$HAVE_[$1]" = "xyes"; then
-    check_libheader_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="[$8] $CPPFLAGS"
-    AC_CHECK_HEADER([$4], :, HAVE_[$1]=no)
-    CPPFLAGS=$check_libheader_save_CPPFLAGS
-  fi
-
-  if test "x$HAVE_[$1]" = "xyes"; then
-    ifelse([$5], , :, [$5])
-    AC_MSG_NOTICE($check_libheader_feature_name was found)
-  else
-    ifelse([$6], , :, [$6])
-    AC_MSG_WARN($check_libheader_feature_name not found)
-  fi
-  AC_SUBST(HAVE_[$1])
-]
-)
--- a/m4/freetype2.m4
+++ b/m4/freetype2.m4
@ -1,143 +0,0 @@
-# Configure paths for FreeType2
-# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
-
-dnl AC_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
-dnl
-AC_DEFUN([AC_CHECK_FT2],
-[dnl
-dnl Get the cflags and libraries from the freetype-config script
-dnl
-AC_ARG_WITH(ft-prefix,
-[  --with-ft-prefix=PREFIX
-                          Prefix where FreeType is installed (optional)],
-            ft_config_prefix="$withval", ft_config_prefix="")
-AC_ARG_WITH(ft-exec-prefix,
-[  --with-ft-exec-prefix=PREFIX
-                          Exec prefix where FreeType is installed (optional)],
-            ft_config_exec_prefix="$withval", ft_config_exec_prefix="")
-AC_ARG_ENABLE(freetypetest,
-[  --disable-freetypetest  Do not try to compile and run
-                          a test FreeType program],
-              [], enable_fttest=yes)
-
-if test x$ft_config_exec_prefix != x ; then
-  ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-  fi
-fi
-if test x$ft_config_prefix != x ; then
-  ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-  fi
-fi
-AC_PATH_PROG(FT2_CONFIG, freetype-config, no)
-
-min_ft_version=ifelse([$1], ,6.1.0,$1)
-AC_MSG_CHECKING(for FreeType - version >= $min_ft_version)
-no_ft=""
-if test "$FT2_CONFIG" = "no" ; then
-  no_ft=yes
-else
-  FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-  FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-  ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-  ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-  ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-  ft_min_major_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-  ft_min_minor_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-  ft_min_micro_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-  if test x$enable_fttest = xyes ; then
-    ft_config_is_lt=""
-    if test $ft_config_major_version -lt $ft_min_major_version ; then
-      ft_config_is_lt=yes
-    else
-      if test $ft_config_major_version -eq $ft_min_major_version ; then
-        if test $ft_config_minor_version -lt $ft_min_minor_version ; then
-          ft_config_is_lt=yes
-        else
-          if test $ft_config_minor_version -eq $ft_min_minor_version ; then
-            if test $ft_config_micro_version -lt $ft_min_micro_version ; then
-              ft_config_is_lt=yes
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test x$ft_config_is_lt = xyes ; then
-      no_ft=yes
-    else
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $FT2_CFLAGS"
-      LIBS="$FT2_LIBS $LIBS"
-dnl
-dnl Sanity checks for the results of freetype-config to some extent
-dnl
-      AC_TRY_RUN([
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main()
-{
-  FT_Library library;
-  FT_Error error;
-
-  error = FT_Init_FreeType(&library);
-
-  if (error)
-    return 1;
-  else
-  {
-    FT_Done_FreeType(library);
-    return 0;
-  }
-}
-],, no_ft=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-      CFLAGS="$ac_save_CFLAGS"
-      LIBS="$ac_save_LIBS"
-    fi             # test $ft_config_version -lt $ft_min_version
-  fi               # test x$enable_fttest = xyes
-fi                 # test "$FT2_CONFIG" = "no"
-if test x$no_ft = x ; then
-   AC_MSG_RESULT(yes)
-   ifelse([$2], , :, [$2])
-else
-   AC_MSG_RESULT(no)
-   if test "$FT2_CONFIG" = "no" ; then
-     echo "*** The freetype-config script installed by FreeType 2 could not be found."
-     echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
-     echo "*** your path, or set the FT2_CONFIG environment variable to the"
-     echo "*** full path to freetype-config."
-   else
-     if test x$ft_config_is_lt = xyes ; then
-       echo "*** Your installed version of the FreeType 2 library is too old."
-       echo "*** If you have different versions of FreeType 2, make sure that"
-       echo "*** correct values for --with-ft-prefix or --with-ft-exec-prefix"
-       echo "*** are used, or set the FT2_CONFIG environment variable to the"
-       echo "*** full path to freetype-config."
-     else
-       echo "*** The FreeType test program failed to run.  If your system uses"
-       echo "*** shared libraries and they are installed outside the normal"
-       echo "*** system library path, make sure the variable LD_LIBRARY_PATH"
-       echo "*** (or whatever is appropiate for your system) is correctly set."
-     fi
-   fi
-   FT2_CFLAGS=""
-   FT2_LIBS=""
-   ifelse([$3], , :, [$3])
-fi
-AC_SUBST(FT2_CFLAGS)
-AC_SUBST(FT2_LIBS)
-])
--- a/m4/gconf-2.m4
+++ b/m4/gconf-2.m4
@ -1,40 +0,0 @@
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH(gconf-source, 
-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH(gconf-schema-file-dir, 
-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-     [  --disable-schemas-install	Disable the schemas installation],
-     [case "${enableval}" in
-       yes) schemas_install=true ;;
-       no)  schemas_install=false ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;;
-     esac],[schemas_install=true])
-     AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue)
-])
--- a/m4/glib.m4
+++ b/m4/glib.m4
@ -1,196 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN([AM_PATH_GLIB],
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread) 
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])
--- a/m4/gst-fionread.m4
+++ b/m4/gst-fionread.m4
@ -1,42 +0,0 @@
-AC_DEFUN([GST_CHECK_FIONREAD], [
-
-  AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
-  AC_CACHE_VAL(GST_FIONREAD_IN_SYS_IOCTL, [
-    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/ioctl.h>
-], [
-int x = FIONREAD;
-if ( x )
-  return 0;
-    ], GST_FIONREAD_IN_SYS_IOCTL="yes",GST_FIONREAD_IN_SYS_IOCTL="no")
-  ])
-
-  AC_MSG_RESULT($GST_FIONREAD_IN_SYS_IOCTL)
-
-  if test "$GST_FIONREAD_IN_SYS_IOCTL" = "yes"; then
-    AC_DEFINE([HAVE_FIONREAD_IN_SYS_IOCTL], 1, [FIONREAD ioctl found in sys/ioclt.h])
-
-  else
-
-    AC_MSG_CHECKING(for FIONREAD in sys/filio.h)
-    AC_CACHE_VAL(GST_FIONREAD_IN_SYS_FILIO, [
-      AC_TRY_COMPILE([
-  #include <sys/types.h>
-  #include <sys/filio.h>
-  ], [
-  int x = FIONREAD;
-  if ( x )
-    return 0;
-      ], GST_FIONREAD_IN_SYS_FILIO="yes",GST_FIONREAD_IN_SYS_FILIO="no")
-    ])
-
-    AC_MSG_RESULT($GST_FIONREAD_IN_SYS_FILIO)
-
-    if test "$GST_FIONREAD_IN_SYS_FILIO" = "yes"; then   
-      AC_DEFINE([HAVE_FIONREAD_IN_SYS_FILIO], 1, [FIONREAD ioctl found in sys/filio.h])
-    fi
-
-  fi
-
-])
--- a/m4/gst-ivorbis.m4
+++ b/m4/gst-ivorbis.m4
@ -1,68 +0,0 @@
-# Configure paths for Tremor
-
-dnl XIPH_PATH_IVORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libivorbis, and define IVORBIS_CFLAGS and IVORBIS_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_IVORBIS],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ivorbis,[  --with-ivorbis=PFX   Prefix where libivorbis is installed (optional)], ivorbis_prefix="$withval", ivorbis_prefix="")
-AC_ARG_WITH(ivorbis-libraries,[  --with-ivorbis-libraries=DIR   Directory where libivorbis library is installed (optional)], ivorbis_libraries="$withval", ivorbis_libraries="")
-AC_ARG_WITH(ivorbis-includes,[  --with-ivorbis-includes=DIR   Directory where libivorbis header files are installed (optional)], ivorbis_includes="$withval", ivorbis_includes="")
-AC_ARG_ENABLE(ivorbistest, [  --disable-ivorbistest       Do not try to compile and run a test Ivorbis program],, enable_ivorbistest=yes)
-
-  if test "x$ivorbis_libraries" != "x" ; then
-    IVORBIS_LIBS="-L$ivorbis_libraries"
-  elif test "x$ivorbis_prefix" != "x" ; then
-    IVORBIS_LIBS="-L$ivorbis_prefix/lib"
-  elif test "x$prefix" != "xNONE"; then
-    IVORBIS_LIBS="-L$prefix/lib"
-  fi
-
-  IVORBIS_LIBS="$IVORBIS_LIBS -lvorbisidec -lm"
-
-  if test "x$ivorbis_includes" != "x" ; then
-    IVORBIS_CFLAGS="-I$ivorbis_includes"
-  elif test "x$ivorbis_prefix" != "x" ; then
-    IVORBIS_CFLAGS="-I$ivorbis_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    IVORBIS_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Tremor)
-  no_ivorbis=""
-
-  if test "x$enable_ivorbistest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $IVORBIS_CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $IVORBIS_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Tremor is sufficiently new.
-dnl
-      rm -f conf.ivorbistest
-      AC_TRY_COMPILE([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <tremor/codec.h>
-],,, no_ivorbis=yes)
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_ivorbis" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     IVORBIS_CFLAGS=""
-     IVORBIS_LIBS=""
-     IVORBISFILE_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(IVORBIS_CFLAGS)
-  AC_SUBST(IVORBIS_LIBS)
-  AC_SUBST(IVORBISFILE_LIBS)
-])
--- a/m4/gst-sdl.m4
+++ b/m4/gst-sdl.m4
@ -1,184 +0,0 @@
-# stuff for SDL, hope this helps if we put it here
-
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,
-  AC_HELP_STRING([--with-sdl-prefix=PFX],
-                 [prefix where SDL is installed (optional)]),
-  sdl_prefix="$withval", sdl_prefix="")
-
-AC_ARG_WITH(sdl-exec-prefix,
-  AC_HELP_STRING([--with-sdl-exec-prefix=PFX],
-                 [exec prefix where SDL is installed (optional)]),
-  sdl_exec_prefix="$withval", sdl_exec_prefix="")
-
-AC_ARG_ENABLE(sdltest,
-  AC_HELP_STRING([--disable-sdltest],
-                 [do not try to compile and run a test SDL program]),
-  , enable_sdltest=yes)
-
-  if test x$sdl_exec_prefix != x ; then
-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-     fi
-  fi
-  if test x$sdl_prefix != x ; then
-     sdl_args="$sdl_args --prefix=$sdl_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
-     fi
-  fi
-
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-  no_sdl=""
-  if test "$SDL_CONFIG" = "no" ; then
-    no_sdl=yes
-  else
-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sdltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SDL_CFLAGS"
-      LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
-      rm -f conf.sdltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.sdltest");
-  */
-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_sdl_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sdl_version");
-     exit(1);
-   }
-
-   if (($sdl_major_version > major) ||
-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sdl" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
-     else
-       if test -f conf.sdltest ; then
-        :
-       else
-          echo "*** Could not run SDL test program, checking why..."
-          CFLAGS="$CFLAGS $SDL_CFLAGS"
-          LIBS="$LIBS $SDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SDL_CFLAGS=""
-     SDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SDL_CFLAGS)
-  AC_SUBST(SDL_LIBS)
-  rm -f conf.sdltest
-])
-
--- a/m4/gst-shout2.m4
+++ b/m4/gst-shout2.m4
@ -1,102 +0,0 @@
-# Configure paths for libshout
-# Jack Moffitt <jack@icecast.org> 08-06-2001
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl AM_PATH_SHOUT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libshout 2, and define SHOUT2_CFLAGS and SHOUT2_LIBS
-dnl
-AC_DEFUN([AM_PATH_SHOUT2],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(shout2-prefix,[  --with-shout2-prefix=PFX   Prefix where libshout2 is installed (optional)], shout2_prefix="$withval", shout2_prefix="")
-AC_ARG_ENABLE(shout2test, [  --disable-shout2test       Do not try to compile and run a test shout2 program],, enable_shout2test=yes)
-
-  if test "x$shout2_prefix" != "xNONE" ; then
-    SHOUT2_CFLAGS="-I$shout2_prefix/include"
-    SHOUT2_LIBS="-L$shout2_prefix/lib"
-  elif test "x$prefix" != "x"; then
-    SHOUT2_CFLAGS="-I$prefix/include"
-    SHOUT2_LIBS="-L$prefix/lib"
-  fi
-
-  SHOUT2_LIBS="$SHOUT2_LIBS -lshout -lpthread"
-
-  case $host in
-  *-*-solaris*)
-  	SHOUT2_LIBS="$SHOUT2_LIBS -lnsl -lsocket -lresolv"
-  esac
-
-  AC_MSG_CHECKING(for shout2)
-  no_shout2=""
-
-  if test "x$enable_shout2test" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $SHOUT2_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS"
-    LIBS="$LIBS $SHOUT2_LIBS $OGG_LIBS $VORBIS_LIBS"
-dnl
-dnl Now check if the installed shout2 is sufficiently new.
-dnl
-      rm -f conf.shout2test
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <shout/shout.h>
-
-int main ()
-{
-  int major, minor, patch;
-
-  system("touch conf.shout2test");
-  shout_version(&major, &minor, &patch);
-  if (major < 2)
-    return 1;
-  return 0;
-}
-
-],, no_shout2=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_shout2" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.shout2test ; then
-       :
-     else
-       echo "*** Could not run Shout2 test program, checking why..."
-       CFLAGS="$CFLAGS $SHOUT2_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS"
-       LIBS="$LIBS $SHOUT2_LIBS $OGG_LIBS $VORBIS_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <shout/shout.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Shout2 or finding the wrong"
-       echo "*** version of Shout2. If it is not finding Shout2, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Shout2 was incorrectly installed"
-       echo "*** or that you have moved Shout2 since it was installed. In the latter case, you"
-       echo "*** may want to edit the shout-config script: $SHOUT2_CONFIG" ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     SHOUT2_CFLAGS=""
-     SHOUT2_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(SHOUT2_CFLAGS)
-  AC_SUBST(SHOUT2_LIBS)
-  rm -f conf.shout2test
-])
--- a/m4/gst-sid.m4
+++ b/m4/gst-sid.m4
@ -1,35 +0,0 @@
-dnl check for sidplay
-
-AC_DEFUN([GST_PATH_SIDPLAY],
-[
-AC_MSG_CHECKING([for libsidplay 1.36.x])
-
-AC_LANG_PUSH(C++)
-
-AC_CHECK_HEADER(sidplay/player.h, HAVE_SIDPLAY="yes", HAVE_SIDPLAY="no")
-
-if test $HAVE_SIDPLAY = "yes"; then
-  SIDPLAY_LIBS="-lsidplay"
-
-  AC_MSG_CHECKING([whether -lsidplay works])
-  ac_libs_safe=$LIBS
-
-  LIBS="-lsidplay"
-
-  AC_TRY_LINK([#include <sidplay/player.h>],
-    [sidTune tune = sidTune(0);],
-    HAVE_SIDPLAY="yes",
-    HAVE_SIDPLAY="no")
-
-  LIBS="$ac_libs_safe"
-
-  AC_MSG_RESULT([$HAVE_SIDPLAY])
-fi
-
-SIDPLAY_CFLAGS=
-SIDPLAY_LIBS="-lsidplay"
-AC_SUBST(SIDPLAY_CFLAGS)
-AC_SUBST(SIDPLAY_LIBS)
-
-AC_LANG_POP(C++)
-])
--- a/m4/gtk.m4
+++ b/m4/gtk.m4
@ -1,194 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN([AM_PATH_GTK],
-[dnl 
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-            gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-		    , enable_gtktest=yes)
-
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
--- a/m4/libfame.m4
+++ b/m4/libfame.m4
@ -1,182 +0,0 @@
-dnl AM_PATH_LIBFAME([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for libfame, and define LIBFAME_CFLAGS and LIBFAME_LIBS
-dnl Vivien Chappelier 12/11/00
-dnl stolen from ORBit autoconf
-dnl
-AC_DEFUN([AM_PATH_LIBFAME],
-[dnl 
-dnl Get the cflags and libraries from the libfame-config script
-dnl
-AC_ARG_WITH(libfame-prefix,[  --with-libfame-prefix=PFX   Prefix where libfame is installed (optional)],
-            libfame_config_prefix="$withval", libfame_config_prefix="")
-AC_ARG_WITH(libfame-exec-prefix,[  --with-libfame-exec-prefix=PFX Exec prefix where libfame is installed (optional)],
-            libfame_config_exec_prefix="$withval", libfame_config_exec_prefix="")
-AC_ARG_ENABLE(libfametest, [  --disable-libfametest       Do not try to compile and run a test libfame program],
-		    , enable_libfametest=yes)
-
-  if test x$libfame_config_exec_prefix != x ; then
-     libfame_config_args="$libfame_config_args --exec-prefix=$libfame_config_exec_prefix"
-     if test x${LIBFAME_CONFIG+set} != xset ; then
-        LIBFAME_CONFIG=$libfame_config_exec_prefix/bin/libfame-config
-     fi
-  fi
-  if test x$libfame_config_prefix != x ; then
-     libfame_config_args="$libfame_config_args --prefix=$libfame_config_prefix"
-     if test x${LIBFAME_CONFIG+set} != xset ; then
-        LIBFAME_CONFIG=$libfame_config_prefix/bin/libfame-config
-     fi
-  fi
-
-  AC_PATH_PROG(LIBFAME_CONFIG, libfame-config, no)
-  min_libfame_version=ifelse([$1], , 0.9.0, $1)
-  AC_MSG_CHECKING(for libfame - version >= $min_libfame_version)
-  no_libfame=""
-  if test "$LIBFAME_CONFIG" = "no" ; then
-    no_libfame=yes
-  else
-    LIBFAME_CFLAGS=`$LIBFAME_CONFIG $libfame_config_args --cflags`
-    LIBFAME_LIBS=`$LIBFAME_CONFIG $libfame_config_args --libs`
-    libfame_config_major_version=`$LIBFAME_CONFIG $libfame_config_args --version | \
-	   sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    libfame_config_minor_version=`$LIBFAME_CONFIG $libfame_config_args --version | \
-	   sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    libfame_config_micro_version=`$LIBFAME_CONFIG $libfame_config_args --version | \
-	   sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_libfametest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
-      LIBS="$LIBFAME_LIBS $LIBS"
-dnl
-dnl Now check if the installed LIBFAME is sufficiently new. (Also sanity
-dnl checks the results of libfame-config to some extent
-dnl
-      rm -f conf.libfametest
-      AC_TRY_RUN([
-#include <fame.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.libfametest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = strdup("$min_libfame_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_libfame_version");
-     exit(1);
-   }
-
-  if ((libfame_major_version != $libfame_config_major_version) ||
-      (libfame_minor_version != $libfame_config_minor_version) ||
-      (libfame_micro_version != $libfame_config_micro_version))
-    {
-      printf("\n*** 'libfame-config --version' returned %d.%d.%d, but Libfame (%d.%d.%d)\n", 
-             $libfame_config_major_version, $libfame_config_minor_version, $libfame_config_micro_version,
-             libfame_major_version, libfame_minor_version, libfame_micro_version);
-      printf ("*** was found! If libfame-config was correct, then it is best\n");
-      printf ("*** to remove the old version of libfame. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If libfame-config was wrong, set the environment variable LIBFAME_CONFIG\n");
-      printf("*** to point to the correct copy of libfame-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-#if defined (LIBFAME_MAJOR_VERSION) && defined (LIBFAME_MINOR_VERSION) && defined (LIBFAME_MICRO_VERSION)
-  else if ((libfame_major_version != LIBFAME_MAJOR_VERSION) ||
-	   (libfame_minor_version != LIBFAME_MINOR_VERSION) ||
-           (libfame_micro_version != LIBFAME_MICRO_VERSION))
-    {
-      printf("*** libfame header files (version %d.%d.%d) do not match\n",
-	     LIBFAME_MAJOR_VERSION, LIBFAME_MINOR_VERSION, LIBFAME_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     libfame_major_version, libfame_minor_version, libfame_micro_version);
-    }
-#endif /* defined (LIBFAME_MAJOR_VERSION) ... */
-  else
-    {
-      if ((libfame_major_version > major) ||
-        ((libfame_major_version == major) && (libfame_minor_version > minor)) ||
-        ((libfame_major_version == major) && (libfame_minor_version == minor) && (libfame_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libfame (%d.%d.%d) was found.\n",
-               libfame_major_version, libfame_minor_version, libfame_micro_version);
-        printf("*** You need a version of libfame newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** libfame is always available from http://www-eleves.enst-bretagne.fr/~chappeli/fame\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the libfame-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of libfame, but you can also set the LIBFAME_CONFIG environment to point to the\n");
-        printf("*** correct copy of libfame-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_libfame=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_libfame" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$LIBFAME_CONFIG" = "no" ; then
-       echo "*** The libfame-config script installed by libfame could not be found"
-       echo "*** If libfame was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the LIBFAME_CONFIG environment variable to the"
-       echo "*** full path to libfame-config."
-     else
-       if test -f conf.libfametest ; then
-        :
-       else
-          echo "*** Could not run libfame test program, checking why..."
-          CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
-          LIBS="$LIBS $LIBFAME_LIBS"
-          AC_TRY_LINK([
-#include <fame.h>
-#include <stdio.h>
-],      [ return ((libfame_major_version) || (libfame_minor_version) || (libfame_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding libfame or finding the wrong"
-          echo "*** version of LIBFAME. If it is not finding libfame, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means libfame was incorrectly installed"
-          echo "*** or that you have moved libfame since it was installed. In the latter case, you"
-          echo "*** may want to edit the libfame-config script: $LIBFAME_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     LIBFAME_CFLAGS=""
-     LIBFAME_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(LIBFAME_CFLAGS)
-  AC_SUBST(LIBFAME_LIBS)
-  rm -f conf.libfametest
-])
--- a/m4/libmikmod.m4
+++ b/m4/libmikmod.m4
@ -1,216 +0,0 @@
-# Configure paths for libmikmod
-#
-# Derived from glib.m4 (Owen Taylor 97-11-3)
-# Improved by Chris Butler
-#
-
-dnl AM_PATH_LIBMIKMOD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
-dnl LIBMIKMOD_LDADD
-dnl
-AC_DEFUN([AM_PATH_LIBMIKMOD],
-[dnl 
-dnl Get the cflags and libraries from the libmikmod-config script
-dnl
-AC_ARG_WITH(libmikmod-prefix,
-  AC_HELP_STRING([--with-libmikmod-prefix=PFX],
-                 [prefix where libmikmod is installed (optional)]),
-  libmikmod_config_prefix="$withval", libmikmod_config_prefix="")
-
-AC_ARG_WITH(libmikmod-exec-prefix, 
-  AC_HELP_STRING([--with-libmikmod-exec-prefix=PFX],
-                 [exec prefix where libmikmod is installed (optional)]),
-  libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="")
-
-AC_ARG_ENABLE(libmikmodtest,
-  AC_HELP_STRING([--disable-libmikmodtest],
-                 [Do not try to compile and run a test libmikmod program]),
-  , enable_libmikmodtest=yes)
-
-  if test x$libmikmod_config_exec_prefix != x ; then
-     libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix"
-     if test x${LIBMIKMOD_CONFIG+set} != xset ; then
-        LIBMIKMOD_CONFIG=$libmikmod_config_exec_prefix/bin/libmikmod-config
-     fi
-  fi
-  if test x$libmikmod_config_prefix != x ; then
-     libmikmod_config_args="$libmikmod_config_args --prefix=$libmikmod_config_prefix"
-     if test x${LIBMIKMOD_CONFIG+set} != xset ; then
-        LIBMIKMOD_CONFIG=$libmikmod_config_prefix/bin/libmikmod-config
-     fi
-  fi
-
-  AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no)
-  min_libmikmod_version=ifelse([$1], ,3.1.5,$1)
-  AC_MSG_CHECKING(for libmikmod - version >= $min_libmikmod_version)
-  no_libmikmod=""
-  if test "$LIBMIKMOD_CONFIG" = "no" ; then
-    no_libmikmod=yes
-  else
-    LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags`
-    LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs`
-    LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd`
-    libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-    libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-    libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
-    if test "x$enable_libmikmodtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-	  AC_LANG_SAVE
-	  AC_LANG_C
-      CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD"
-      LIBS="$LIBMIKMOD_LIBS $LIBS"
-dnl
-dnl Now check if the installed libmikmod is sufficiently new. (Also sanity
-dnl checks the results of libmikmod-config to some extent
-dnl
-      rm -f conf.mikmodtest
-      AC_TRY_RUN([
-#include <mikmod.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char* my_strdup (char *str)
-{
-  char *new_str;
-
-  if (str) {
-    new_str = malloc ((strlen (str) + 1) * sizeof(char));
-    strcpy (new_str, str);
-  } else
-    new_str = NULL;
-
-  return new_str;
-}
-
-int main()
-{
-  int major,minor,micro;
-  int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
-  char *tmp_version;
-
-  system("touch conf.mikmodtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_libmikmod_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_libmikmod_version");
-     exit(1);
-   }
-
-  libmikmod_major_version=(MikMod_GetVersion() >> 16) & 255;
-  libmikmod_minor_version=(MikMod_GetVersion() >>  8) & 255;
-  libmikmod_micro_version=(MikMod_GetVersion()      ) & 255;
-
-  if ((libmikmod_major_version != $libmikmod_config_major_version) ||
-      (libmikmod_minor_version != $libmikmod_config_minor_version) ||
-      (libmikmod_micro_version != $libmikmod_config_micro_version))
-    {
-      printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n", 
-             $libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version,
-             libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-      printf ("*** was found! If libmikmod-config was correct, then it is best\n");
-      printf ("*** to remove the old version of libmikmod. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If libmikmod-config was wrong, set the environment variable LIBMIKMOD_CONFIG\n");
-      printf("*** to point to the correct copy of libmikmod-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) ||
-	   (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) ||
-           (libmikmod_micro_version != LIBMIKMOD_REVISION))
-    {
-      printf("*** libmikmod header files (version %ld.%ld.%ld) do not match\n",
-	     LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
-      printf("*** library (version %d.%d.%d)\n",
-	     libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-    }
-  else
-    {
-      if ((libmikmod_major_version > major) ||
-        ((libmikmod_major_version == major) && (libmikmod_minor_version > minor)) ||
-        ((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n",
-               libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-        printf("*** You need a version of libmikmod newer than %d.%d.%d.\n",
-	       major, minor, micro);
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the libmikmod-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG environment to point to the\n");
-        printf("*** correct copy of libmikmod-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_libmikmod=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-	   AC_LANG_RESTORE
-     fi
-  fi
-  if test "x$no_libmikmod" = x ; then
-     AC_MSG_RESULT([yes, `$LIBMIKMOD_CONFIG --version`])
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$LIBMIKMOD_CONFIG" = "no" ; then
-       echo "*** The libmikmod-config script installed by libmikmod could not be found"
-       echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the LIBMIKMOD_CONFIG environment variable to the"
-       echo "*** full path to libmikmod-config."
-     else
-       if test -f conf.mikmodtest ; then
-        :
-       else
-          echo "*** Could not run libmikmod test program, checking why..."
-          CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
-          LIBS="$LIBS $LIBMIKMOD_LIBS"
-		  AC_LANG_SAVE
-		  AC_LANG_C
-          AC_TRY_LINK([
-#include <mikmod.h>
-#include <stdio.h>
-],      [ return (MikMod_GetVersion()!=0); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding libmikmod or finding the wrong"
-          echo "*** version of libmikmod. If it is not finding libmikmod, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location. Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system."
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means libmikmod was incorrectly installed"
-          echo "*** or that you have moved libmikmod since it was installed. In the latter case, you"
-          echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-		  AC_LANG_RESTORE
-       fi
-     fi
-     LIBMIKMOD_CFLAGS=""
-     LIBMIKMOD_LIBS=""
-     LIBMIKMOD_LDADD=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBMIKMOD_CFLAGS)
-  AC_SUBST(LIBMIKMOD_LIBS)
-  AC_SUBST(LIBMIKMOD_LDADD)
-  rm -f conf.mikmodtest
-])
--- a/m4/lrint.m4
+++ b/m4/lrint.m4
@ -1,27 +0,0 @@
-dnl @synopsis AC_C99_FUNC_LRINT
-dnl
-dnl Check whether C99's lrint function is available.
-dnl @version 1.1
-dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this file for any 
-dnl purpose is hereby granted without fee, provided that the above copyright 
-dnl and this permission notice appear in all copies.  No representations are
-dnl made about the suitability of this software for any purpose.  It is 
-dnl provided "as is" without express or implied warranty.
-dnl
-AC_DEFUN([AC_C99_FUNC_LRINT],
-[AC_CACHE_CHECK(for lrint,
-  ac_cv_c99_lrint,
-[AC_TRY_LINK([
-#define		_ISOC9X_SOURCE	1
-#define 	_ISOC99_SOURCE	1
-#define		__USE_ISOC99	1
-#define 	__USE_ISOC9X	1
-#include	<math.h>],
-[	int value = lrint (0.432) ; ], ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no)])
-if test $ac_cv_c99_lrint = yes; then
-  AC_DEFINE(HAVE_LRINT, 1,
-            [Define if you have C99's lrint function.])
-fi
-])# AC_C99_LRINT
--- a/m4/lrintf.m4
+++ b/m4/lrintf.m4
@ -1,27 +0,0 @@
-dnl @synopsis AC_C99_FUNC_LRINTF
-dnl
-dnl Check whether C99's lrintf function is available.
-dnl @version 1.1
-dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this file for any 
-dnl purpose is hereby granted without fee, provided that the above copyright 
-dnl and this permission notice appear in all copies.  No representations are
-dnl made about the suitability of this software for any purpose.  It is 
-dnl provided "as is" without express or implied warranty.
-dnl
-AC_DEFUN([AC_C99_FUNC_LRINTF],
-[AC_CACHE_CHECK(for lrintf,
-  ac_cv_c99_lrintf,
-[AC_TRY_LINK([
-#define		_ISOC9X_SOURCE	1
-#define 	_ISOC99_SOURCE	1
-#define		__USE_ISOC99	1
-#define 	__USE_ISOC9X	1
-#include	<math.h>],
-[	int value = lrintf (0.432) ; ], ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no)])
-if test $ac_cv_c99_lrintf = yes; then
-  AC_DEFINE(HAVE_LRINTF, 1,
-            [Define if you have C99's lrintf function.])
-fi
-])# AC_C99_LRINTF
--- a/pkgconfig/.gitignore
+++ b/pkgconfig/.gitignore
@ -1 +0,0 @@
-*.pc
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@ -1,31 +0,0 @@
-### all of the standard pc files we need to generate
-pcverfiles =  \
-	gstreamer-plugins-ugly-@GST_API_VERSION@.pc
-pcverfiles_uninstalled = \
-	gstreamer-plugins-ugly-@GST_API_VERSION@-uninstalled.pc
-
-### all-local: $(pcverfiles) $(pcverfiles_uninstalled)
-all-local: $(pcverfiles_uninstalled)
-
-cp_verbose = $(cp_verbose_$(V))
-cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
-cp_verbose_0 = @echo "  CP     $@";
-
-### how to generate versioned .pc files from .pc files in this dir
-%-@GST_API_VERSION@.pc: %.pc
-	$(cp_verbose)cp $< $@
-%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
-	$(cp_verbose)cp $< $@
-
-# do not install for now
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = $(pcverfiles)
-
-CLEANFILES = $(pcverfiles) $(pcverfiles_uninstalled)
-# pcinfiles = \
-#           gstreamer-plugins-ugly.pc.in gstreamer-plugins-ugly-uninstalled.pc.in
-pcinfiles = \
-           gstreamer-plugins-ugly-uninstalled.pc.in
-
-DISTCLEANFILES = $(pcinfiles:.in=)
-EXTRA_DIST = $(pcinfiles)
--- a/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
@ -1,13 +0,0 @@
-prefix=
-exec_prefix=
-libdir=@abs_top_builddir@/gst-libs/gst
-includedir=@abs_top_builddir@/gst-libs
-pluginsdir=@abs_top_builddir@
-
-Name: GStreamer Ugly Plugins, Uninstalled
-Description: Streaming media framework, ugly plugins, uninstalled
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-plugins-base-@GST_API_VERSION@
-
-Libs:
-Cflags:
--- a/po/.gitignore
+++ b/po/.gitignore
@ -1,17 +0,0 @@
-*.gmo
-remove-potcdate.sed
-remove-potcdate.sin
-stamp-po
-POTFILES
-cat-id-tbl.c
-gst-plugins-*.pot
-Makefile.in.in
-Makefile.in.in.orig
-Makevars.template
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sin
-quot.sed
-.pot
--- a/po/Makevars
+++ b/po/Makevars
@ -1,47 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = gst-plugins-ugly-1.0
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER =
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# Avoid line numbers in *.po, but keep them in *.pot.
-MSGMERGE = msgmerge --no-location
-MSGMERGE_UPDATE = msgmerge --no-location --update --backup=off
-MSGFILTER = msgfilter --no-location
-
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -1,9 +0,0 @@
-if HAVE_GST_CHECK
-SUBDIRS_CHECK = check
-else
-SUBDIRS_CHECK =
-endif
-
-SUBDIRS = $(SUBDIRS_CHECK) files
-
-DIST_SUBDIRS = check files
--- a/tests/check/.gitignore
+++ b/tests/check/.gitignore
@ -1 +0,0 @@
-test-registry.*
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@ -1,79 +0,0 @@
-include $(top_srcdir)/common/check.mak
-
-CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.reg
-TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
-
-REGISTRY_ENVIRONMENT = \
-	GST_REGISTRY_1_0=$(CHECK_REGISTRY)
-
-AM_TESTS_ENVIRONMENT += \
-	$(REGISTRY_ENVIRONMENT)					\
-	GST_PLUGIN_SYSTEM_PATH_1_0=				\
-	GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)  \
-	GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-ugly@$(top_builddir)" \
-	GST_STATE_IGNORE_ELEMENTS="siddec dvdreadsrc cdiocddasrc"
-
-# ths core dumps of some machines have PIDs appended
-CLEANFILES = core.* test-registry.*
-
-clean-local: clean-local-check
-
-TESTS = $(check_PROGRAMS)
-
-if USE_AMRNB
-AMRNB = elements/amrnbenc
-else
-AMRNB =
-endif
-
-if USE_MPEG2DEC
-MPEG2DEC = elements/mpeg2dec
-else
-MPEG2DEC =
-endif
-
-if USE_X264
-check_x264enc=elements/x264enc
-else
-check_x264enc=
-endif
-
-if USE_PLUGIN_XINGMUX
-check_xingmux = elements/xingmux
-else
-check_xingmux =
-endif
-
-# generic/index
-check_PROGRAMS = \
-	generic/states \
-	$(AMRNB) \
-	$(MPEG2DEC) \
-	$(check_x264enc) \
-	$(check_xingmux)
-
-# these tests don't even pass
-noinst_PROGRAMS =
-
-noinst_HEADERS = elements/xingmux_testdata.h
-
-AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \
-	-DGST_CHECK_TEST_ENVIRONMENT_BEACON="\"GST_PLUGIN_LOADING_WHITELIST\"" \
-	-DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" \
-	-UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
-LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
-
-# valgrind testing
-VALGRIND_TESTS_DISABLE = \
-	elements/x264enc
-
-SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-ugly.supp
-
-elements_amrnbenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
-
-elements_mpeg2dec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_mpeg2dec_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
-  -lgstvideo-@GST_API_VERSION@
-
-EXTRA_DIST = gst-plugins-ugly.supp
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@ -1,5 +0,0 @@
-amrnbenc
-mpeg2dec
-x264enc
-xingmux
-.dirstamp
--- a/tests/check/generic/.gitignore
+++ b/tests/check/generic/.gitignore
@ -1,3 +0,0 @@
-.dirstamp
-index
-states
--- a/tests/files/Makefile.am
+++ b/tests/files/Makefile.am
@ -1 +0,0 @@
-EXTRA_DIST =
				`@ -1 +0,0 @@`
				`Subproject commit 59cb678164719ff59dcf6c8b93df4617a1075d11`
				`@ -1 +0,0 @@`
				`noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h`