diff --git a/ChangeLog b/ChangeLog
index b757f37231..38bc50aaed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2005-10-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  restructure like the core one
+	* gst-libs/gst/audio/Makefile.am:
+	* gst-libs/gst/interfaces/Makefile.am:
+	* gst-libs/gst/net/Makefile.am:
+	* gst-libs/gst/riff/Makefile.am:
+	* gst-libs/gst/rtp/Makefile.am:
+	* gst-libs/gst/tag/Makefile.am:
+	* gst-libs/gst/video/Makefile.am:
+	  use correct linker flags, now the libs are properly versioned
+	* check/elements/audioconvert.c: (verify_convert):
+	* ext/alsa/gstalsaplugin.c:
+	* ext/cdparanoia/gstcdparanoia.c:
+	* ext/gnomevfs/gstgnomevfs.c:
+	* ext/libvisual/visual.c:
+	* ext/ogg/gstogg.c:
+	* ext/ogg/gstoggparse.c: (gst_ogg_parse_chain):
+	* ext/theora/theora.c:
+	* ext/vorbis/vorbis.c:
+	* gst-libs/gst/audio/gstaudiofiltertemplate.c:
+	* gst-libs/gst/tag/gsttagediting.c:
+	* gst-libs/gst/video/video.c:
+	* gst/adder/gstadder.c:
+	* gst/audioconvert/plugin.c:
+	* gst/audiorate/gstaudiorate.c:
+	* gst/audioresample/gstaudioresample.c:
+	* gst/audioresample/resample_ref.c: (resample_scale_ref):
+	* gst/audioscale/gstaudioscale.c:
+	* gst/audioscale/resample.c:
+	* gst/audiotestsrc/gstaudiotestsrc.c:
+	* gst/ffmpegcolorspace/gstffmpeg.c:
+	* gst/playback/gstdecodebin.c: (close_pad_link):
+	* gst/playback/gstplaybin.c: (gen_video_element),
+	(gen_audio_element):
+	* gst/sine/gstsinesrc.c:
+	* gst/subparse/gstsubparse.c:
+	* gst/tags/gsttagediting.c:
+	* gst/tcp/gsttcpplugin.c:
+	* gst/typefind/gsttypefindfunctions.c:
+	* gst/videorate/gstvideorate.c:
+	* gst/videoscale/gstvideoscale.c:
+	* gst/videotestsrc/gstvideotestsrc.c:
+	* gst/volume/gstvolume.c:
+	* sys/v4l/gstv4l.c:
+	* sys/ximage/ximage.c:
+	* sys/xvimage/xvimagesink.c:
+	  fix up defines
+
 2005-10-13  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/vorbis/vorbisenc.c:
diff --git a/configure.ac b/configure.ac
index 6e3e1be61d..5c9fc472dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,35 @@
-dnl autoconf configuration file for gst-plugins 
+AC_PREREQ(2.52)
+
+dnl initialize autoconf
+dnl we don't specify PACKAGE and VERSION because AS_VERSION puts it together
 AC_INIT
-AC_CANONICAL_TARGET
-
-dnl We disable static building for development, for time savings
-dnl this goes before AS_LIBTOOL to appease autoconf
-dnl *NOTE*: dnl this line before release, so release does static too
-AM_DISABLE_STATIC
-
-dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
-AM_MAINTAINER_MODE
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
 AS_VERSION(gst-plugins-base, GST_PLUGINS_BASE_VERSION, 0, 9, 3, 1,
     GST_CVS="no", GST_CVS="yes")
 
-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+dnl can autoconf find the source ?
+AC_CONFIG_SRCDIR([gst/sine/gstsinesrc.c])
+
+dnl define the output header for config
+AM_CONFIG_HEADER([config.h])
+
+dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
+AM_MAINTAINER_MODE
+
+dnl sets host_* variables
+AC_CANONICAL_HOST
+
+dnl initialize automake
+dnl FIXME: this is deprecated use, we should move PACKAGE and VERSION to
+dnl AC_INIT, but then we need to parse the version to pass to AS_VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 dnl our libraries and install dirs use major.minor as a version
 GST_MAJORMINOR=$GST_PLUGINS_BASE_VERSION_MAJOR.$GST_PLUGINS_BASE_VERSION_MINOR
 dnl we override it here if we need to for the release candidate of new series
-GST_MAJORMINOR=0.9
+# GST_MAJORMINOR=0.9
 AC_SUBST(GST_MAJORMINOR)
 
 dnl CURRENT, REVISION, AGE
@@ -28,70 +37,138 @@ dnl - library source changed -> increment REVISION
 dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
 dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
-AS_LIBTOOL(GST_PLUGINS, 2, 0, 0)
-AS_LIBTOOL_TAGS([])
+dnl sets GST_LT_LDFLAGS
+AS_LIBTOOL(GST, 2, 0, 0)
+AS_LIBTOOL_TAGS
 AM_PROG_LIBTOOL
 
