diff --git a/configure.ac b/configure.ac
index 0df29a7711..fc3d6839fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+dnl Note: this file is generated from configure.base by autogen.sh
 AC_INIT
 AC_CONFIG_SRCDIR([gst/gstobject.h])
 
@@ -75,7 +76,7 @@ if test x$NASM_PATH = xno; then
   AC_MSG_WARN(Couldn't find nasm)
   HAVE_NASM="no"
 else
-  AC_DEFINE(HAVE_NASM)
+  AC_DEFINE(HAVE_NASM, 1, [Define if NASM, the netwide assembler, is available])
   HAVE_NASM="yes"
 fi
 
@@ -120,7 +121,7 @@ dnl ==============================================
 dnl Determine CPU
 case "x${target_cpu}" in
   xi?86 | k?) HAVE_CPU_I386=yes
-              AC_DEFINE(HAVE_CPU_I386)
+              AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86])
               dnl FIXME could use some better detection
               dnl       (ie CPUID)
               case "x${target_cpu}" in
@@ -128,13 +129,13 @@ case "x${target_cpu}" in
                 *)             AC_DEFINE(HAVE_RDTSC) ;;
               esac ;;
   xpowerpc)   HAVE_CPU_PPC=yes
-              AC_DEFINE(HAVE_CPU_PPC) ;;
+              AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the target CPU is a PPC]) ;;
   xalpha)     HAVE_CPU_ALPHA=yes
-              AC_DEFINE(HAVE_CPU_ALPHA) ;;
+              AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the target CPU is an Alpha]) ;;
   xarm*)      HAVE_CPU_ARM=yes
-              AC_DEFINE(HAVE_CPU_ARM) ;;
+              AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the target CPU is an ARM]) ;;
   xsparc*)    HAVE_CPU_SPARC=yes
-              AC_DEFINE(HAVE_CPU_SPARC) ;;
+              AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a PPC]) ;;
 esac
 
 dnl Determine endianness
@@ -165,21 +166,11 @@ dnl Check for essential libraries first:
 dnl ====================================
 
 
-dnl Check for glib
-AM_PATH_GLIB(1.2.0,,
-            AC_MSG_ERROR(Cannot find glib: Is glib-config in path?),
-            glib gmodule gthread)
-dnl Put the glib flags into $LIBS and $CFLAGS since we always use them
+PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0, , AC_MSG_ERROR(Cannot find glib-2.0))
 CORE_LIBS="$GLIB_LIBS"
 CORE_CFLAGS="$GLIB_CFLAGS"
-
-
-dnl Check for gtk
-AM_PATH_GTK(1.2.0,,
-            AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
-dnl Put the gtk flags into $LIBS and $CFLAGS since we always use them
-CORE_LIBS="$CORE_LIBS $GTK_LIBS"
-CORE_CFLAGS="$CORE_CFLAGS $GTK_CFLAGS"
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
 
 
 dnl Check for libxml
@@ -231,10 +222,7 @@ else
   dnl Assume only suitable flags result from artsc-config --cflags
   artsc_save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $ARTSC_CFLAGS"
-  AC_CHECK_HEADER(artsc.h,
-		  HAVE_ARTSC=yes,
-		  HAVE_ARTSC=no
-  )
+  AC_CHECK_HEADER(artsc.h, HAVE_ARTSC=yes, HAVE_ARTSC=no)
   CPPFLAGS=$artsc_save_CPPFLAGS
 fi
 AC_SUBST(ARTSC_LIBS)
@@ -248,19 +236,64 @@ AC_ARG_ENABLE(artsd,
 	esac],
 [:])
 
+
+dnl Check for arts
+AC_MSG_CHECKING(arts library)
+
+dnl Set the flags
+ARTS_LIBS="-L/usr/local/lib -L/usr/lib -lmcop -lartsflow -lartsflow_idl"
+ARTS_CFLAGS="-I/usr/local/include/arts -I/usr/include/kde/arts -I/usr/include/arts"
+ARTS_MCOPFLAGS=$ARTS_CFLAGS
+dnl There's no arts-config script, so we make a guess based on the artsc-config
+if test x$ARTSC_CONFIG = xyes; then
+  ARTS_ARTSC_CFLAGS=`artsc-config --cflags | sed 's/artsc/arts/g'`
+  ARTS_CFLAGS="$ARTS_CFLAGS $ARTS_ARTSC_CFLAGS"
+  ARTS_MCOPFLAGS="$ARTS_MCOPFLAGS $ARTS_ARTSC_CFLAGS"
+fi
+AC_SUBST(ARTS_LIBS)
+AC_SUBST(ARTS_CFLAGS)
+AC_SUBST(ARTS_MCOPFLAGS)
+dnl Now check if it exists
+AC_LANG_PUSH(C++)
+HAVE_ARTS=yes
+dnl FIXME: Can't get this test to pass, so commented it out.  Rely on header check.
+dnl AC_CHECK_LIB(artsflow, convert_stereo_2float_i16le, :, HAVE_ARTS=no, $LIBS)
+
+dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.
+dnl Assume only suitable flags result from artsc-config --cflags
+arts_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $ARTS_CFLAGS"
+AC_CHECK_HEADER(artsflow.h, :, HAVE_ARTS=no)
+CPPFLAGS=$arts_save_CPPFLAGS
+
+AC_LANG_POP(C++)
+dnl Check for the idl generator
+AC_CHECK_PROG(HAVE_MCOPIDL, mcopidl, yes, no)
+if test x$HAVE_MCOPIDL = xno; then
+  HAVE_ARTS=no
+fi
+
+
 dnl AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
 
 
 dnl Check for libasound
 alsa_save_LIBS=$LIBS
 alsa_save_CFLAGS=$CFLAGS
