gst-plugin: use minimal configure.ac

Get rid of all the custom GStreamer autogen.sh and configure.ac
cruft, turn configure.ac into a minimal example, so people have
a chance to make sense of it. Use autoreconf in autogen.sh.

Might fix #605562 as a side-effect.

9 files changed, 103 insertions, 614 deletions

diff --git a/gst-plugin/.gitignore b/gst-plugin/.gitignore
index 0e9b070..b864463 100644
--- a/gst-plugin/.gitignore
+++ b/gst-plugin/.gitignore
@@ -1,9 +1,16 @@
 aclocal.m4
 autom4te.cache
 autoregen.sh
-config.log
-config.status
+config.*
 configure
 libtool
+INSTALL
+Makefile.in
+depcomp
+install-sh
+ltmain.sh
+missing
+stamp-*
+my-plugin-*.tar.*
+*~
 
-gst-plugin-*.tar.*
diff --git a/gst-plugin/Makefile.am b/gst-plugin/Makefile.am
index 7203ad8..5ff2f58 100644
--- a/gst-plugin/Makefile.am
+++ b/gst-plugin/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = m4 src
+SUBDIRS = src
 
-EXTRA_DIST = autogen.sh gst-autogen.sh
+EXTRA_DIST = autogen.sh
diff --git a/gst-plugin/autogen.sh b/gst-plugin/autogen.sh
index 9d84a03..9df38d3 100755
--- a/gst-plugin/autogen.sh
+++ b/gst-plugin/autogen.sh
@@ -1,91 +1,18 @@
 #!/bin/sh
-# you can either set the environment variables AUTOCONF and AUTOMAKE
-# to the right versions, or leave them unset and get the RedHat 7.3 defaults
+# you can either set the environment variables AUTOCONF, AUTOHEADER, AUTOMAKE,
+# ACLOCAL, AUTOPOINT and/or LIBTOOLIZE to the right versions, or leave them
+# unset and get the defaults
 