-dnl FIXME take something else ?
-AC_CONFIG_SRCDIR([gst/sine/gstsinesrc.c])
-AM_CONFIG_HEADER(config.h)
+dnl *** autotools stuff ****
+
+dnl allow for different autotools
+AS_AUTOTOOLS_ALTERNATE
 
 dnl Add parameters for aclocal
-dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
-ACLOCAL_FLAGS="-I m4 -I common/m4"
-AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
 
-AC_PROG_CC
-AM_PROG_CC_STDC
-AM_PROG_AS
-AS="${CC}"
-AS_PROG_OBJC
-
-dnl the gettext stuff needed
-AM_GNU_GETTEXT_VERSION(0.11.5)
+dnl set up gettext
+dnl the version check needs to stay here because autopoint greps for it
+AM_GNU_GETTEXT_VERSION([0.11.5])
 AM_GNU_GETTEXT([external])
-                                                                                
-GETTEXT_PACKAGE=gst-plugins-base-$GST_MAJORMINOR
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
-                   [gettext package name])
-                                                                                
-dnl define LOCALEDIR in config.h
-AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
-AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
-                   [gettext locale dir])
+GST_GETTEXT([gst-plugins-base-$GST_MAJORMINOR])
 
-GST_SET_ERROR_CFLAGS($GST_CVS)
+dnl *** check for arguments to configure ***
+
+GST_ARG_DEBUG
+GST_ARG_PROFILING
+GST_ARG_VALGRIND
+GST_ARG_GCOV
+
+GST_ARG_EXAMPLES
+
+GST_ARG_WITH_PKG_CONFIG_PATH
+GST_ARG_WITH_PACKAGE_NAME([GStreamer Base Plug-ins])
+GST_ARG_WITH_PACKAGE_ORIGIN
+
+dnl *** checks for platform ***
+
+dnl * hardware/architecture *
+
+dnl common/m4/gst-arch.m4
+dnl check CPU type
+GST_ARCH
+
+dnl *** checks for programs ***
+
+dnl find a compiler
+AC_PROG_CC
 
 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 determine c++ preprocessor
+dnl FIXME: do we need this ?
 AC_PROG_CXXCPP
+
+AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
+AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
+
+dnl check for documentation tools
+GTK_DOC_CHECK([1.3])
+AS_PATH_PYTHON([2.1])
+
+dnl *** checks for libraries ***
+
+dnl For interactive UNIX (a Sun thing)
+dnl FIXME: this adds -lcposix to LIBS, but I doubt we use LIBS
 AC_ISC_POSIX
 
-AC_HEADER_STDC([])
-AC_C_INLINE
-AX_CREATE_STDINT_H
+dnl *** checks for header files ***
 
-dnl Check for malloc.h
-AC_CHECK_HEADER(malloc.h,[
-  AC_DEFINE(HAVE_MALLOC_H, 1, [whether malloc.h available])
-])
+dnl check if we have ANSI C header files
+AC_HEADER_STDC
+
+dnl used in gst/ffmpegcolorspace/mem.c
+dnl FIXME: could be fixed by redefining av_malloc and av_free to GLib's
+AC_CHECK_HEADER([malloc.h])
+
+dnl *** checks for types/defines ***
+
+dnl Check for FIONREAD ioctl declaration
+dnl used in gst/tcp
+GST_CHECK_FIONREAD
+
+dnl *** checks for structures ***
+
+dnl *** checks for compiler characteristics ***
+
+dnl make sure we can use "inline" from C code
+AC_C_INLINE
+
+dnl *** checks for library functions ***
+
+dnl Check for fast float to int casting as defined in C99
+dnl used in gst-libs/gst/floatcast/floatcast.h
+AC_C99_FUNC_LRINT
+AC_C99_FUNC_LRINTF
 
 dnl Check for a way to display the function name in debug output
-GST_CHECK_FUNCTION()
+GST_CHECK_FUNCTION
 
-dnl define correct errorlevel for debugging messages. We want to have GST_ERROR
-dnl messages printed when running cvs builds
-if test "x$GST_CVS" = "xyes"; then
-  AC_DEFINE(GST_LEVEL_DEFAULT, GST_LEVEL_ERROR, [Default errorlevel to use])
+dnl *** checks for dependancy libraries ***
+
+dnl GLib
+
+GST_GLIB_CHECK([2.6])
+
+dnl liboil
+PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.2, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
+if test "x${HAVE_LIBOIL}" != xyes ; then
+  AC_ERROR([liboil-0.3 is required])
 fi
 