-AM_PATH_ALSA(0.5.0, HAVE_LIBASOUND=yes, HAVE_LIBASOUND=no)
-AM_PATH_ALSA(0.9.0,
+AM_PATH_ALSA(0.5.0,
+  HAVE_LIBASOUND=yes,
   HAVE_LIBASOUND=no
-  AC_MSG_WARN(Alsa 0.9.x not yet supported.
+  AC_MSG_WARN(
+***** NOTE: These plugins won't be built: gstalsa
+))
+if test x$HAVE_LIBASOUND = xyes;then
+  AM_PATH_ALSA(0.9.0,
+    HAVE_LIBASOUND=no
+    AC_MSG_WARN(Alsa 0.9.x not yet supported.
 ***** NOTE: These plugins won't be built: gstalsa
 )
-  ,:)
+    ,:)
+fi
 
 LIBS=$alsa_save_LIBS
 CFLAGS=$alsa_save_CFLAGS
@@ -427,7 +460,7 @@ AC_CHECK_HEADER(sys/soundcard.h, HAVE_OSS=yes, HAVE_OSS=no)
 
 dnl Check for xaudio
 AC_CHECK_HEADER(xaudio/decoder.h,
-  AC_DEFINE(HAVE_XAUDIO)
+  AC_DEFINE(HAVE_XAUDIO, 1, [Define if xaudio is available])
   HAVE_XAUDIO="yes",
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: gstxa
@@ -439,7 +472,7 @@ dnl Check for libmad
 AC_MSG_CHECKING(MAD library)
 AC_CHECK_LIB(mad, mad_decoder_finish,
   HAVE_LIBMAD=yes
-  AC_DEFINE(HAVE_LIBMAD),
+  AC_DEFINE(HAVE_LIBMAD, 1, [Define if libmad is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: mad
 )
@@ -450,7 +483,7 @@ dnl Check for libvorbis
 AC_MSG_CHECKING(Vorbis library)
 AC_CHECK_LIB(vorbis, ogg_sync_init,
   HAVE_VORBIS=yes
-  AC_DEFINE(HAVE_VORBIS),
+  AC_DEFINE(HAVE_VORBIS, 1, [Define if vorbis library is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: vorbisdec vorbisenc
 )
@@ -461,7 +494,7 @@ dnl Check for libjpeg
 AC_MSG_CHECKING(libjpeg library)
 AC_CHECK_LIB(jpeg, jpeg_set_defaults,
   HAVE_LIBJPEG=yes
-  AC_DEFINE(HAVE_LIBJPEG),
+  AC_DEFINE(HAVE_LIBJPEG, 1, [Define if libjpeg is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: jpegdec jpegenc
 )
@@ -472,7 +505,7 @@ dnl Check for libHermes
 AC_MSG_CHECKING(Hermes library)
 AC_CHECK_LIB(Hermes, Hermes_ConverterInstance,
   HAVE_LIBHERMES=yes
-  AC_DEFINE(HAVE_LIBHERMES),
+  AC_DEFINE(HAVE_LIBHERMES, 1, [Define if Hermes library is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: colorspace
 )
@@ -482,15 +515,23 @@ AC_CHECK_HEADER(Hermes/Hermes.h, :, HAVE_LIBHERMES=no)
 
 dnl Check for libgsm
 AC_MSG_CHECKING(GSM library)
-AC_CHECK_LIB(gsm, gsm_create,
-  HAVE_LIBGSM=yes
-  AC_DEFINE(HAVE_LIBGSM),
+AC_CHECK_LIB(gsm, gsm_create, HAVE_LIBGSM=yes, HAVE_LIBGSM=no,)
+GSM_CFLAGS=
+GSM_LIBS=-lgsm
+AC_CHECK_HEADER(gsm.h, :, 
+  GSM_CFLAGS="$GSM_CFLAGS -DGSM_HEADER_IN_SUBDIR"
+  AC_CHECK_HEADER(gsm/gsm.h, :, HAVE_LIBGSM=no)
+)
+AC_SUBST(GSM_CFLAGS)
+AC_SUBST(GSM_LIBS)
+
+if test "x$HAVE_LIBGSM" == "xyes"; then
+  AC_DEFINE(HAVE_LIBGSM, 1, [Define if GSM library is available])
+else
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: gsmdec, gsmenc
 )
-  HAVE_LIBGSM=no,
-)
-AC_CHECK_HEADER(gsm/gsm.h, :, HAVE_LIBGSM=no)
+fi
 
 dnl Check for cdparanoia
 AC_MSG_CHECKING(CDparanoia library)
@@ -522,18 +563,6 @@ AC_CHECK_HEADER(rtp/rtp-packet.h, :, HAVE_LIBRTP=no)
 AC_CHECK_HEADER(rtp/rtcp-packet.h, :, HAVE_LIBRTP=no)
 AC_CHECK_HEADER(rtp/rtp-audio.h, :, HAVE_LIBRTP=no)
 
-dnl Check for arts
-AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_LANG_SAVE',
-and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])
-',
-and `AC_LANG_POP([])', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])
-
-AC_LANG_PUSH(C++)
-AC_MSG_CHECKING(arts library)
-dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl)
-AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no)
-AC_LANG_POP(C++)
-
 dnl Check for libraw1394
 AC_MSG_CHECKING(raw1394 library)
 AC_CHECK_LIB(raw1394, raw1394_get_handle, HAVE_RAW1394=yes, HAVE_RAW1394=no, )
@@ -566,27 +595,39 @@ else
   HAVE_CSSAUTH="no"
 fi
 
-dnl Check for SDLlib
-AC_MSG_CHECKING(SDLlib)
-AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=yes, HAVE_LIBSDL=no, -L/usr/lib -L/usr/local/lib -lpthread)
-AC_CHECK_HEADER(SDL/SDL.h, :, HAVE_LIBSDL=no)
- 
-dnl Check for SDL
-HAVE_LIBSDL="no"
-AC_MSG_CHECKING(for SDL)
+dnl Check for SDL library
+AC_MSG_CHECKING(SDL library)
+HAVE_LIBSDL=yes
 if sdl-config --libs > /dev/null 2>&1; then
-  HAVE_LIBSDL="yes"
-  AC_MSG_RESULT(found)
+  SDL_VERSION=`sdl-config --version`
+  AC_MSG_RESULT([found (version $SDL_VERSION)])
+  SDL_LIBS="`sdl-config --libs`"
+  SDL_CFLAGS="`sdl-config --cflags`"
+  AC_CHECK_LIB(SDL, SDL_Init, :, HAVE_LIBSDL=no, $SDL_LIBS)
+  dnl FIXME: CPPFLAGS should be set from SDL_CFLAGS for the next check
+  dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.
+  dnl Assume only suitable flags result from artsc-config --cflags
+  CPPFLAGS="$sdlcheck_save_CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+  AC_CHECK_HEADER(SDL.h, :, HAVE_LIBSDL=no)
+  sdlcheck_save_CPPFLAGS="$CPPFLAGS"
+  AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, :, HAVE_LIBSDL=no, $SDL_LIBS)
 else
   AC_MSG_RESULT(not found)
+  HAVE_LIBSDL=no
+  SDL_LIBS=
+  SDL_CFLAGS=
 fi
-
-SDL_LIBS="`sdl-config --libs`"
-SDL_CFLAGS="`sdl-config --cflags`"
- 
 AC_SUBST(SDL_LIBS)
 AC_SUBST(SDL_CFLAGS)
 
+if test "x$HAVE_LIBSDL" == "xno"; then
+  AC_MSG_WARN(
+***** NOTE: These plugins won't be built: sdlvideosink
+)
+fi
+
+
 dnl Check for linux/cdrom.h
 AC_CHECK_HEADER(linux/cdrom.h,
   HAVE_LINUX_CDROM=yes, HAVE_LINUX_CDROM=no
@@ -667,7 +708,7 @@ esac],
 [USE_DEBUG_VERBOSE=no]) dnl Default value
 
 AC_ARG_ENABLE(info,
-[  --enable-info                spews lots of info at runtime for plugin writers],
+[  --enable-info                turns verbose info at runtime on by default],
 [case "${enableval}" in
   yes) USE_DEBUG_INFO_VERBOSE=yes ;;
   no)  USE_DEBUG_INFO_VERBOSE=no ;;
@@ -676,7 +717,7 @@ esac],
 [USE_DEBUG_INFO_VERBOSE=no]) dnl Default value
 
 AC_ARG_ENABLE(info-system,
-[  --disable-info-system        disables the info debugging system],
+[  --disable-info-system        entirely disables the info debugging system],
 [case "${enableval}" in
   yes) DISABLE_DEBUG_INFO=no ;;
   no)  DISABLE_DEBUG_INFO=yes ;;
@@ -725,13 +766,13 @@ esac],
 [:]) dnl Default value
 
 AC_ARG_ENABLE(docs-build,
-[  --disable-docs-build         disable all building of documentation],
+[  --enable-docs-build          enable building of documentation],
 [case "${enableval}" in
   yes) BUILD_DOCS=yes ;;
   no)  BUILD_DOCS=no ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs-build) ;;
 esac], 
-[BUILD_DOCS=yes]) dnl Default value
+[BUILD_DOCS=no]) dnl Default value
 
 AC_ARG_ENABLE(plugin-docs,
 [  --enable-plugin-docs         enable the building of plugin documentation
@@ -743,7 +784,23 @@ AC_ARG_ENABLE(plugin-docs,
 esac], 
 [BUILD_PLUGIN_DOCS=no]) dnl Default value
 
+AC_ARG_ENABLE(tests,
+[  --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,
+[  --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 ################################################
@@ -754,23 +811,23 @@ 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
 if test "x$USE_GDK_PIXBUF" = xyes; then
-  AC_DEFINE(HAVE_GDK_PIXBUF)
+  AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Define if GDK pixbuf library is available])
 fi
 
 if test "x$USE_LIBGHTTP" = xyes; then
-  AC_DEFINE(HAVE_LIBGHTTP)
+  AC_DEFINE(HAVE_LIBGHTTP, 1, [Define if ghttp library is available])
 fi
 
 if test "x$USE_LIBMMX" = xyes; then
-  AC_DEFINE(HAVE_LIBMMX)
+  AC_DEFINE(HAVE_LIBMMX, 1, [Define if libmmx is available])
 fi
 
 if test "x$USE_ATOMIC_H" = xyes; then
-  AC_DEFINE(HAVE_ATOMIC_H)
+  AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
 fi
 
 if test "x$PLUGINS_USE_SRCDIR" = xyes; then
-  AC_DEFINE(PLUGINS_USE_SRCDIR)
+  AC_DEFINE(PLUGINS_USE_SRCDIR, 1, [Define if plugins should be loaded from the build tree - only developers should use this])
 fi
 
 if test "x$USE_DEBUG" = xyes; then
@@ -778,22 +835,18 @@ if test "x$USE_DEBUG" = xyes; then
 fi
 
 if test "x$USE_DEBUG_VERBOSE" = xyes; then
-  AC_DEFINE(GST_DEBUG_ENABLED)
+  AC_DEFINE(GST_DEBUG_ENABLED, 1, [Define if code to assist debugging should be compiled in])
 fi
 
-if test "x$USE_DEBUG_INFO_VERBOSE" = xyes; then
-  AC_DEFINE(GST_INFO_ENABLED_VERBOSE)
-  AC_DEFINE(GST_INFO_ENABLED)
-else
-  AC_DEFINE(GST_INFO_ENABLED)
-fi
-
-if test "x$DISABLE_DEBUG_INFO" = xyes; then
-  AC_DEFINE(GST_INFO_FORCE_DISABLE)
+if test "x$DISABLE_DEBUG_INFO" = xno; then
+  AC_DEFINE(GST_INFO_ENABLED, 1, [Define if code to produce informative messages should be compiled])
+  if test "x$USE_DEBUG_INFO_VERBOSE" = xyes; then
+    AC_DEFINE(GST_INFO_ENABLED_VERBOSE, 1, [Define if default should be to display all informative messages])
+  fi
 fi
 
 if test "x$DISABLE_DEBUG_COLOR" = xno; then
-  AC_DEFINE(GST_DEBUG_COLOR)
+  AC_DEFINE(GST_DEBUG_COLOR, 1, [Define if debugging messages should be colorised])
 fi
 
 if test "x$USE_PROFILING" = xyes; then
@@ -891,6 +944,8 @@ AM_CONDITIONAL(HAVE_GNOME,          test "x$HAVE_GNOME" = "xyes")
 AM_CONDITIONAL(HAVE_LIBXV,          test "x$HAVE_LIBXV" = "xyes")
 AM_CONDITIONAL(HAVE_GTK_DOC,        $HAVE_GTK_DOC)
 AM_CONDITIONAL(BUILD_DOCS,          test "x$BUILD_DOCS" = "xyes")
+AM_CONDITIONAL(BUILD_TESTS,         test "x$BUILD_TESTS" = "xyes")
+AM_CONDITIONAL(BUILD_EXAMPLES,      test "x$BUILD_EXAMPLES" = "xyes")
 AM_CONDITIONAL(BUILD_PLUGIN_DOCS,   test "x$BUILD_PLUGIN_DOCS" = "xyes")
 AM_CONDITIONAL(HAVE_DB2HTML,        $HAVE_DB2HTML)
 AM_CONDITIONAL(HAVE_DB2PS,          $HAVE_DB2PS)
@@ -957,9 +1012,6 @@ LIBS="$CORE_LIBS $LIBS"
 AC_SUBST(CORE_LIBS)
 AC_SUBST(CORE_CFLAGS)
 
-dnl FIXME: having to AC_SUBST these is messy.  Not sure if CPPFLAGS and LDFLAGS
-dnl need it, either.
-
 dnl Vars for everyone else
 GST_LIBS="\$(top_builddir)/gst/libgst.la"
 GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
@@ -974,11 +1026,20 @@ AC_SUBST(LIBGST_CFLAGS)
 
 dnl CFLAGS for everyone else
 CFLAGS="$CFLAGS $GST_CFLAGS"
+
+dnl Needed to make automake 1.4g happy.
+dnl FIXME: find as properly, rather than just using CC
+AS="\$(CC)"
+
+dnl Having to AC_SUBST these is messy, but doesn't seem to do any harm.
+dnl I'm not sure whether it's really necessary, but it removes some warnings
+dnl when automake 1.4g runs, and may be beneficial elsewhere.
 AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
-
-dnl AC_SUBST(CPPFLAGS)
-dnl AC_SUBST(LDFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
 
 
 dnl #############################
@@ -988,6 +1049,24 @@ dnl #############################
 dnl AC_CONFIG_SUBDIRS(gist)
 dnl AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing)
 
+dnl ##################################################
+dnl # Prepare informative messages to display at end #
+dnl ##################################################
+
+infomessages=
+
+if test "x$PLUGINS_USE_SRCDIR" = xyes; then
+  infomessages="$infomessages
+*** Warning: You have configured using the --enable-plugin-srcdir option.
+
+This option is for development purposes only: binaries built with
+it should be used with code in the build tree only.  To build an
+installable version, use ./configure without the --enable-plugin-srcdir
+option.  Note that the autogen.sh script supplies the plugin srcdir
+option automatically - it cannot be used to configure installable builds.
+
+"
+fi
 
 dnl #########################
 dnl # Make the output files #
@@ -1010,6 +1089,7 @@ libs/getbits/Makefile
 libs/putbits/Makefile
 libs/winloader/Makefile
 libs/idct/Makefile
+libs/audio/Makefile
 plugins/Makefile
 plugins/aasink/Makefile
 plugins/alsa/Makefile
@@ -1018,6 +1098,7 @@ plugins/audiofile/Makefile
 plugins/audioscale/Makefile
 plugins/avi/Makefile
 plugins/avi/wincodec/Makefile
+plugins/avi/winaudio/Makefile
 plugins/flx/Makefile
 plugins/jpeg/Makefile
 plugins/mp3decode/Makefile
@@ -1064,6 +1145,8 @@ plugins/filters/adder/Makefile
 plugins/filters/colorspace/Makefile
 plugins/filters/volenv/Makefile
 plugins/filters/level/Makefile
+plugins/filters/lav/Makefile
+plugins/filters/cutter/Makefile
 plugins/gnomevfs/Makefile
 plugins/icecast/Makefile
 plugins/icecast/icecastsend/Makefile
@@ -1141,4 +1224,5 @@ gstreamer.pc
 gstreamer-uninstalled.pc
 gstreamer.spec,
 chmod +x gstreamer-config
+echo "$infomessages"
 )
diff --git a/configure.in b/configure.in
index 5f13a14716..a813ebbf13 100644
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,4 @@
+dnl Note: this file is generated from configure.base by autogen.sh
 AC_INIT(gst/gstobject.h)
 
 AC_CANONICAL_SYSTEM
@@ -74,7 +75,7 @@ if test x$NASM_PATH = xno; then
   AC_MSG_WARN(Couldn't find nasm)
   HAVE_NASM="no"
 else
-  AC_DEFINE(HAVE_NASM)
+  AC_DEFINE(HAVE_NASM, 1, [Define if NASM, the netwide assembler, is available])
   HAVE_NASM="yes"
 fi
 
@@ -119,7 +120,7 @@ dnl ==============================================
 dnl Determine CPU
 case "x${target_cpu}" in
   xi?86 | k?) HAVE_CPU_I386=yes
-              AC_DEFINE(HAVE_CPU_I386)
+              AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86])
               dnl FIXME could use some better detection
               dnl       (ie CPUID)
               case "x${target_cpu}" in
@@ -127,13 +128,13 @@ case "x${target_cpu}" in
                 *)             AC_DEFINE(HAVE_RDTSC) ;;
               esac ;;
   xpowerpc)   HAVE_CPU_PPC=yes
-              AC_DEFINE(HAVE_CPU_PPC) ;;
+              AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the target CPU is a PPC]) ;;
   xalpha)     HAVE_CPU_ALPHA=yes
-              AC_DEFINE(HAVE_CPU_ALPHA) ;;
+              AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the target CPU is an Alpha]) ;;
   xarm*)      HAVE_CPU_ARM=yes
-              AC_DEFINE(HAVE_CPU_ARM) ;;
+              AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the target CPU is an ARM]) ;;
   xsparc*)    HAVE_CPU_SPARC=yes
-              AC_DEFINE(HAVE_CPU_SPARC) ;;
+              AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a PPC]) ;;
 esac
 
 dnl Determine endianness
@@ -164,21 +165,11 @@ dnl Check for essential libraries first:
 dnl ====================================
 
 
-dnl Check for glib
-AM_PATH_GLIB(1.2.0,,
-            AC_MSG_ERROR(Cannot find glib: Is glib-config in path?),
-            glib gmodule gthread)
-dnl Put the glib flags into $LIBS and $CFLAGS since we always use them
+PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0, , AC_MSG_ERROR(Cannot find glib-2.0))
 CORE_LIBS="$GLIB_LIBS"
 CORE_CFLAGS="$GLIB_CFLAGS"
-
-
-dnl Check for gtk
-AM_PATH_GTK(1.2.0,,
-            AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
-dnl Put the gtk flags into $LIBS and $CFLAGS since we always use them
-CORE_LIBS="$CORE_LIBS $GTK_LIBS"
-CORE_CFLAGS="$CORE_CFLAGS $GTK_CFLAGS"
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
 
 
 dnl Check for libxml
@@ -230,10 +221,7 @@ else
   dnl Assume only suitable flags result from artsc-config --cflags
   artsc_save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $ARTSC_CFLAGS"
-  AC_CHECK_HEADER(artsc.h,
-		  HAVE_ARTSC=yes,
-		  HAVE_ARTSC=no
-  )
+  AC_CHECK_HEADER(artsc.h, HAVE_ARTSC=yes, HAVE_ARTSC=no)
   CPPFLAGS=$artsc_save_CPPFLAGS
 fi
 AC_SUBST(ARTSC_LIBS)
@@ -247,19 +235,65 @@ AC_ARG_ENABLE(artsd,
 	esac],
 [:])
 
+
+dnl Check for arts
+AC_MSG_CHECKING(arts library)
+
+dnl Set the flags
+ARTS_LIBS="-L/usr/local/lib -L/usr/lib -lmcop -lartsflow -lartsflow_idl"
+ARTS_CFLAGS="-I/usr/local/include/arts -I/usr/include/kde/arts -I/usr/include/arts"
+ARTS_MCOPFLAGS=$ARTS_CFLAGS
+dnl There's no arts-config script, so we make a guess based on the artsc-config
+if test x$ARTSC_CONFIG = xyes; then
+  ARTS_ARTSC_CFLAGS=`artsc-config --cflags | sed 's/artsc/arts/g'`
+  ARTS_CFLAGS="$ARTS_CFLAGS $ARTS_ARTSC_CFLAGS"
+  ARTS_MCOPFLAGS="$ARTS_MCOPFLAGS $ARTS_ARTSC_CFLAGS"
+fi
+AC_SUBST(ARTS_LIBS)
+AC_SUBST(ARTS_CFLAGS)
+AC_SUBST(ARTS_MCOPFLAGS)
+dnl Now check if it exists
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+HAVE_ARTS=yes
+dnl FIXME: Can't get this test to pass, so commented it out.  Rely on header check.
+dnl AC_CHECK_LIB(artsflow, convert_stereo_2float_i16le, :, HAVE_ARTS=no, $LIBS)
+
+dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.
+dnl Assume only suitable flags result from artsc-config --cflags
+arts_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $ARTS_CFLAGS"
+AC_CHECK_HEADER(artsflow.h, :, HAVE_ARTS=no)
+CPPFLAGS=$arts_save_CPPFLAGS
+
+AC_LANG_RESTORE
+dnl Check for the idl generator
+AC_CHECK_PROG(HAVE_MCOPIDL, mcopidl, yes, no)
+if test x$HAVE_MCOPIDL = xno; then
+  HAVE_ARTS=no
+fi
+
+
 dnl AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
 
 
 dnl Check for libasound
 alsa_save_LIBS=$LIBS
 alsa_save_CFLAGS=$CFLAGS
-AM_PATH_ALSA(0.5.0, HAVE_LIBASOUND=yes, HAVE_LIBASOUND=no)
-AM_PATH_ALSA(0.9.0,
+AM_PATH_ALSA(0.5.0,
+  HAVE_LIBASOUND=yes,
   HAVE_LIBASOUND=no
-  AC_MSG_WARN(Alsa 0.9.x not yet supported.
+  AC_MSG_WARN(
+***** NOTE: These plugins won't be built: gstalsa
+))
+if test x$HAVE_LIBASOUND = xyes;then
+  AM_PATH_ALSA(0.9.0,
+    HAVE_LIBASOUND=no
+    AC_MSG_WARN(Alsa 0.9.x not yet supported.
 ***** NOTE: These plugins won't be built: gstalsa
 )
-  ,:)
+    ,:)
+fi
 
 LIBS=$alsa_save_LIBS
 CFLAGS=$alsa_save_CFLAGS
@@ -426,7 +460,7 @@ AC_CHECK_HEADER(sys/soundcard.h, HAVE_OSS=yes, HAVE_OSS=no)
 
 dnl Check for xaudio
 AC_CHECK_HEADER(xaudio/decoder.h,
-  AC_DEFINE(HAVE_XAUDIO)
+  AC_DEFINE(HAVE_XAUDIO, 1, [Define if xaudio is available])
   HAVE_XAUDIO="yes",
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: gstxa
@@ -438,7 +472,7 @@ dnl Check for libmad
 AC_MSG_CHECKING(MAD library)
 AC_CHECK_LIB(mad, mad_decoder_finish,
   HAVE_LIBMAD=yes
-  AC_DEFINE(HAVE_LIBMAD),
+  AC_DEFINE(HAVE_LIBMAD, 1, [Define if libmad is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: mad
 )
@@ -449,7 +483,7 @@ dnl Check for libvorbis
 AC_MSG_CHECKING(Vorbis library)
 AC_CHECK_LIB(vorbis, ogg_sync_init,
   HAVE_VORBIS=yes
-  AC_DEFINE(HAVE_VORBIS),
+  AC_DEFINE(HAVE_VORBIS, 1, [Define if vorbis library is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: vorbisdec vorbisenc
 )
@@ -460,7 +494,7 @@ dnl Check for libjpeg
 AC_MSG_CHECKING(libjpeg library)
 AC_CHECK_LIB(jpeg, jpeg_set_defaults,
   HAVE_LIBJPEG=yes
-  AC_DEFINE(HAVE_LIBJPEG),
+  AC_DEFINE(HAVE_LIBJPEG, 1, [Define if libjpeg is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: jpegdec jpegenc
 )
@@ -471,7 +505,7 @@ dnl Check for libHermes
 AC_MSG_CHECKING(Hermes library)
 AC_CHECK_LIB(Hermes, Hermes_ConverterInstance,
   HAVE_LIBHERMES=yes
-  AC_DEFINE(HAVE_LIBHERMES),
+  AC_DEFINE(HAVE_LIBHERMES, 1, [Define if Hermes library is available]),
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: colorspace
 )
@@ -481,15 +515,23 @@ AC_CHECK_HEADER(Hermes/Hermes.h, :, HAVE_LIBHERMES=no)
 
 dnl Check for libgsm
 AC_MSG_CHECKING(GSM library)
-AC_CHECK_LIB(gsm, gsm_create,
-  HAVE_LIBGSM=yes
-  AC_DEFINE(HAVE_LIBGSM),
+AC_CHECK_LIB(gsm, gsm_create, HAVE_LIBGSM=yes, HAVE_LIBGSM=no,)
+GSM_CFLAGS=
+GSM_LIBS=-lgsm
+AC_CHECK_HEADER(gsm.h, :, 
+  GSM_CFLAGS="$GSM_CFLAGS -DGSM_HEADER_IN_SUBDIR"
+  AC_CHECK_HEADER(gsm/gsm.h, :, HAVE_LIBGSM=no)
+)
+AC_SUBST(GSM_CFLAGS)
+AC_SUBST(GSM_LIBS)
+
+if test "x$HAVE_LIBGSM" == "xyes"; then
+  AC_DEFINE(HAVE_LIBGSM, 1, [Define if GSM library is available])
+else
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: gsmdec, gsmenc
 )
-  HAVE_LIBGSM=no,
-)
-AC_CHECK_HEADER(gsm/gsm.h, :, HAVE_LIBGSM=no)
+fi
 
 dnl Check for cdparanoia
 AC_MSG_CHECKING(CDparanoia library)
@@ -521,14 +563,6 @@ AC_CHECK_HEADER(rtp/rtp-packet.h, :, HAVE_LIBRTP=no)
 AC_CHECK_HEADER(rtp/rtcp-packet.h, :, HAVE_LIBRTP=no)
 AC_CHECK_HEADER(rtp/rtp-audio.h, :, HAVE_LIBRTP=no)
 
-dnl Check for arts
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING(arts library)
-dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl)
-dnl AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no)
-AC_LANG_RESTORE
-
 dnl Check for libraw1394
 AC_MSG_CHECKING(raw1394 library)
 AC_CHECK_LIB(raw1394, raw1394_get_handle, HAVE_RAW1394=yes, HAVE_RAW1394=no, )
@@ -561,27 +595,39 @@ else
   HAVE_CSSAUTH="no"
 fi
 
-dnl Check for SDLlib
-AC_MSG_CHECKING(SDLlib)
-AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=yes, HAVE_LIBSDL=no, -L/usr/lib -L/usr/local/lib -lpthread)
-AC_CHECK_HEADER(SDL/SDL.h, :, HAVE_LIBSDL=no)
- 
-dnl Check for SDL
-HAVE_LIBSDL="no"
-AC_MSG_CHECKING(for SDL)
+dnl Check for SDL library
+AC_MSG_CHECKING(SDL library)
+HAVE_LIBSDL=yes
 if sdl-config --libs > /dev/null 2>&1; then
-  HAVE_LIBSDL="yes"
-  AC_MSG_RESULT(found)
+  SDL_VERSION=`sdl-config --version`
+  AC_MSG_RESULT([found (version $SDL_VERSION)])
+  SDL_LIBS="`sdl-config --libs`"
+  SDL_CFLAGS="`sdl-config --cflags`"
+  AC_CHECK_LIB(SDL, SDL_Init, :, HAVE_LIBSDL=no, $SDL_LIBS)
+  dnl FIXME: CPPFLAGS should be set from SDL_CFLAGS for the next check
+  dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.
+  dnl Assume only suitable flags result from artsc-config --cflags
+  CPPFLAGS="$sdlcheck_save_CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+  AC_CHECK_HEADER(SDL.h, :, HAVE_LIBSDL=no)
+  sdlcheck_save_CPPFLAGS="$CPPFLAGS"
+  AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, :, HAVE_LIBSDL=no, $SDL_LIBS)
 else
   AC_MSG_RESULT(not found)
+  HAVE_LIBSDL=no
+  SDL_LIBS=
+  SDL_CFLAGS=
 fi
-
-SDL_LIBS="`sdl-config --libs`"
-SDL_CFLAGS="`sdl-config --cflags`"
- 
 AC_SUBST(SDL_LIBS)
 AC_SUBST(SDL_CFLAGS)
 
+if test "x$HAVE_LIBSDL" == "xno"; then
+  AC_MSG_WARN(
+***** NOTE: These plugins won't be built: sdlvideosink
+)
+fi
+
+
 dnl Check for linux/cdrom.h
 AC_CHECK_HEADER(linux/cdrom.h,
   HAVE_LINUX_CDROM=yes, HAVE_LINUX_CDROM=no
@@ -662,7 +708,7 @@ esac],
 [USE_DEBUG_VERBOSE=no]) dnl Default value
 
 AC_ARG_ENABLE(info,
-[  --enable-info                spews lots of info at runtime for plugin writers],
+[  --enable-info                turns verbose info at runtime on by default],
 [case "${enableval}" in
   yes) USE_DEBUG_INFO_VERBOSE=yes ;;
   no)  USE_DEBUG_INFO_VERBOSE=no ;;
@@ -671,7 +717,7 @@ esac],
 [USE_DEBUG_INFO_VERBOSE=no]) dnl Default value
 
 AC_ARG_ENABLE(info-system,
-[  --disable-info-system        disables the info debugging system],
+[  --disable-info-system        entirely disables the info debugging system],
 [case "${enableval}" in
   yes) DISABLE_DEBUG_INFO=no ;;
   no)  DISABLE_DEBUG_INFO=yes ;;
@@ -720,7 +766,7 @@ esac],
 [:]) dnl Default value
 
 AC_ARG_ENABLE(docs-build,
-[  --enable-docs-build           enable building of documentation],
+[  --enable-docs-build          enable building of documentation],
 [case "${enableval}" in
   yes) BUILD_DOCS=yes ;;
   no)  BUILD_DOCS=no ;;
@@ -738,7 +784,23 @@ AC_ARG_ENABLE(plugin-docs,
 esac], 
 [BUILD_PLUGIN_DOCS=no]) dnl Default value
 
+AC_ARG_ENABLE(tests,
+[  --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,
+[  --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 ################################################
@@ -749,23 +811,23 @@ 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
 if test "x$USE_GDK_PIXBUF" = xyes; then
-  AC_DEFINE(HAVE_GDK_PIXBUF)
+  AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Define if GDK pixbuf library is available])
 fi
 
 if test "x$USE_LIBGHTTP" = xyes; then
-  AC_DEFINE(HAVE_LIBGHTTP)
+  AC_DEFINE(HAVE_LIBGHTTP, 1, [Define if ghttp library is available])
 fi
 
 if test "x$USE_LIBMMX" = xyes; then
-  AC_DEFINE(HAVE_LIBMMX)
+  AC_DEFINE(HAVE_LIBMMX, 1, [Define if libmmx is available])
 fi
 
 if test "x$USE_ATOMIC_H" = xyes; then
-  AC_DEFINE(HAVE_ATOMIC_H)
+  AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
 fi
 
 if test "x$PLUGINS_USE_SRCDIR" = xyes; then
-  AC_DEFINE(PLUGINS_USE_SRCDIR)
+  AC_DEFINE(PLUGINS_USE_SRCDIR, 1, [Define if plugins should be loaded from the build tree - only developers should use this])
 fi
 
 if test "x$USE_DEBUG" = xyes; then
@@ -773,22 +835,18 @@ if test "x$USE_DEBUG" = xyes; then
 fi
 
 if test "x$USE_DEBUG_VERBOSE" = xyes; then
-  AC_DEFINE(GST_DEBUG_ENABLED)
+  AC_DEFINE(GST_DEBUG_ENABLED, 1, [Define if code to assist debugging should be compiled in])
 fi
 
-if test "x$USE_DEBUG_INFO_VERBOSE" = xyes; then
-  AC_DEFINE(GST_INFO_ENABLED_VERBOSE)
-  AC_DEFINE(GST_INFO_ENABLED)
-else
-  AC_DEFINE(GST_INFO_ENABLED)
-fi
-
-if test "x$DISABLE_DEBUG_INFO" = xyes; then
-  AC_DEFINE(GST_INFO_FORCE_DISABLE)
+if test "x$DISABLE_DEBUG_INFO" = xno; then
+  AC_DEFINE(GST_INFO_ENABLED, 1, [Define if code to produce informative messages should be compiled])
+  if test "x$USE_DEBUG_INFO_VERBOSE" = xyes; then
+    AC_DEFINE(GST_INFO_ENABLED_VERBOSE, 1, [Define if default should be to display all informative messages])
+  fi
 fi
 
 if test "x$DISABLE_DEBUG_COLOR" = xno; then
-  AC_DEFINE(GST_DEBUG_COLOR)
+  AC_DEFINE(GST_DEBUG_COLOR, 1, [Define if debugging messages should be colorised])
 fi
 
 if test "x$USE_PROFILING" = xyes; then
@@ -886,6 +944,8 @@ AM_CONDITIONAL(HAVE_GNOME,          test "x$HAVE_GNOME" = "xyes")
 AM_CONDITIONAL(HAVE_LIBXV,          test "x$HAVE_LIBXV" = "xyes")
 AM_CONDITIONAL(HAVE_GTK_DOC,        $HAVE_GTK_DOC)
 AM_CONDITIONAL(BUILD_DOCS,          test "x$BUILD_DOCS" = "xyes")
+AM_CONDITIONAL(BUILD_TESTS,         test "x$BUILD_TESTS" = "xyes")
+AM_CONDITIONAL(BUILD_EXAMPLES,      test "x$BUILD_EXAMPLES" = "xyes")
 AM_CONDITIONAL(BUILD_PLUGIN_DOCS,   test "x$BUILD_PLUGIN_DOCS" = "xyes")
 AM_CONDITIONAL(HAVE_DB2HTML,        $HAVE_DB2HTML)
 AM_CONDITIONAL(HAVE_DB2PS,          $HAVE_DB2PS)
@@ -952,9 +1012,6 @@ LIBS="$CORE_LIBS $LIBS"
 AC_SUBST(CORE_LIBS)
 AC_SUBST(CORE_CFLAGS)
 
-dnl FIXME: having to AC_SUBST these is messy.  Not sure if CPPFLAGS and LDFLAGS
-dnl need it, either.
-
 dnl Vars for everyone else
 GST_LIBS="\$(top_builddir)/gst/libgst.la"
 GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
@@ -969,11 +1026,20 @@ AC_SUBST(LIBGST_CFLAGS)
 
 dnl CFLAGS for everyone else
 CFLAGS="$CFLAGS $GST_CFLAGS"
+
+dnl Needed to make automake 1.4g happy.
+dnl FIXME: find as properly, rather than just using CC
+AS="\$(CC)"
+
+dnl Having to AC_SUBST these is messy, but doesn't seem to do any harm.
+dnl I'm not sure whether it's really necessary, but it removes some warnings
+dnl when automake 1.4g runs, and may be beneficial elsewhere.
 AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
-
-dnl AC_SUBST(CPPFLAGS)
-dnl AC_SUBST(LDFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
 
 
 dnl #############################
@@ -983,6 +1049,24 @@ dnl #############################
 dnl AC_CONFIG_SUBDIRS(gist)
 dnl AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing)
 
+dnl ##################################################
+dnl # Prepare informative messages to display at end #
+dnl ##################################################
+
+infomessages=
+
+if test "x$PLUGINS_USE_SRCDIR" = xyes; then
+  infomessages="$infomessages
+*** Warning: You have configured using the --enable-plugin-srcdir option.
+
+This option is for development purposes only: binaries built with
+it should be used with code in the build tree only.  To build an
+installable version, use ./configure without the --enable-plugin-srcdir
+option.  Note that the autogen.sh script supplies the plugin srcdir
+option automatically - it cannot be used to configure installable builds.
+
+"
+fi
 
 dnl #########################
 dnl # Make the output files #
@@ -1004,6 +1088,7 @@ libs/getbits/Makefile
 libs/putbits/Makefile
 libs/winloader/Makefile
 libs/idct/Makefile
+libs/audio/Makefile
 plugins/Makefile
 plugins/aasink/Makefile
 plugins/alsa/Makefile
@@ -1012,6 +1097,7 @@ plugins/audiofile/Makefile
 plugins/audioscale/Makefile
 plugins/avi/Makefile
 plugins/avi/wincodec/Makefile
+plugins/avi/winaudio/Makefile
 plugins/flx/Makefile
 plugins/jpeg/Makefile
 plugins/mp3decode/Makefile
@@ -1058,6 +1144,8 @@ plugins/filters/adder/Makefile
 plugins/filters/colorspace/Makefile
 plugins/filters/volenv/Makefile
 plugins/filters/level/Makefile
+plugins/filters/lav/Makefile
+plugins/filters/cutter/Makefile
 plugins/gnomevfs/Makefile
 plugins/icecast/Makefile
 plugins/icecast/icecastsend/Makefile
@@ -1134,4 +1222,5 @@ gstreamer-config
 gstreamer.pc
 gstreamer-uninstalled.pc
 gstreamer.spec])
-AC_OUTPUT_COMMANDS([chmod +x gstreamer-config])
+AC_OUTPUT_COMMANDS([chmod +x gstreamer-config;
+echo "$infomessages"])
diff --git a/gst/autoplug/autoplugtest.c b/gst/autoplug/autoplugtest.c
index c334ea6b83..41b5e80af3 100644
--- a/gst/autoplug/autoplugtest.c
+++ b/gst/autoplug/autoplugtest.c
@@ -73,9 +73,9 @@ int main (int argc,char *argv[]) {
 
   autobin = gst_bin_new("autobin");
   cache = gst_elementfactory_make ("autoplugcache","cache");
-  g_signal_connectc (G_OBJECT(cache),"cache_empty",cache_empty,NULL,FALSE);
+  g_signal_connectc (G_OBJECT(cache),"cache_empty",(GCallback)cache_empty,NULL,FALSE);
   typefind = gst_elementfactory_make ("typefind", "typefind");
-  g_signal_connectc (G_OBJECT(typefind),"have_type",have_type,&caps,FALSE);
+  g_signal_connectc (G_OBJECT(typefind),"have_type",(GCallback)have_type,&caps,FALSE);
   gst_bin_add (GST_BIN(autobin),cache);
   gst_bin_add (GST_BIN(autobin),typefind);
   gst_element_connect(cache,"src",typefind,"sink");
diff --git a/gst/gst.c b/gst/gst.c
index 99b4b533b6..dbfa78ba0e 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -57,7 +57,7 @@ void
 gst_init (int *argc, char **argv[]) 
 {
   GstTrace *gst_trace;
-  gchar *display;
+//  gchar *display;
 
   GST_INFO (GST_CAT_GST_INIT, "Initializing GStreamer Core Library");
 
@@ -222,7 +222,7 @@ gst_init_check (int     *argc,
 
   /* check for ENV variables */
   {
-    gchar *plugin_path = g_getenv("GST_PLUGIN_PATH");
+    const gchar *plugin_path = g_getenv("GST_PLUGIN_PATH");
     gst_add_paths_func (plugin_path);
   }
 
diff --git a/gst/gstmarshal.c b/gst/gstmarshal.c
index 9e1e53f94b..c17898ef8b 100644
--- a/gst/gstmarshal.c
+++ b/gst/gstmarshal.c
@@ -1,6 +1,6 @@
 #include <glib-object.h>
 
-/* VOID:OBJECT,POINTER (./gstmarshal.list:1) */
+/* VOID:OBJECT,POINTER (gstmarshal.list:1) */
 void
 gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
                                   GValue       *return_value,
@@ -37,3 +37,40 @@ gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
             data2);
 }
 
+/* VOID:INT,INT (gstmarshal.list:2) */
+void
+gst_marshal_VOID__INT_INT (GClosure     *closure,
+                           GValue       *return_value,
+                           guint         n_param_values,
+                           const GValue *param_values,
+                           gpointer      invocation_hint,
+                           gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer     data1,
+                                              gint         arg_1,
+                                              gint         arg_2,
+                                              gpointer     data2);
+  register GMarshalFunc_VOID__INT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_value_get_int (param_values + 1),
+            g_value_get_int (param_values + 2),
+            data2);
+}
+
diff --git a/gst/gstmarshal.h b/gst/gstmarshal.h
index f57cfbb0ea..e74c90387e 100644
--- a/gst/gstmarshal.h
+++ b/gst/gstmarshal.h
@@ -1,11 +1,9 @@
-#ifndef __GST_MARSHAL_H__
-#define __GST_MARSHAL_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* VOID:OBJECT,POINTER (./gstmarshal.list:1) */
+/* VOID:OBJECT,POINTER (gstmarshal.list:1) */
 extern void gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -13,8 +11,15 @@ extern void gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
+/* VOID:INT,INT (gstmarshal.list:2) */
+extern void gst_marshal_VOID__INT_INT (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif // __GST_MARSHAL_H__