-DIE=0
-package=gst-plugin
-srcfile=src/main.c
-
-# autogen.sh helper functions (copied from GStreamer's common/ CVS module)
-if test ! -f ./gst-autogen.sh;
-then
-  echo There is something wrong with your source tree.
-  echo You are either missing ./gst-autogen.sh or not
-  echo running autogen.sh from the top-level source
-  echo directory.
-  exit 1
-fi
-. ./gst-autogen.sh
-
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-debug'
-
-autogen_options $@
-
-echo -n "+ check for build tools"
-if test ! -z "$NOCHECK"; then echo " skipped"; else  echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf259 autoconf257 autoconf-2.54 autoconf-2.53 autoconf-2.52" \
-              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 automake-1.7 automake-1.6 automake-1.5" \
-              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
-###version_check "autopoint" "autopoint" \
-###              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
-version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
-              "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
-version_check "pkg-config" "" \
-              "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
-
-die_check $DIE
-
-autoconf_2_52d_check || DIE=1
-aclocal_check || DIE=1
-autoheader_check || DIE=1
-
-die_check $DIE
-
-# if no arguments specified then this will be printed
-if test -z "$*"; 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
-
-tool_run "$aclocal" "-I m4/ $ACLOCAL_FLAGS"
-tool_run "$libtoolize" "--copy --force"
-tool_run "$autoheader"
-tool_run "$autoconf"
-tool_run "$automake" "-a -c"
-
-# if enable exists, add an -enable option for each of the lines in that file
-if test -f enable; then
-  for a in `cat enable`; do
-    CONFIGURE_FILE_OPT="--enable-$a"
-  done
-fi
-
-# if disable exists, add an -disable option for each of the lines in that file
-if test -f disable; then
-  for a in `cat disable`; do
-    CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
-  done
-fi
-
-test -n "$NOCONFIGURE" && {
-  echo "+ skipping configure stage for package $package, as requested."
-  echo "+ autogen.sh done."
-  exit 0
+autoreconf --verbose --force --install --make || {
+ echo 'autogen.sh failed';
+ exit 1;
 }
 
-echo "+ running configure ... "
-test ! -z "$CONFIGURE_DEF_OPT" && echo "  ./configure default flags: $CONFIGURE_DEF_OPT"
-test ! -z "$CONFIGURE_EXT_OPT" && echo "  ./configure external flags: $CONFIGURE_EXT_OPT"
-test ! -z "$CONFIGURE_FILE_OPT" && echo "  ./configure enable/disable flags: $CONFIGURE_FILE_OPT"
-echo
-
-./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || {
-        echo "  configure failed"
-        exit 1
+./configure || {
+ echo 'configure failed';
+ exit 1;
 }
 
-echo "Now type 'make' to compile $package."
+echo
+echo "Now type 'make' to compile this module."
+echo
diff --git a/gst-plugin/configure.ac b/gst-plugin/configure.ac
index c5c6885..ea85c18 100644
--- a/gst-plugin/configure.ac
+++ b/gst-plugin/configure.ac
@@ -1,125 +1,80 @@
-AC_INIT
+dnl required version of autoconf
+AC_PREREQ([2.53])
 
-dnl versions of gstreamer and plugins-base
-GST_MAJORMINOR=0.10
-GST_REQUIRED=0.10.0
-GSTPB_REQUIRED=0.10.0
+dnl TODO: fill in your package name and package version here
+AC_INIT([my-plugin-package],[0.10.0])
 
-dnl fill in your package name and version here
-dnl the fourth (nano) number should be 0 for a release, 1 for CVS,
-dnl and 2... for a prerelease
+dnl required versions of gstreamer and plugins-base
+GST_REQUIRED=0.10.16
+GSTPB_REQUIRED=0.10.16
 
-dnl when going to/from release please set the nano correctly !
-dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugin, GST_PLUGIN_VERSION, 0, 10, 0, 1,
-    GST_PLUGIN_CVS="no", GST_PLUGIN_CVS="yes")
+AC_CONFIG_SRCDIR([src/gstplugin.c])
+AC_CONFIG_HEADERS([config.h])
 
-dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
-AM_MAINTAINER_MODE
+dnl required version of automake
+AM_INIT_AUTOMAKE([1.10])
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+dnl enable mainainer mode by default
+AM_MAINTAINER_MODE([enable])
 
-dnl make aclocal work in maintainer mode
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-
-AM_CONFIG_HEADER(config.h)
-
-dnl check for tools
+dnl check for tools (compiler etc.)
 AC_PROG_CC
-AC_PROG_LIBTOOL
-
-
-dnl decide on error flags
-AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
-                                                                                
-if test "x$GST_WALL" = "xyes"; then
-   GST_ERROR="$GST_ERROR -Wall"
-                                                                                
-   if test "x$GST_PLUGIN_CVS" = "xyes"; then
-     AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
-   fi
-fi
-
-dnl Check for pkgconfig first
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-
-dnl Give error and exit if we don't have pkgconfig
-if test "x$HAVE_PKGCONFIG" = "xno"; then
-  AC_MSG_ERROR(you need to have pkgconfig installed !)
-fi
-
-dnl Now we're ready to ask for gstreamer libs and cflags
-dnl And we can also ask for the right version of gstreamer
-
-
-PKG_CHECK_MODULES(GST, \
-  gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED,
-  HAVE_GST=yes,HAVE_GST=no)
-
-dnl Give error and exit if we don't have gstreamer
-if test "x$HAVE_GST" = "xno"; then
-  AC_MSG_ERROR(you need gstreamer development packages installed !)
-fi
-
-dnl append GST_ERROR cflags to GST_CFLAGS
-GST_CFLAGS="$GST_CFLAGS $GST_ERROR"
-
-dnl make GST_CFLAGS and GST_LIBS available
-AC_SUBST(GST_CFLAGS)
-AC_SUBST(GST_LIBS)
-
-dnl make GST_MAJORMINOR available in Makefile.am
-AC_SUBST(GST_MAJORMINOR)
-
-dnl If we need them, we can also use the base class libraries
-PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED,
-                  HAVE_GST_BASE=yes, HAVE_GST_BASE=no)
-
-dnl Give a warning if we don't have gstreamer libs
-dnl you can turn this into an error if you need them
-if test "x$HAVE_GST_BASE" = "xno"; then
-  AC_MSG_NOTICE(no GStreamer base class libraries found (gstreamer-base-$GST_MAJORMINOR))
-fi
-
-dnl make _CFLAGS and _LIBS available
-AC_SUBST(GST_BASE_CFLAGS)
-AC_SUBST(GST_BASE_LIBS)
-
-dnl If we need them, we can also use the gstreamer-plugins-base libraries
-PKG_CHECK_MODULES(GSTPB_BASE,
-                  gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQUIRED,
-                  HAVE_GSTPB_BASE=yes, HAVE_GSTPB_BASE=no)
-
-dnl Give a warning if we don't have gstreamer libs
-dnl you can turn this into an error if you need them
-if test "x$HAVE_GSTPB_BASE" = "xno"; then
-  AC_MSG_NOTICE(no GStreamer Plugins Base libraries found (gstreamer-plugins-base-$GST_MAJORMINOR))
-fi
-
-dnl make _CFLAGS and _LIBS available
-AC_SUBST(GSTPB_BASE_CFLAGS)
-AC_SUBST(GSTPB_BASE_LIBS)
-
-dnl If we need them, we can also use the gstreamer-controller libraries
-PKG_CHECK_MODULES(GSTCTRL,
-                  gstreamer-controller-$GST_MAJORMINOR >= $GSTPB_REQUIRED,
-                  HAVE_GSTCTRL=yes, HAVE_GSTCTRL=no)
-
-dnl Give a warning if we don't have gstreamer-controller
-dnl you can turn this into an error if you need them
-if test "x$HAVE_GSTCTRL" = "xno"; then
-  AC_MSG_NOTICE(no GStreamer Controller libraries found (gstreamer-controller-$GST_MAJORMINOR))
-fi
-
-dnl make _CFLAGS and _LIBS available
-AC_SUBST(GSTCTRL_CFLAGS)
-AC_SUBST(GSTCTRL_LIBS)
 