-dnl Check for FIONREAD ioctl declaration :
-GST_CHECK_FIONREAD()
+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
+GST_SET_PLUGINDIR
+
+dnl define an ERROR_CFLAGS Makefile variable
+GST_SET_ERROR_CFLAGS($GST_CVS)
+
+dnl define correct level for debugging messages
+GST_SET_LEVEL_DEFAULT($GST_CVS)
+
+dnl decide on default elements
+dnl FIXME: provide configure-time options for this
+dnl FIXME: describe where exactly this gets used
+dnl FIXME: decide if it's a problem that this could point to sinks from
+dnl        depending plugin modules
 DEFAULT_AUDIOSINK="alsasink"
 DEFAULT_VIDEOSINK="xvimagesink"
 DEFAULT_AUDIOSRC="alsasrc"
@@ -111,15 +188,20 @@ case "$host" in
 esac
 
 AC_SUBST(DEFAULT_AUDIOSINK)
-AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSINK,"$DEFAULT_AUDIOSINK",[Default audio sink])
+AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSINK, "$DEFAULT_AUDIOSINK",
+  [Default audio sink])
 AC_SUBST(DEFAULT_AUDIOSRC)
-AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSRC,"$DEFAULT_AUDIOSRC",[Default audio source])
+AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSRC, "$DEFAULT_AUDIOSRC",
+  [Default audio source])
 AC_SUBST(DEFAULT_VIDEOSINK)
-AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSINK,"$DEFAULT_VIDEOSINK",[Default video sink])
+AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSINK, "$DEFAULT_VIDEOSINK",
+  [Default video sink])
 AC_SUBST(DEFAULT_VIDEOSRC)
-AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSRC,"$DEFAULT_VIDEOSRC",[Default video source])
+AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSRC, "$DEFAULT_VIDEOSRC",
+  [Default video source])
 AC_SUBST(DEFAULT_VISUALIZER)
-AC_DEFINE_UNQUOTED(DEFAULT_VISUALIZER,"$DEFAULT_VISUALIZER",[Default visualizer])
+AC_DEFINE_UNQUOTED(DEFAULT_VISUALIZER, "$DEFAULT_VISUALIZER",
+  [Default visualizer])
 
 dnl ############################################
 dnl # Super Duper options for plug-in building #
@@ -138,45 +220,10 @@ GST_CHECK_FEATURE(EXTERNAL, [enable building of plug-ins with external deps],,
 # make BUILD_EXTERNAL available to Makefile.am
 AM_CONDITIONAL(BUILD_EXTERNAL, test "x$BUILD_EXTERNAL" = "xyes")
 
-dnl experimental plug-ins; stuff that hasn't had the dust settle yet
-dnl read 'builds, but might not work'UTO
-GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],,
-[HAVE_EXPERIMENTAL=yes],disabled,
-[
-  AC_MSG_WARN(building experimental plug-ins)
-  USE_TARKIN="yes"
-],[
-  AC_MSG_NOTICE(not building experimental plug-ins)
-  USE_TARKIN="no"
-])
-
-dnl broken plug-ins; stuff that doesn't seem to build at the moment
-GST_CHECK_FEATURE(BROKEN, [enable building of broken plug-ins],,
-HAVE_BROKEN=yes,disabled,
-[  
-  AC_MSG_WARN([building broken plug-ins -- no bug reports on these, only patches :)])
-],[
-  AC_MSG_NOTICE([not building broken plug-ins])
-])
-
 dnl ##############################
 dnl # Do automated configuration #
 dnl ##############################
 
-dnl Check for tools:
-dnl ================
-
-dnl allow for different autotools
-AS_AUTOTOOLS_ALTERNATE()
-
-dnl modify pkg-config path
-AC_ARG_WITH(pkg-config-path, 
-   AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]),
-   [export PKG_CONFIG_PATH=${withval}])
-
-dnl check architecture
-GST_ARCH()
-
 dnl check for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
 GST_REQ=0.9.0
@@ -193,13 +240,14 @@ if test -z $GST_TOOLS_DIR; then
 fi
 AC_SUBST(GST_TOOLS_DIR)
 
+dnl check for where core plug-ins got installed
+dnl this is used for unit tests
 GST_PLUGINS_DIR=`pkg-config --variable=pluginsdir gstreamer-$GST_MAJORMINOR`
 if test -z $GST_PLUGINS_DIR; then
   AC_MSG_ERROR([no plugins dir defined in GStreamer pkg-config file; core upgrade needed.])
 fi
 AC_SUBST(GST_PLUGINS_DIR)
 
-
 dnl check for gstreamer-dataprotocol; uninstalled is selected preferentially
 PKG_CHECK_MODULES(GST_GDP, gstreamer-dataprotocol-$GST_MAJORMINOR >= $GST_REQ,
   HAVE_GST_GDP="yes", HAVE_GST_GDP="no")
@@ -232,20 +280,6 @@ AC_SUBST(GST_BASE_LIBS)
 PKG_CHECK_MODULES(GST_CHECK, gstreamer-check-$GST_MAJORMINOR >= $GST_REQ,
   HAVE_GST_CHECK="yes", HAVE_GST_CHECK="no")
 
-AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
-AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
-
-dnl Determine endianness
-AC_C_BIGENDIAN
-
-dnl Check for fast float to int casting as defined in C99
-AC_C99_FUNC_LRINT()
-AC_C99_FUNC_LRINTF()
-
-dnl Check for essential libraries first:
-dnl ====================================
-
-GST_GLIB_CHECK([2.6])
 
 dnl Check for additional libraries that we might use:
 dnl =================================================
@@ -270,25 +304,10 @@ AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(HAVE_GTK)
 
-PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.2, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
-AC_SUBST(LIBOIL_CFLAGS)
-AC_SUBST(LIBOIL_LIBS)
-if test "x${HAVE_LIBOIL}" != xyes ; then
-  AC_ERROR([liboil-0.3 is required])
-fi
-
 dnl ===========================================================================
 dnl ============================= gst plug-ins ================================
 dnl ===========================================================================
 
-plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
-AC_SUBST(plugindir)
-
-dnl this really should only contain flags, not libs - they get added before
-dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' -no-undefined"
-AC_SUBST(GST_PLUGIN_LDFLAGS)
-
 dnl these are all the gst plug-ins, compilable without additional libs
 GST_PLUGINS_ALL="\
 	adder \
@@ -307,14 +326,6 @@ GST_PLUGINS_ALL="\
 	videoscale \
 	volume \
 	"
-
-dnl see if we can build C++ plug-ins
-if test "x$HAVE_CXX" = "xyes"; then
-  GST_PLUGINS_ALL="$GST_PLUGINS_ALL"
-else
-  AC_MSG_WARN([Not compiling plug-ins requiring C++ compiler])
-fi
-
 AC_SUBST(GST_PLUGINS_ALL)
 
 GST_PLUGINS_SELECTED=""
@@ -585,28 +596,6 @@ fi
 
 fi dnl of EXT plugins
 
-dnl Check for atomic.h
-dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter
-dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H)
-AC_CHECK_HEADER(asm/atomic.h, HAVE_ATOMIC_H=yes, HAVE_ATOMIC_H=no)
-dnl Do a compile to check that it has atomic_set (eg, linux 2.0 didn't)
-if test x$HAVE_ATOMIC_H = xyes; then
-  AC_TRY_RUN([
-#include "asm/atomic.h"
-main() { atomic_t t; atomic_set(&t,0); atomic_inc(&t); atomic_add(1,&t);return 0;}
-  ],, [
-    # Not successful
-    if test x$HAVE_ATOMIC_H = xyes; then
-      AC_MSG_WARN(Atomic reference counting is out of date: doing without.)
-    fi
-    HAVE_ATOMIC_H=no
-  ], [
-    # Cross compiling
-    AC_MSG_RESULT(yes)
-    AC_MSG_WARN(Can't check properly for atomic reference counting.  Assuming OK.)
-  ])
-fi
-
 dnl check for "check", unit testing library/header
 AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
@@ -615,44 +604,6 @@ dnl ######################################################################
 dnl # Check command line parameters, and set shell variables accordingly #
 dnl ######################################################################
 
-AC_ARG_ENABLE(atomic,
-  AC_HELP_STRING([--enable-atomic],[use atomic reference counting header]),
-[case "${enableval}" in
-  yes) USE_ATOMIC_H=$HAVE_ATOMIC_H;;
-  noset) USE_ATOMIC_H=$HAVE_ATOMIC_H;;
-  no)  USE_ATOMIC_H=no;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-atomic) ;;
-esac], 
-[USE_ATOMIC_H=$HAVE_ATOMIC_H]) dnl Default value
-
-AC_ARG_ENABLE(profiling,
-  AC_HELP_STRING([--enable-profiling],
-                 [-pg to compiler commandline, for profiling]),
-[case "${enableval}" in
-  yes) USE_PROFILING=yes ;;
-  no)  UES_PROFILING=no ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-profiling) ;;
-esac], 
-[USE_PROFILING=no]) dnl Default value
-
-AC_ARG_ENABLE(tests,
-  AC_HELP_STRING([--disable-tests],[disable building test apps]),
-[case "${enableval}" in
-  yes) BUILD_TESTS=yes ;;
-  no)  BUILD_TESTS=no ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --disable-tests) ;;
-esac], 
-[BUILD_TESTS=yes]) dnl Default value
-
-AC_ARG_ENABLE(examples,
-  AC_HELP_STRING([--disable-examples],[disable building examples]),
-[case "${enableval}" in
-  yes) BUILD_EXAMPLES=yes ;;
-  no)  BUILD_EXAMPLES=no ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --disable-examples) ;;
-esac], 
-[BUILD_EXAMPLES=yes]) dnl Default value
-
 dnl seeking needs freetype, so check for it here
 PKG_CHECK_MODULES(FT2, freetype2 >= 2.0.9, HAVE_FT2="yes", [
   AC_CHECK_FT2(2.0.9, HAVE_FT2="yes", HAVE_FT2="no")
@@ -662,104 +613,54 @@ AM_CONDITIONAL(HAVE_FT2, test "x$HAVE_FT2" = "xyes")
 AC_SUBST(FT2_CFLAGS)
 AC_SUBST(FT2_LIBS)
 
-dnl ################################################
-dnl # Set defines according to variables set above #
-dnl ################################################
-
-
-if test "x$USE_ATOMIC_H" = xyes; then
-  AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
-fi
-
-# do not use deprecated stuff
-GST_CFLAGS="$GST_CFLAGS -DGST_DISABLE_DEPRECATED"
-
-if test "x$USE_DEBUG" = xyes; then
-  GST_CFLAGS="$GST_CFLAGS -g"
-fi
-
-dnl ############################
-dnl # Checks for documentation #
-dnl ############################
-
-GTK_DOC_CHECK([1.3])
-AS_PATH_PYTHON([2.1])
-
 dnl #############################
 dnl # Set automake conditionals #
 dnl #############################
 
 dnl These should be "USE_*" instead of "HAVE_*", but some packages expect
 dnl HAVE_ and it is likely to be easier to stick with the old name
-AM_CONDITIONAL(HAVE_ATOMIC_H,       test "x$USE_ATOMIC_H" = "xyes")
-
-AM_CONDITIONAL(EXPERIMENTAL,        test "$EXPERIMENTAL" = "$xyes")
-AM_CONDITIONAL(BROKEN,              test "$BROKEN" = "$xyes")
-
-AM_CONDITIONAL(HAVE_NASM,           test "x$HAVE_NASM" = "xyes")
 AM_CONDITIONAL(HAVE_GTK,            test "x$HAVE_GTK" = "xyes")
 AM_CONDITIONAL(BUILD_TESTS,         test "x$BUILD_TESTS" = "xyes")
 AM_CONDITIONAL(BUILD_EXAMPLES,      test "x$BUILD_EXAMPLES" = "xyes")
-AM_CONDITIONAL(HAVE_FIG2DEV_PNG,    $HAVE_FIG2DEV_PNG)
-AM_CONDITIONAL(HAVE_FIG2DEV_PDF,    $HAVE_FIG2DEV_PDF)
-AM_CONDITIONAL(HAVE_RAW1394,        test "x$HAVE_RAW1394" = "xyes")
 
+dnl *** finalize CFLAGS, LDFLAGS, LIBS
+
+dnl Overview:
+dnl GST_OPTION_CFLAGS:  common flags for profiling, debugging, errors, ...
+dnl GST_*:              flags shared by all built objects
+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)
+
+DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
+AC_SUBST(DEPRECATED_CFLAGS)
+
+dnl every flag in GST_OPTION_CFLAGS can be overridden at make time
+GST_OPTION_CFLAGS="\$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
+AC_SUBST(GST_OPTION_CFLAGS)
+
+dnl our libraries need to be versioned correctly
+AC_SUBST(GST_LT_LDFLAGS)
+
+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 ERROR_CFLAGS, but overridable
-GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(ERROR_CFLAGS)"
-
-AC_SUBST(GST_LIBS)
+GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
 AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
 
-dnl ###########################
-dnl # Configure external libs #
-dnl ###########################
+dnl this really should only contain flags, not libs - they get added before
+dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' -no-undefined"
+AC_SUBST(GST_PLUGIN_LDFLAGS)
 
-dnl ############################
-dnl # Set up some more defines #
-dnl ############################
-
-dnl set license and copyright notice
-AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license])
-
-dnl package name in plugins
-AC_ARG_WITH(package-name,
-AC_HELP_STRING([--with-package-name],[specify package name to use in plugins]),
-[case "${withval}" in
-  yes) AC_MSG_ERROR(bad value ${withval} for --with-package-name) ;;
-  no) AC_MSG_ERROR(bad value ${withval} for --with-package-name) ;;
-  *) GST_PACKAGE="${withval}" ;;
-esac], 
-[
-dnl default value
-if test "x$GST_CVS" = "xyes"
-then
-  dnl nano >= 1
-  GST_PACKAGE="GStreamer CVS/prerelease"
-else
-  GST_PACKAGE="GStreamer source release"
-fi
-]
-)
-AC_MSG_NOTICE(Using $GST_PACKAGE as package name)
-AC_DEFINE_UNQUOTED(GST_PACKAGE, "$GST_PACKAGE", [package name in plugins])
-
-dnl package origin URL
-AC_ARG_WITH(package-origin,
-AC_HELP_STRING([--with-package-origin],[specify package origin URL to use in plugins]),
-[case "${withval}" in
-  yes) AC_MSG_ERROR(bad value ${withval} for --with-package-origin) ;;
-  no) AC_MSG_ERROR(bad value ${withval} for --with-package-origin) ;;
-  *) GST_ORIGIN="${withval}" ;;
-esac], 
-[GST_ORIGIN="http://gstreamer.freedesktop.org/"]) dnl Default value
-AC_MSG_NOTICE(Using $GST_ORIGIN as package origin)
-AC_DEFINE_UNQUOTED(GST_ORIGIN, "$GST_ORIGIN", [package origin])
-
-dnl #########################
-dnl # Make the output files #
-dnl #########################
+dnl *** output files ***
 
 AC_CONFIG_FILES(
 Makefile
diff --git a/ext/alsa/gstalsaplugin.c b/ext/alsa/gstalsaplugin.c
index bce83a3035..448bfcccaf 100644
--- a/ext/alsa/gstalsaplugin.c
+++ b/ext/alsa/gstalsaplugin.c
@@ -78,4 +78,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "alsa",
     "ALSA plugin library",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/cdparanoia/gstcdparanoia.c b/ext/cdparanoia/gstcdparanoia.c
index 81f242e724..1a4bea46be 100644
--- a/ext/cdparanoia/gstcdparanoia.c
+++ b/ext/cdparanoia/gstcdparanoia.c
@@ -1227,4 +1227,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "cdparanoia",
     "Read audio from CD in paranoid mode",
-    plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/gnomevfs/gstgnomevfs.c b/ext/gnomevfs/gstgnomevfs.c
index d29d03897e..43ef565b87 100644
--- a/ext/gnomevfs/gstgnomevfs.c
+++ b/ext/gnomevfs/gstgnomevfs.c
@@ -60,4 +60,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gnomevfs",
     "elements to read from and write to  Gnome-VFS uri's",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/libvisual/visual.c b/ext/libvisual/visual.c
index d947985616..a46fb96e38 100644
--- a/ext/libvisual/visual.c
+++ b/ext/libvisual/visual.c
@@ -577,4 +577,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "libvisual",
     "libvisual visualization plugins",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/ogg/gstogg.c b/ext/ogg/gstogg.c
index 016120785e..3220e83157 100644
--- a/ext/ogg/gstogg.c
+++ b/ext/ogg/gstogg.c
@@ -45,4 +45,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "ogg",
     "ogg stream manipulation (info about ogg: http://xiph.org)",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/theora/theora.c b/ext/theora/theora.c
index 44482774ff..2b0ad8c165 100644
--- a/ext/theora/theora.c
+++ b/ext/theora/theora.c
@@ -44,4 +44,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "theora",
     "Theora plugin library",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/vorbis/vorbis.c b/ext/vorbis/vorbis.c
index 46f76d7edb..2d3386a88a 100644
--- a/ext/vorbis/vorbis.c
+++ b/ext/vorbis/vorbis.c
@@ -57,4 +57,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "vorbis",
     "Vorbis plugin library",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 62aa60e7f3..c958b7c209 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -7,7 +7,9 @@ built_sources = multichannel-enumtypes.c
 built_headers = multichannel-enumtypes.h
 BUILT_SOURCES = $(built_sources) $(built_headers)
 
-lib_LTLIBRARIES = libgstaudio-@GST_MAJORMINOR@.la libgstaudiofilter-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = \
+	libgstaudio-@GST_MAJORMINOR@.la \
+	libgstaudiofilter-@GST_MAJORMINOR@.la
 noinst_LTLIBRARIES = libgstaudiofilterexample.la
 
 EXTRA_DIST = gstaudiofiltertemplate.c make_filter
@@ -38,13 +40,14 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
 nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
 	multichannel-enumtypes.h
 
-libgstaudio_@GST_MAJORMINOR@_la_LIBADD =
 libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
+libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
 
 libgstaudiofilter_@GST_MAJORMINOR@_la_SOURCES = gstaudiofilter.c gstaudiofilter.h
 libgstaudiofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS)