-dnl set the plugindir where plugins should be installed
+dnl required version of libtool
+LT_PREREQ([2.2.6])
+LT_INIT
+
+dnl give error and exit if we don't have pkgconfig
+AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, [ ], [
+  AC_MSG_ERROR([You need to have pkg-config installed!])
+])
+
+dnl Check for the required version of GStreamer core (and gst-plugins-base)
+dnl This will export GST_CFLAGS and GST_LIBS variables for use in Makefile.am
+dnl
+dnl If you need libraries from gst-plugins-base here, also add:
+dnl for libgstaudio-0.10: gstreamer-audio-0.10 >= $GST_REQUIRED
+dnl for libgstvideo-0.10: gstreamer-video-0.10 >= $GST_REQUIRED
+dnl for libgsttag-0.10: gstreamer-tag-0.10 >= $GST_REQUIRED
+dnl for libgstpbutils-0.10: gstreamer-pbutils-0.10 >= $GST_REQUIRED
+dnl for libgstfft-0.10: gstreamer-fft-0.10 >= $GST_REQUIRED
+dnl for libgstinterfaces-0.10: gstreamer-interfaces-0.10 >= $GST_REQUIRED
+dnl for libgstrtp-0.10: gstreamer-rtp-0.10 >= $GST_REQUIRED
+dnl for libgstrtsp-0.10: gstreamer-rtsp-0.10 >= $GST_REQUIRED
+dnl etc.
+PKG_CHECK_MODULES(GST, [
+  gstreamer-0.10 >= $GST_REQUIRED
+  gstreamer-base-0.10 >= $GST_REQUIRED
+  gstreamer-controller-0.10 >= $GST_REQUIRED
+], [
+  AC_SUBST(GST_CFLAGS)
+  AC_SUBST(GST_LIBS)
+], [
+  AC_MSG_ERROR([
+      You need to install or upgrade the GStreamer development
+      packages on your system. On debian-based systems these are
+      libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev.
+      on RPM-based systems gstreamer0.10-devel, libgstreamer0.10-devel
+      or similar. The minimum version required is $GST_REQUIRED.
+  ])
+])
+
+dnl check if compiler understands -Wall (if yes, add -Wall to GST_CFLAGS)
+AC_MSG_CHECKING([to see if compiler understands -Wall])
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ ], [ ])], [
+  GST_CFLAGS="$GST_CFLAGS -Wall"
+  AC_MSG_RESULT([yes])
+], [
+  AC_MSG_RESULT([no])
+])
+
+dnl set the plugindir where plugins should be installed (for src/Makefile.am)
 if test "x${prefix}" = "x$HOME"; then