+libgstaudiofilter_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
+libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
 
 libgstaudiofilterexample_la_SOURCES = gstaudiofilterexample.c
 libgstaudiofilterexample_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/audio/gstaudiofiltertemplate.c b/gst-libs/gst/audio/gstaudiofiltertemplate.c
index 6e5e874fa0..1c7a8aebbb 100644
--- a/gst-libs/gst/audio/gstaudiofiltertemplate.c
+++ b/gst-libs/gst/audio/gstaudiofiltertemplate.c
@@ -216,7 +216,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gstaudiofilter_template",
     "Audio filter template",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
 
      static void gst_audio_filter_template_setup (GstAudiofilter * audiofilter)
 {
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 90038d826c..a512b7a2a3 100644
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -53,14 +53,9 @@ nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = 	\
 	$(built_sources)				\
 	interfaces-marshal.h
 
-libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = \
-	$(GST_CFLAGS)
-
-libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \
-	$(GST_LIBS)
-
-libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = \
-	@GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
+libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
+libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
+libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDLFAGS)
 
 BUILT_SOURCES = \
 	$(built_sources) \
diff --git a/gst-libs/gst/net/Makefile.am b/gst-libs/gst/net/Makefile.am
index cafb0ecc60..beba9b7e97 100644
--- a/gst-libs/gst/net/Makefile.am
+++ b/gst-libs/gst/net/Makefile.am
@@ -5,6 +5,7 @@ libgstnetinclude_HEADERS = gstnetbuffer.h
 lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la
 
 libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c