-  plugindir="$HOME/.gstreamer-$GST_MAJORMINOR/plugins"
+  plugindir="$HOME/.gstreamer-0.10/plugins"
 else
-  plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
+  plugindir="\$(libdir)/gstreamer-0.10"
 fi
 AC_SUBST(plugindir)
 
@@ -127,5 +82,6 @@ dnl set proper LDFLAGS for plugins
 GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*'
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
-AC_OUTPUT(Makefile m4/Makefile src/Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile])
+AC_OUTPUT
 
diff --git a/gst-plugin/gst-autogen.sh b/gst-plugin/gst-autogen.sh
deleted file mode 100644
index 7b31212..0000000
--- a/gst-plugin/gst-autogen.sh
+++ /dev/null
@@ -1,308 +0,0 @@
-# a silly hack that generates autoregen.sh but it's handy
-# Remove the old autoregen.sh first to create a new file,
-# as the current one may be being read by the shell executing
-# this script.
-if [ -f "autoregen.sh" ]; then
-  rm autoregen.sh
-fi
-echo "#!/bin/sh" > autoregen.sh
-echo "./autogen.sh $@ \$@" >> autoregen.sh
-chmod +x autoregen.sh
-
-# helper functions for autogen.sh
-
-debug ()
-# print out a debug message if DEBUG is a defined variable
-{
-  if test ! -z "$DEBUG"
-  then
-    echo "DEBUG: $1"
-  fi
-}
-
-version_check ()
-# check the version of a package
-# first argument : package name (executable)
-# second argument : optional path where to look for it instead
-# third argument : source download url
-# rest of arguments : major, minor, micro version
-# all consecutive ones : suggestions for binaries to use
-# (if not specified in second argument)
-{
-  PACKAGE=$1
-  PKG_PATH=$2
-  URL=$3
-  MAJOR=$4
-  MINOR=$5
-  MICRO=$6
-
-  # for backwards compatibility, we let PKG_PATH=PACKAGE when PKG_PATH null
-  if test -z "$PKG_PATH"; then PKG_PATH=$PACKAGE; fi
-  debug "major $MAJOR minor $MINOR micro $MICRO"
-  VERSION=$MAJOR
-  if test ! -z "$MINOR"; then VERSION=$VERSION.$MINOR; else MINOR=0; fi
-  if test ! -z "$MICRO"; then VERSION=$VERSION.$MICRO; else MICRO=0; fi
-
-  debug "major $MAJOR minor $MINOR micro $MICRO"
-  
-  for SUGGESTION in $PKG_PATH; do 
-    COMMAND="$SUGGESTION"
-
-    # don't check if asked not to
-    test -z "$NOCHECK" && {
-      echo -n "  checking for $COMMAND >= $VERSION ... "
-    } || {
-      # we set a var with the same name as the package, but stripped of
-      # unwanted chars
-      VAR=`echo $PACKAGE | sed 's/-//g'`
-      debug "setting $VAR"
-      eval $VAR="$COMMAND"
-      return 0
-    }
-
-    debug "checking version with $COMMAND"
-    ($COMMAND --version) < /dev/null > /dev/null 2>&1 || 
-    {
-      echo "not found."
-      continue
-    }
-    # strip everything that's not a digit, then use cut to get the first field
-    pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*)[^0-9]*//'|cut -d' ' -f1`
-    debug "pkg_version $pkg_version"
-    # remove any non-digit characters from the version numbers to permit numeric
-    # comparison
-    pkg_major=`echo $pkg_version | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
-    pkg_minor=`echo $pkg_version | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
-    pkg_micro=`echo $pkg_version | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
-    test -z "$pkg_major" && pkg_major=0
-    test -z "$pkg_minor" && pkg_minor=0
-    test -z "$pkg_micro" && pkg_micro=0
-    debug "found major $pkg_major minor $pkg_minor micro $pkg_micro"
-
-    #start checking the version
-    debug "version check"
-
-    # reset check
-    WRONG=
-
-    if [ ! "$pkg_major" -gt "$MAJOR" ]; then
-      debug "major: $pkg_major <= $MAJOR"
-      if [ "$pkg_major" -lt "$MAJOR" ]; then
-        debug "major: $pkg_major < $MAJOR"
-        WRONG=1
-      elif [ ! "$pkg_minor" -gt "$MINOR" ]; then
-        debug "minor: $pkg_minor <= $MINOR"
-        if [ "$pkg_minor" -lt "$MINOR" ]; then
-          debug "minor: $pkg_minor < $MINOR"
-          WRONG=1
-        elif [ "$pkg_micro" -lt "$MICRO" ]; then
-          debug "micro: $pkg_micro < $MICRO"
-	  WRONG=1
-        fi
-      fi
-    fi
-
-    if test ! -z "$WRONG"; then
-      echo "found $pkg_version, not ok !"
-      continue
-    else
-      echo "found $pkg_version, ok."
-      # we set a var with the same name as the package, but stripped of
-      # unwanted chars
-      VAR=`echo $PACKAGE | sed 's/-//g'`
-      debug "setting $VAR"
-      eval $VAR="$COMMAND"
-      return 0
-    fi
-  done
-
-  echo "not found !"
-  echo "You must have $PACKAGE installed to compile $package."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at $URL"
-  return 1;
-}
-
-aclocal_check ()
-{
-  # normally aclocal is part of automake
-  # so we expect it to be in the same place as automake
-  # so if a different automake is supplied, we need to adapt as well
-  # so how's about replacing automake with aclocal in the set var,
-  # and saving that in $aclocal ?
-  # note, this will fail if the actual automake isn't called automake*
-  # or if part of the path before it contains it
-  if [ -z "$automake" ]; then
-    echo "Error: no automake variable set !"
-    return 1
-  else
-    aclocal=`echo $automake | sed s/automake/aclocal/`
-    debug "aclocal: $aclocal"
-    if [ "$aclocal" != "aclocal" ];
-    then
-      CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-aclocal=$aclocal"
-    fi
-    if [ ! -x `which $aclocal` ]; then
-      echo "Error: cannot execute $aclocal !"
-      return 1
-    fi
-  fi
-}
-
-autoheader_check ()
-{
-  # same here - autoheader is part of autoconf
-  # use the same voodoo
-  if [ -z "$autoconf" ]; then
-    echo "Error: no autoconf variable set !"
-    return 1
-  else
-    autoheader=`echo $autoconf | sed s/autoconf/autoheader/`
-    debug "autoheader: $autoheader"
-    if [ "$autoheader" != "autoheader" ];
-    then
-      CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoheader=$autoheader"
-    fi
-    if [ ! -x `which $autoheader` ]; then
-      echo "Error: cannot execute $autoheader !"
-      return 1
-    fi
-  fi
-
-}
-autoconf_2_52d_check ()
-{
-  # autoconf 2.52d has a weird issue involving a yes:no error
-  # so don't allow it's use
-  test -z "$NOCHECK" && {
-    ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'`
-    if test "$ac_version" = "2.52d"; then
-      echo "autoconf 2.52d has an issue with our current build."
-      echo "We don't know who's to blame however.  So until we do, get a"
-      echo "regular version.  RPM's of a working version are on the gstreamer site."
-      exit 1
-    fi
-  }
-  return 0
-}
-
-die_check ()
-{
-  # call with $DIE
-  # if set to 1, we need to print something helpful then die
-  DIE=$1
-  if test "x$DIE" = "x1";
-  then
-    echo
-    echo "- Please get the right tools before proceeding."
-    echo "- Alternatively, if you're sure we're wrong, run with --nocheck."
-    exit 1
-  fi
-}
-
-autogen_options ()
-{
-  if test "x$1" = "x"; then
-    return 0
-  fi
-
-  while test "x$1" != "x" ; do
-    optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    case "$1" in
-      --noconfigure)
-          NOCONFIGURE=defined
-	  AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --noconfigure"
-          echo "+ configure run disabled"
-          shift
-          ;;
-      --nocheck)
-	  AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --nocheck"
-          NOCHECK=defined
-          echo "+ autotools version check disabled"
-          shift
-          ;;
-      --debug)
-          DEBUG=defined
-	  AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --debug"
-          echo "+ debug output enabled"
-          shift
-          ;;
-      --prefix=*)
-	  CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$optarg"
-	  echo "+ passing --prefix=$optarg to configure"
-          shift
-          ;;
-      --prefix)
-	  shift
-	  echo "DEBUG: $1"
-	  CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$1"
-	  echo "+ passing --prefix=$1 to configure"
-          shift
-          ;;
-
-      -h|--help)
-          echo "autogen.sh (autogen options) -- (configure options)"
-          echo "autogen.sh help options: "
-          echo " --noconfigure            don't run the configure script"
-          echo " --nocheck                don't do version checks"
-          echo " --debug                  debug the autogen process"
-	  echo " --prefix		  will be passed on to configure"
-          echo
-          echo " --with-autoconf PATH     use autoconf in PATH"
-          echo " --with-automake PATH     use automake in PATH"
-          echo
-          echo "to pass options to configure, put them as arguments after -- "
-	  exit 1
-          ;;
-      --with-automake=*)
-          AUTOMAKE=$optarg
-          echo "+ using alternate automake in $optarg"
-	  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-automake=$AUTOMAKE"
-          shift
-          ;;
-      --with-autoconf=*)
-          AUTOCONF=$optarg
-          echo "+ using alternate autoconf in $optarg"
-	  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoconf=$AUTOCONF"
-          shift
-          ;;
-      --disable*|--enable*|--with*)
-          echo "+ passing option $1 to configure"
-	  CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1"
-          shift
-          ;;
-       --) shift ; break ;;
-      *) echo "- ignoring unknown autogen.sh argument $1"; shift ;;
-    esac
-  done
-
-  for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done
-  if test ! -z "$CONFIGURE_EXT_OPT"
-  then
-    echo "+ options passed to configure: $CONFIGURE_EXT_OPT"
-  fi
-}
-
-toplevel_check ()
-{
-  srcfile=$1
-  test -f $srcfile || {
-        echo "You must run this script in the top-level $package directory"
-        exit 1
-  }
-}
-
-
-tool_run ()
-{
-  tool=$1
-  options=$2
-  run_if_fail=$3
-  echo "+ running $tool $options..."
-  $tool $options || {
-    echo
-    echo $tool failed
-    eval $run_if_fail
-    exit 1
-  }
-}
diff --git a/gst-plugin/m4/Makefile.am b/gst-plugin/m4/Makefile.am
deleted file mode 100644
index 4a44032..0000000
--- a/gst-plugin/m4/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = as-version.m4 as-compiler-flag.m4
diff --git a/gst-plugin/m4/as-compiler-flag.m4 b/gst-plugin/m4/as-compiler-flag.m4
deleted file mode 100644
index 2f0ba19..0000000
--- a/gst-plugin/m4/as-compiler-flag.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-dnl as-compiler-flag.m4 0.0.1
-dnl autostars m4 macro for detection of compiler flags
-dnl
-dnl ds@schleef.org
-
-AC_DEFUN([AS_COMPILER_FLAG],
-[
-  AC_MSG_CHECKING([to see if compiler understands $1])
-
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-
-  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
-  CFLAGS="$save_CFLAGS"
-
-  if test "X$flag_ok" = Xyes ; then
-    $2
-    true
-  else
-    $3
-    true
-  fi
-  AC_MSG_RESULT([$flag_ok])
-])
-
diff --git a/gst-plugin/m4/as-version.m4 b/gst-plugin/m4/as-version.m4
deleted file mode 100644
index 68abdf9..0000000
--- a/gst-plugin/m4/as-version.m4
+++ /dev/null
@@ -1,66 +0,0 @@
-dnl as-version.m4 0.1.0
-
-dnl autostars m4 macro for versioning
-
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-
-dnl $Id$
-
-dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO,
-dnl            ACTION-IF-NO-NANO, [ACTION-IF-NANO])
-
-dnl example
-dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,)
-dnl for a 0.3.2 release version
-
-dnl this macro
-dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO
-dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode
-dnl - defines [$PREFIX], VERSION, and [$PREFIX]_RELEASE
-dnl - executes the relevant action
-dnl - AC_SUBST's PACKAGE, VERSION, [$PREFIX] and [$PREFIX]_RELEASE
-dnl   as well as the little ones
-dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents
-dnl   maintainer mode from running ok
-dnl
-dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h
-dnl if you use acconfig.h
-
-AC_DEFUN([AS_VERSION],
-[
-  PACKAGE=[$1]
-  [$2]_MAJOR=[$3]
-  [$2]_MINOR=[$4]
-  [$2]_MICRO=[$5]
-  NANO=[$6]
-  [$2]_NANO=$NANO
-  if test "x$NANO" = "x" || test "x$NANO" = "x0";
-  then
-      AC_MSG_NOTICE(configuring [$1] for release)
-      VERSION=[$3].[$4].[$5]
-      [$2]_RELEASE=1
-      dnl execute action
-      ifelse([$7], , :, [$7])
-  else
-      AC_MSG_NOTICE(configuring [$1] for development with nano $NANO)
-      VERSION=[$3].[$4].[$5].$NANO
-      [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S`
-      dnl execute action
-      ifelse([$8], , :, [$8])
-  fi
-
-  [$2]=$VERSION
-  AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version])
-  AC_SUBST([$2])
-  AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version])
-  AC_SUBST([$2]_RELEASE)
-
-  AC_SUBST([$2]_MAJOR)
-  AC_SUBST([$2]_MINOR)
-  AC_SUBST([$2]_MICRO)
-  AC_SUBST([$2]_NANO)
-  AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define the package name])
-  AC_SUBST(PACKAGE)
-  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the version])
-  AC_SUBST(VERSION)
-])
diff --git a/gst-plugin/src/Makefile.am b/gst-plugin/src/Makefile.am
index ca90aae..8f2bc4b 100644
--- a/gst-plugin/src/Makefile.am
+++ b/gst-plugin/src/Makefile.am
@@ -1,25 +1,24 @@
-# plugindir is set in configure
+# Note: plugindir is set in configure
 
 ##############################################################################
-# change libgstplugin.la to something more suitable, e.g. libmysomething.la  #
+# TODO: change libgstplugin.la to something else, e.g. libmysomething.la     #
 ##############################################################################
 plugin_LTLIBRARIES = libgstplugin.la
 
 ##############################################################################
-# for the next set of variables, rename the prefix if you renamed the .la,   #
-#  e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES                 #
-#       libgstplugin_la_CFLAGS  => libmysomething_la_CFLAGS                  #
-#       libgstplugin_la_LIBADD  => libmysomething_la_LIBADD                  #
-#       libgstplugin_la_LDFLAGS => libmysomething_la_LDFLAGS                 #
+# TODO: for the next set of variables, name the prefix if you named the .la, #
+#  e.g. libmysomething.la => libmysomething_la_SOURCES                       #
+#                            libmysomething_la_CFLAGS                        #
+#                            libmysomething_la_LIBADD                        #
+#                            libmysomething_la_LDFLAGS                       #
 ##############################################################################
 
 # sources used to compile this plug-in
-libgstplugin_la_SOURCES = gstplugin.c
+libgstplugin_la_SOURCES = gstplugin.c gstplugin.h
 
-# flags used to compile this plugin
-# add other _CFLAGS and _LIBS as needed
+# compiler and linker flags used to compile this plugin, set in configure.ac
 libgstplugin_la_CFLAGS = $(GST_CFLAGS)
-libgstplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GSTCTRL_LIBS)
+libgstplugin_la_LIBADD = $(GST_LIBS)
 libgstplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstplugin_la_LIBTOOLFLAGS = --tag=disable-static