+# FIXME: what is that include doing here ???
 libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
 libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
-
+libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am
index cafb0ecc60..beba9b7e97 100644
--- a/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@ -5,6 +5,7 @@ libgstnetinclude_HEADERS = gstnetbuffer.h
 lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la
 
 libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c
+# FIXME: what is that include doing here ???
 libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
 libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
-
+libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 143e93781f..f5694ccba8 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -11,6 +11,6 @@ libgstriff_@GST_MAJORMINOR@include_HEADERS = \
 	riff-media.h \
 	riff-read.h
 
-libgstriff_@GST_MAJORMINOR@_la_LIBADD =
+libgstriff_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
 libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS)
+libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
index 0247b65064..de79cf7d5e 100644
--- a/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@ -10,6 +10,7 @@ libgstrtp_@GST_MAJORMINOR@_la_SOURCES = gstrtpbuffer.c \
   				gstbasertppayload.c \
   				gstbasertpdepayload.c
 
+# FIXME: what is that include doing here ?
 libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
 libgstrtp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
-
+libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index 5f24d7c5a4..4dfc29fe44 100644
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -9,6 +9,6 @@ lib_LTLIBRARIES = libgsttagedit-@GST_MAJORMINOR@.la
 libgsttagedit_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gsttagediting.c gstid3tag.c
 libgsttagedit_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
 libgsttagedit_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) 
+libgsttagedit_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) 
 
 noinst_HEADERS = gsttageditingprivate.h
-
diff --git a/gst-libs/gst/tag/gsttagediting.c b/gst-libs/gst/tag/gsttagediting.c
index e02dce3c35..8ed7d4bd3b 100644
--- a/gst-libs/gst/tag/gsttagediting.c
+++ b/gst-libs/gst/tag/gsttagediting.c
@@ -41,4 +41,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gsttags",
     "elements for manipulating data from ogg streams",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 20cee9ed50..cf8fa21386 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -6,5 +6,5 @@ libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
 libgstvideoinclude_HEADERS = video.h videosink.h
 
 libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS =
 libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
+libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c
index 6e942112b5..32135d704b 100644
--- a/gst-libs/gst/video/video.c
+++ b/gst-libs/gst/video/video.c
@@ -100,4 +100,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gstvideo",
     "Convenience routines for video plugins",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index 378a477abe..9b75919cf3 100644
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -474,4 +474,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "adder",
     "Adds multiple streams",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/audioconvert/plugin.c b/gst/audioconvert/plugin.c
index b8668c7184..364dc2e14c 100644
--- a/gst/audioconvert/plugin.c
+++ b/gst/audioconvert/plugin.c
@@ -41,4 +41,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "audioconvert",
     "Convert audio to different formats",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/audiorate/gstaudiorate.c b/gst/audiorate/gstaudiorate.c
index 286c79115c..96dd436f26 100644
--- a/gst/audiorate/gstaudiorate.c
+++ b/gst/audiorate/gstaudiorate.c
@@ -412,4 +412,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "audiorate",
     "Adjusts audio frames",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index 62736e98d4..c141c1a21f 100644
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -490,4 +490,5 @@ static gboolean plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "audioresample",
-    "Resamples audio", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN);
+    "Resamples audio", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN);
diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c
index 0377b74a6a..d648580837 100644
--- a/gst/audioscale/gstaudioscale.c
+++ b/gst/audioscale/gstaudioscale.c
@@ -731,4 +731,5 @@ plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "audioscale",
-    "Resamples audio", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    "Resamples audio", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
diff --git a/gst/audioscale/resample.c b/gst/audioscale/resample.c
index 3622655e64..568ec140ee 100644
--- a/gst/audioscale/resample.c
+++ b/gst/audioscale/resample.c
@@ -268,7 +268,8 @@ gst_resample_nearest_s16 (gst_resample_t * r)
       SCALE_LOOP (o_ptr[0] = i_ptr[0], 1);
       break;
     case 2:
-      SCALE_LOOP (o_ptr[0] = i_ptr[0]; o_ptr[1] = i_ptr[1], 2);
+      SCALE_LOOP (o_ptr[0] = i_ptr[0];
+          o_ptr[1] = i_ptr[1], 2);
       break;
     default:
     {
@@ -629,7 +630,8 @@ gst_resample_nearest_float (gst_resample_t * r)
       SCALE_LOOP (o_ptr[0] = i_ptr[0], 1);
       break;
     case 2:
-      SCALE_LOOP (o_ptr[0] = i_ptr[0]; o_ptr[1] = i_ptr[1], 2);
+      SCALE_LOOP (o_ptr[0] = i_ptr[0];
+          o_ptr[1] = i_ptr[1], 2);
       break;
     default:
     {
@@ -924,4 +926,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gstresample",
     "Resampling routines for use in audio plugins",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index 06a3e9a3fe..5e704e6a79 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -680,4 +680,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "audiotestsrc",
     "Creates audio test signals of given frequency and volume",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c
index e29b94d5b2..e054afd396 100644
--- a/gst/playback/gstdecodebin.c
+++ b/gst/playback/gstdecodebin.c
@@ -502,8 +502,10 @@ close_pad_link (GstElement * element, GstPad * pad, GstCaps * caps,
     GST_LOG_OBJECT (element, "closed pad %s", padname);
 
     /* our own signal with an extra flag that this is the only pad */
+    GST_DEBUG_OBJECT (decode_bin, "emitting new-decoded-pad");
     g_signal_emit (G_OBJECT (decode_bin),
         gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD], 0, ghost, !more);
+    GST_DEBUG_OBJECT (decode_bin, "emitted new-decoded-pad");
 
     g_free (padname);
   } else {
@@ -1102,4 +1104,5 @@ plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "decodebin",
-    "decoder bin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    "decoder bin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c
index ea3c9a5c89..cfff34d8ba 100644
--- a/gst/playback/gstplaybin.c
+++ b/gst/playback/gstplaybin.c
@@ -399,7 +399,7 @@ gen_video_element (GstPlayBin * play_bin)
   if (play_bin->video_sink) {
     sink = play_bin->video_sink;
   } else {
-    sink = gst_element_factory_make ("autovideosink", "videosink");
+    sink = gst_element_factory_make ("xvimagesink", "videosink");
     if (sink == NULL) {
       g_warning ("could not create autovideosink element");
     }
@@ -516,7 +516,7 @@ gen_audio_element (GstPlayBin * play_bin)
   if (play_bin->audio_sink) {
     sink = play_bin->audio_sink;
   } else {
-    sink = gst_element_factory_make ("autoaudiosink", "audiosink");
+    sink = gst_element_factory_make ("alsasink", "audiosink");
     if (sink == NULL) {
       g_warning ("could not create autoaudiosink element");
     }
@@ -1012,4 +1012,5 @@ plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "playbin",
-    "player bin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    "player bin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index 42df8bdd2f..919b1706c7 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -423,4 +423,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "sine",
     "Sine audio wave generator",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index 2217058412..77607b68e0 100644
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -696,4 +696,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "subparse",
     "Subtitle (.sub) file parsing",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/tags/gsttagediting.c b/gst/tags/gsttagediting.c
index e02dce3c35..8ed7d4bd3b 100644
--- a/gst/tags/gsttagediting.c
+++ b/gst/tags/gsttagediting.c
@@ -41,4 +41,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gsttags",
     "elements for manipulating data from ogg streams",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/tcp/gsttcpplugin.c b/gst/tcp/gsttcpplugin.c
index 8ab6471959..5a59b584b6 100644
--- a/gst/tcp/gsttcpplugin.c
+++ b/gst/tcp/gsttcpplugin.c
@@ -60,4 +60,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "tcp",
     "transfer data over the network via TCP",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index 13937c1833..8bf9c0da7d 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -2002,4 +2002,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "typefindfunctions",
     "default typefind functions",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c
index 1d02e3f901..251bd5973d 100644
--- a/gst/videorate/gstvideorate.c
+++ b/gst/videorate/gstvideorate.c
@@ -614,4 +614,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videorate",
     "Adjusts video frames",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index a80cad3a3d..bdf32df690 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -645,4 +645,5 @@ plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videoscale",
-    "Resizes video", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    "Resizes video", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index b47a90f998..cb1e26a6aa 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -536,4 +536,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videotestsrc",
     "Creates a test video stream",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 3bb73eb0b0..fb06b4f29d 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -508,4 +508,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "volume",
     "element for controlling audio volume",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/sys/v4l/gstv4l.c b/sys/v4l/gstv4l.c
index ae43eeee62..ab45936863 100644
--- a/sys/v4l/gstv4l.c
+++ b/sys/v4l/gstv4l.c
@@ -62,4 +62,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "video4linux",
     "elements for Video 4 Linux",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/sys/ximage/ximage.c b/sys/ximage/ximage.c
index 522e07d7da..ac71794f19 100644
--- a/sys/ximage/ximage.c
+++ b/sys/ximage/ximage.c
@@ -44,4 +44,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "ximage",
     "XFree86 video output and input elements based on standard Xlib calls",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 3e83957959..cf2120525e 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -2233,4 +2233,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "xvimagesink",
     "XFree86 video output plugin using Xv extension",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)