fix distcheck; remove some old m4s

Original commit message from CVS:
fix distcheck; remove some old m4s

9 files changed, 18 insertions, 1107 deletions

diff --git a/common b/common
-Subproject 74223ba3ec3be64622ac71d682b36c1f8f01350
+Subproject cd012821aa2e4f6247f4cd6dee14116f86421a7
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 90d5cd69..ce7ccdce 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,27 +1,7 @@
-EXTRA_DIST = \
-	a52.m4 \
-	aalib.m4 \
-	as-arts.m4 \
-	as-ffmpeg.m4 \
-	as-liblame.m4 \
-	as-slurp-ffmpeg.m4 \
-	check-libheader.m4 \
+GETTEXT_M4 = \
 	codeset.m4 \
-	esd.m4 \
-	freetype2.m4 \
-	gconf-2.m4 \
 	gettext.m4 \
 	glibc21.m4 \
-	glib.m4 \
-	gst-alsa.m4 \
-	gst-artsc.m4 \
-	gst-fionread.m4 \
-	gst-ivorbis.m4 \
-	gst-matroska.m4 \
-	gst-sdl.m4 \
-	gst-shout2.m4 \
-	gst-sid.m4 \
-	gtk.m4 \
 	iconv.m4 \
 	intdiv0.m4 \
 	inttypes_h.m4 \
@@ -29,16 +9,28 @@ EXTRA_DIST = \
 	inttypes-pri.m4 \
 	isc-posix.m4 \
 	lcmessage.m4 \
-	libfame.m4 \
 	lib-ld.m4 \
 	lib-link.m4 \
-	libmikmod.m4 \
 	lib-prefix.m4 \
 	lrintf.m4 \
 	lrint.m4 \
-	ogg.m4 \
 	progtest.m4 \
 	stdint_h.m4 \
 	uintmax_t.m4 \
-	ulonglong.m4 \
-	vorbis.m4
+	ulonglong.m4
+
+EXTRA_DIST = \
+	a52.m4 \
+	aalib.m4 \
+	as-liblame.m4 \
+	as-slurp-ffmpeg.m4 \
+	check-libheader.m4 \
+	freetype2.m4 \
+	glib.m4 \
+	gst-fionread.m4 \
+	gst-sdl.m4 \
+	gst-shout2.m4 \
+	gst-sid.m4 \
+	gtk.m4 \
+	libfame.m4 \
+	libmikmod.m4
diff --git a/m4/as-arts.m4 b/m4/as-arts.m4
deleted file mode 100644
index a66a8c2d..00000000
--- a/m4/as-arts.m4
+++ /dev/null
@@ -1,209 +0,0 @@
-dnl as-arts.m4 0.1.0
-
-dnl $Id: as-arts.m4,v 1.5 2004/05/21 11:20:49 thomasvs Exp $
-dnl if you copy this file to your cvs,
-dnl add this file using cvs -ko add to retain this header
-
-dnl This is an example arts .m4 adapted and scrubbed by thomasvs
-
-# Configure paths for ARTS
-# Philip Stadermann   2001-06-21
-# stolen from esd.m4
-
-dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for ARTS, and define ARTS_CXXFLAGS and ARTS_LIBS
-dnl
-AC_DEFUN([AM_PATH_ARTS],
-[dnl 
-dnl Get the cflags and libraries from the artsc-config script
-dnl
-AC_ARG_WITH(arts-prefix,
-  AC_HELP_STRING([--with-arts-prefix=PFX],
-                 [prefix where ARTS is installed (optional)]),
-  arts_prefix="$withval", arts_prefix="")
-
-AC_ARG_WITH(arts-exec-prefix,
-  AC_HELP_STRING([--with-arts-exec-prefix=PFX],
-                 [exec prefix where ARTS is installed (optional)]),
-  arts_exec_prefix="$withval", arts_exec_prefix="")
-
-AC_ARG_ENABLE(artstest, 
-  AC_HELP_STRING([--disable-artstest],
-                 [do not try to compile and run a test ARTS program]),
-  , enable_artstest=yes)
-
-  if test x$arts_exec_prefix != x ; then
-    arts_args="$arts_args --exec-prefix=$arts_exec_prefix"
-    if test x${ARTS_CONFIG+set} != xset ; then
-      ARTS_CONFIG=$arts_exec_prefix/bin/artsc-config
-    fi
-  fi
-  if test x$arts_prefix != x ; then
-    arts_args="$arts_args --prefix=$arts_prefix"
-    if test x${ARTS_CONFIG+set} != xset ; then
-      ARTS_CONFIG=$arts_prefix/bin/artsc-config
-    fi
-  fi
-
-  AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
-  min_arts_version=ifelse([$1], ,0.9.5,$1)
-  AC_MSG_CHECKING(for ARTS artsc - version >= $min_arts_version)
-  no_arts=""
-  if test "$ARTS_CONFIG" = "no" ; then
-    no_arts=yes
-  else
-    # FIXME: thomas added this sed to get arts path instead of artsc
-    # replace -I.../artsc with -I.../arts
-    ARTS_CXXFLAGS=`$ARTS_CONFIG $artsconf_args --cflags | artsc-config --cflags | sed 's/\(-I.*\)artsc/\1arts/'`
-    ARTS_LIBS=`$ARTS_CONFIG $artsconf_args --libs | sed 's/artsc$/arts/'`
-
-    arts_major_version=`$ARTS_CONFIG $arts_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    arts_minor_version=`$ARTS_CONFIG $arts_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    arts_micro_version=`$ARTS_CONFIG $arts_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_artstest" = "xyes" ; then
-      dnl ac_save_CXXFLAGS="$CXXFLAGS"
-      dnl ac_save_LIBS="$LIBS"
-      dnl CFLAGS="$CFLAGS $ARTS_CXXFLAGS"
-      dnl LIBS="$LIBS $ARTS_LIBS"
-dnl
-dnl Now check if the installed ARTS is sufficiently new. (Also sanity
-dnl checks the results of artsc-config to some extent)
-dnl
-
-dnl a*s: to successfully compile the C++ test app, we need to 
-dnl first make sure we're going to compile it as C++ (with AC_LANG_PUSH),
-dnl then add the CFLAGS and CLIBS of arts which we just discovered to the
-dnl C++ compilation and linking flags.
-dnl We also need to clean up after the test; this means using AC_LANG_POP
-dnl and restoring the CPPFLAGS and LDFLAGS from the saved values we take 
-dnl here.
-
-dnl ask nicely for C++ compilation
-      AC_LANG_PUSH(C++)
-
-dnl save compilation and link flags and make our own
-      ac_save_CPPFLAGS="$CPPFLAGS"
-      ac_save_LDFLAGS="$LDFLAGS"
-      AC_SUBST(CPPFLAGS,"$CPPFLAGS $ARTS_CXXFLAGS")
-      AC_SUBST(LDFLAGS,"$LDFLAGS $ARTS_CLIBS")
- 
-      rm -f conf.artstest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <artsflow.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      // thomas: the original test did not have the typecast
-      new_str = (char *) malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.artstest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_arts_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_arts_version");
-     exit(1);
-   }
-
-   if (($arts_major_version > major) ||
-      (($arts_major_version == major) && ($arts_minor_version > minor)) ||
-      (($arts_major_version == major) && ($arts_minor_version == minor) && ($arts_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'artsc-config --version' returned %d.%d.%d, but the minimum version\n", $arts_major_version, $arts_minor_version, $arts_micro_version);
-      printf("*** of ARTS required is %d.%d.%d. If artsc-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If artsc-config was wrong, set the environment variable ARTS_CONFIG\n");
-      printf("*** to point to the correct copy of artsc-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_arts=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-      dnl CFLAGS="$ac_save_CFLAGS"
-      dnl LIBS="$ac_save_LIBS"
-      dnl a*s this is were we clean up after the test
-      AC_LANG_POP(C++)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      LDFLAGS="$ac_save_LDFLAGS"
-      dnl a*s we are sure that these are right, so we make them active
-      AC_SUBST(CXXFLAGS,"$CXXFLAGS")
-      AC_SUBST(LDFLAGS,"$LDFLAGS")
-    fi
-  fi
-  if test "x$no_arts" = x ; then
-    AC_MSG_RESULT(yes)
-    ifelse([$2], , :, [$2])     
-  else
-    AC_MSG_RESULT(no)
-    if test "$ARTS_CONFIG" = "no" ; then
-      echo "*** The artsc-config script installed by ARTS could not be found"
-      echo "*** If ARTS was installed in PREFIX, make sure PREFIX/bin is in"
-      echo "*** your path, or set the ARTS_CONFIG environment variable to the"
-      echo "*** full path to artsc-config."
-    else
-      if test -f conf.artstest ; then
-        :
-      else
-         echo "*** Could not run ARTS test program, checking why..."
-         CFLAGS="$CFLAGS $ARTS_CXXFLAGS"
-         LIBS="$LIBS $ARTS_LIBS"
-         AC_TRY_LINK([
-#include <stdio.h>
-#include <artsflow.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding ARTS or finding the wrong"
-          echo "*** version of ARTS. If it is not finding ARTS, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ARTS was incorrectly installed"
-          echo "*** or that you have moved ARTS since it was installed. In the latter case, you"
-          echo "*** may want to edit the artsc-config script: $ARTS_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-      fi
-    fi
-    ARTS_CXXFLAGS=""
-    ARTS_LIBS=""
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(ARTS_CXXFLAGS)
-  AC_SUBST(ARTS_LIBS)
-  rm -f conf.artstest
-])
-
-dnl release C++ question
-
diff --git a/m4/esd.m4 b/m4/esd.m4
deleted file mode 100644
index 1812fd02..00000000
--- a/m4/esd.m4
+++ /dev/null
@@ -1,202 +0,0 @@
-# Configure paths for ESD
-# Manish Singh    98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-dnl
-AC_DEFUN([AM_PATH_ESD],
-[dnl 
-dnl Get the cflags and libraries from the esd-config script
-dnl
-AC_ARG_WITH(esd-prefix,
-  AC_HELP_STRING([--with-esd-prefix=PFX],
-                 [prefix where ESD is installed (optional)]),
-  esd_prefix="$withval", esd_prefix="")
-
-AC_ARG_WITH(esd-exec-prefix,
-  AC_HELP_STRING([--with-esd-exec-prefix=PFX],
-                 [exec prefix where ESD is installed (optional)]),
-  esd_exec_prefix="$withval", esd_exec_prefix="")
-
-AC_ARG_ENABLE(esdtest,
-  AC_HELP_STRING([--disable-esdtest],
-                 [do not try to compile and run a test ESD program]),
-  , enable_esdtest=yes)
-
-  if test x$esd_exec_prefix != x ; then
-     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-     fi
-  fi
-  if test x$esd_prefix != x ; then
-     esd_args="$esd_args --prefix=$esd_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_prefix/bin/esd-config
-     fi
-  fi
-
-  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-  min_esd_version=ifelse([$1], ,0.2.7,$1)
-  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-  no_esd=""
-  if test "$ESD_CONFIG" = "no" ; then
-    no_esd=yes
-  else
-    AC_LANG_SAVE
-    AC_LANG_C
-    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
-    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_esdtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $ESD_CFLAGS"
-      LIBS="$LIBS $ESD_LIBS"
-dnl
-dnl Now check if the installed ESD is sufficiently new. (Also sanity
-dnl checks the results of esd-config to some extent
-dnl
-      rm -f conf.esdtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.esdtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_esd_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_esd_version");
-     exit(1);
-   }
-
-   if (($esd_major_version > major) ||
-      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-       AC_LANG_RESTORE
-     fi
-  fi
-  if test "x$no_esd" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$ESD_CONFIG" = "no" ; then
-       echo "*** The esd-config script installed by ESD could not be found"
-       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-       echo "*** full path to esd-config."
-     else
-       if test -f conf.esdtest ; then
-        :
-       else
-          echo "*** Could not run ESD test program, checking why..."
-          CFLAGS="$CFLAGS $ESD_CFLAGS"
-          LIBS="$LIBS $ESD_LIBS"
-          AC_LANG_SAVE
-          AC_LANG_C
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <esd.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-          AC_LANG_RESTORE
-       fi
-     fi
-     ESD_CFLAGS=""
-     ESD_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(ESD_CFLAGS)
-  AC_SUBST(ESD_LIBS)
-  rm -f conf.esdtest
-])
-
-dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
-dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
-dnl
-AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
-[dnl
-  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
-  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
-  ac_save_ESD_LIBS="$ESD_LIBS"
-  AM_PATH_ESD(0.2.21,
-    ifelse([$1], , [
-      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
-      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
-	[Define if you have esound with support of multiple recording clients.])],
-    [$1]),
-    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
-    if test "x$ac_save_ESD_CFLAGS" != x ; then
-       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
-    fi
-    if test "x$ac_save_ESD_LIBS" != x ; then
-       ESD_LIBS="$ac_save_ESD_LIBS"
-    fi
-  )
-])
diff --git a/m4/gst-alsa.m4 b/m4/gst-alsa.m4
deleted file mode 100644
index 4141d066..00000000
--- a/m4/gst-alsa.m4
+++ /dev/null
@@ -1,150 +0,0 @@
-dnl Configure Paths for Alsa
-dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
-dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
-dnl Jaroslav Kysela <perex@suse.cz>
-dnl Last modification: alsa.m4,v 1.23 2004/01/16 18:14:22 tiwai Exp
-dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
-dnl enables arguments --with-alsa-prefix=
-dnl                   --with-alsa-enc-prefix=
-dnl                   --disable-alsatest
-dnl
-dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
-dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
-dnl
-AC_DEFUN([AM_PATH_ALSA],
-[dnl Save the original CFLAGS, LDFLAGS, and LIBS
-alsa_save_CFLAGS="$CFLAGS"
-alsa_save_LDFLAGS="$LDFLAGS"
-alsa_save_LIBS="$LIBS"
-alsa_found=yes
-
-dnl
-dnl Get the cflags and libraries for alsa
-dnl
-AC_ARG_WITH(alsa-prefix,
-  AC_HELP_STRING([--with-alsa-prefix=PFX],
-                 [prefix where Alsa library is installed(optional)]),
-  [alsa_prefix="$withval"], [alsa_prefix=""])
-
-AC_ARG_WITH(alsa-inc-prefix,
-  AC_HELP_STRING([--with-alsa-inc-prefix=PFX],
-                 [prefix where include libraries are (optional)]),
-  [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
-
-dnl FIXME: this is not yet implemented
-dnl AC_ARG_ENABLE(alsatest,
-dnl  AC_HELP_STRING([--disable-alsatest],
-dnl                 [do not try to compile and run a test Alsa program],
-dnl                 [enable_alsatest=no], [enable_alsatest=yes])
-
-dnl Add any special include directories
-AC_MSG_CHECKING(for ALSA CFLAGS)
-if test "$alsa_inc_prefix" != "" ; then
-	ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
-	CFLAGS="$CFLAGS -I$alsa_inc_prefix"
-fi
-AC_MSG_RESULT($ALSA_CFLAGS)
-
-dnl add any special lib dirs
-AC_MSG_CHECKING(for ALSA LDFLAGS)
-if test "$alsa_prefix" != "" ; then
-	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
-	LDFLAGS="$LDFLAGS $ALSA_LIBS"
-fi
-
-dnl add the alsa library
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
-LIBS=`echo $LIBS | sed 's/-lm//'`
-LIBS=`echo $LIBS | sed 's/-ldl//'`
-LIBS=`echo $LIBS | sed 's/-lpthread//'`
-LIBS=`echo $LIBS | sed 's/  //'`
-LIBS="$ALSA_LIBS $LIBS"
-AC_MSG_RESULT($ALSA_LIBS)
-
-dnl Check for a working version of libasound that is of the right version.
-min_alsa_version=ifelse([$1], ,0.1.1,$1)
-AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
-no_alsa=""
-    alsa_min_major_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    alsa_min_minor_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    alsa_min_micro_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILE([
-#include <alsa/asoundlib.h>
-], [
-void main(void)
-{
-/* ensure backward compatibility */
-#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
-#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
-#endif
-#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
-#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
-#endif
-#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
-#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
-#endif
-
-#  if(SND_LIB_MAJOR > $alsa_min_major_version)
-  exit(0);
-#  else
-#    if(SND_LIB_MAJOR < $alsa_min_major_version)
-#       error not present
-#    endif
-
-#   if(SND_LIB_MINOR > $alsa_min_minor_version)
-  exit(0);
-#   else
-#     if(SND_LIB_MINOR < $alsa_min_minor_version)
-#          error not present
-#      endif
-
-#      if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
-#        error not present
-#      endif
-#    endif
-#  endif
-exit(0);
-}
-],
-  [AC_MSG_RESULT(found.)],
-  [AC_MSG_RESULT(not present.)
-   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)])
-   alsa_found=no]
-)
-AC_LANG_RESTORE
-
-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
-if test "x$enable_alsatest" = "xyes"; then
-AC_CHECK_LIB([asound], [snd_ctl_open],,
-	[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
-	 alsa_found=no]
-)
-fi
-
-if test "x$alsa_found" = "xyes" ; then
-   ifelse([$2], , :, [$2])
-   LIBS=`echo $LIBS | sed 's/-lasound//g'`
-   LIBS=`echo $LIBS | sed 's/  //'`
-   LIBS="-lasound $LIBS"
-fi
-if test "x$alsa_found" = "xno" ; then
-   ifelse([$3], , :, [$3])
-   CFLAGS="$alsa_save_CFLAGS"
-   LDFLAGS="$alsa_save_LDFLAGS"
-   LIBS="$alsa_save_LIBS"
-   ALSA_CFLAGS=""
-   ALSA_LIBS=""
-fi
-
-dnl That should be it.  Now just export out symbols:
-AC_SUBST(ALSA_CFLAGS)
-AC_SUBST(ALSA_LIBS)
-])
-
diff --git a/m4/gst-artsc.m4 b/m4/gst-artsc.m4
deleted file mode 100644
index 46599609..00000000
--- a/m4/gst-artsc.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl Perform a check for existence of ARTSC
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Last modification: 26/06/2001
-dnl GST_CHECK_ARTSC()
-dnl
-dnl This check was written for GStreamer: it should be renamed and checked
-dnl for portability if you decide to use it elsewhere.
-dnl
-AC_DEFUN([GST_CHECK_ARTSC],
-[ 
-  AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no)
-  if test "x$ARTSC_CONFIG" = "xno"; then
-    AC_MSG_WARN([Couldn't find artsc-config])
-    HAVE_ARTSC=no
-    ARTSC_LIBS=
-    ARTSC_CFLAGS=
-  else
-    ARTSC_LIBS=`artsc-config --libs`
-    ARTSC_CFLAGS=`artsc-config --cflags`
-    dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.  
-    dnl FIXME: Ensure only suitable flags result from artsc-config --cflags
-    CPPFLAGS="$CPPFLAGS $ARTSC_CFLAGS"
-    AC_CHECK_HEADER(artsc.h, HAVE_ARTSC=yes, HAVE_ARTSC=no)
-  fi
-  AC_SUBST(ARTSC_LIBS)
-  AC_SUBST(ARTSC_CFLAGS) 
-])
-
diff --git a/m4/gst-matroska.m4 b/m4/gst-matroska.m4
deleted file mode 100644
index b50caaa2..00000000
--- a/m4/gst-matroska.m4
+++ /dev/null
@@ -1,262 +0,0 @@
-# Configure paths for libebml
-
-dnl PATH_EBML([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libebml, and define EBML_CFLAGS and EBML_LIBS
-dnl
-AC_DEFUN([PATH_EBML],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ebml-prefix,[  --with-ebml-prefix=PFX        Prefix where libebml is installed (optional)], ebml_prefix="$withval", ebml_prefix="")
-AC_ARG_WITH(ebml-include,[  --with-ebml-include=DIR       Path to where the libebml include files installed (optional)], ebml_include="$withval", ebml_include="")
-AC_ARG_WITH(ebml-lib,[  --with-ebml-lib=DIR           Path to where the libebml library installed (optional)], ebml_lib="$withval", ebml_lib="")
-AC_ARG_ENABLE(ebmltest, [  --disable-ebmltest            Do not try to compile and run a test EBML program],, enable_ebmltest=yes)
-
-  if test "x$ebml_prefix" != "x"; then
-    ebml_args="$ebml_args --prefix=$ebml_prefix"
-    if test "x$ebml_include" != "x"; then
-      EBML_CFLAGS="-I$ebml_include"
-    else
-      EBML_CFLAGS="-I$ebml_prefix/include/ebml"
-    fi
-    if test "x$ebml_lib" != "x"; then
-      EBML_LIBS="-L$ebml_lib"
-    else
-      EBML_LIBS="-L$ebml_prefix/lib"
-    fi
-  elif test "x$prefix" != "xNONE"; then
-    ebml_args="$ebml_args --prefix=$prefix"
-    if test "x$ebml_include" != "x"; then
-      EBML_CFLAGS="-I$ebml_include"
-    else
-      EBML_CFLAGS="-I$prefix/include/ebml"
-    fi
-    if test "x$ebml_lib" != "x"; then
-      EBML_LIBS="-L$ebml_lib"
-    else
-      EBML_LIBS="-L$prefix/lib"
-    fi
-  else
-    if test "x$ebml_include" != "x"; then
-      EBML_CFLAGS="-I$ebml_include"
-    else
-      EBML_CFLAGS="-I/usr/include/ebml -I/usr/local/include/ebml"
-    fi
-    if test "x$ebml_lib" != "x"; then
-      EBML_LIBS="-L$ebml_lib"
-    else
-      EBML_LIBS="-L/usr/local/lib"
-    fi
-  fi
-
-  EBML_LIBS="$EBML_LIBS -lebml"
-
-  AC_MSG_CHECKING(for EBML)
-  no_ebml=""
-
-
-  if test "x$enable_ebmltest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $EBML_CFLAGS"
-    LIBS="$LIBS $EBML_LIBS"
-dnl
-dnl Now check if the installed EBML is sufficiently new.
-dnl
-      rm -f conf.ebmltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <EbmlConfig.h>
-
-int main ()
-{
-  system("touch conf.ebmltest");
-  return 0;
-}
-
-],, no_ebml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_ebml" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.ebmltest ; then
-       :
-     else
-       echo "*** Could not run Ebml test program, checking why..."
-       CFLAGS="$CFLAGS $EBML_CFLAGS"
-       LIBS="$LIBS $EBML_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <EbmlConfig.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding EBML or finding the wrong"
-       echo "*** version of EBML. If it is not finding EBML, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means EBML was incorrectly installed"
-       echo "*** or that you have moved EBML since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     EBML_CFLAGS=""
-     EBML_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(EBML_CFLAGS)
-  AC_SUBST(EBML_LIBS)
-  rm -f conf.ebmltest
-])
-
-# Configure paths for libmatroska
-
-dnl PATH_MATROSKA(MIN_VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libmatroska, and define MATROSKA_CFLAGS and MATROSKA_LIBS
-dnl
-AC_DEFUN([PATH_MATROSKA],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(matroska-prefix,[  --with-matroska-prefix=PFX    Prefix where libmatroska is installed (optional)], matroska_prefix="$withval", matroska_prefix="")
-AC_ARG_WITH(matroska-include,[  --with-matroska-include=DIR   Path to where the libmatroska include files installed (optional)], matroska_include="$withval", matroska_include="")
-AC_ARG_WITH(matroska-lib,[  --with-matroska-lib=DIR       Path to where the libmatroska library installed (optional)], matroska_lib="$withval", matroska_lib="")
-AC_ARG_ENABLE(matroskatest, [  --disable-matroskatest        Do not try to compile and run a test Matroska program],, enable_matroskatest=yes)
-
-  if test "x$matroska_prefix" != "x"; then
-    matroska_args="$matroska_args --prefix=$matroska_prefix"
-    if test "x$matroska_include" != "x"; then
-      MATROSKA_CFLAGS="-I$matroska_include"
-    else
-      MATROSKA_CFLAGS="-I$matroska_prefix/include/matroska"
-    fi
-    if test "x$matroska_lib" != "x"; then
-      MATROSKA_LIBS="-L$matroska_lib"
-    else
-      MATROSKA_LIBS="-L$matroska_prefix/lib"
-    fi
-  elif test "x$prefix" != "xNONE"; then
-    matroska_args="$matroska_args --prefix=$prefix"
-    if test "x$matroska_include" != "x"; then
-      MATROSKA_CFLAGS="-I$matroska_include"
-    else
-      MATROSKA_CFLAGS="-I$prefix/include/matroska"
-    fi
-    if test "x$matroska_lib" != "x"; then
-      MATROSKA_LIBS="-L$matroska_lib"
-    else
-      MATROSKA_LIBS="-L$prefix/lib"
-    fi
-  else
-    if test "x$matroska_include" != "x"; then
-      MATROSKA_CFLAGS="-I$matroska_include"
-    else
-      MATROSKA_CFLAGS="-I/usr/include/matroska -I/usr/local/include/matroska"
-    fi
-    if test "x$matroska_lib" != "x"; then
-      MATROSKA_LIBS="-L$matroska_lib"
-    else
-      MATROSKA_LIBS="-L/usr/local/lib"
-    fi
-  fi
-
-  MATROSKA_LIBS="$MATROSKA_LIBS -lmatroska"
-
-  AC_MSG_CHECKING(for Matroska)
-  no_matroska=""
-
-
-  if test "x$enable_matroskatest" = "xyes" ; then
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    ac_save_LIBS="$LIBS"
-    CXXFLAGS="$CXXFLAGS $MATROSKA_CFLAGS $EBML_CFLAGS"
-    LIBS="$LIBS $MATROSKA_LIBS $EBML_LIBS"
-dnl
-dnl Now check if the installed Matroska is sufficiently new.
-dnl
-      rm -f conf.matroskatest
-      AC_LANG_CPLUSPLUS
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <EbmlConfig.h>
-#include <KaxVersion.h>
-
-using namespace LIBMATROSKA_NAMESPACE;
-
-int main ()
-{
-  FILE *f;
-  f = fopen("conf.matroskatest", "wb");
-  if (f == NULL)
-    return 1;
-  fprintf(f, "%s\n", KaxCodeVersion.c_str());
-  fclose(f);
-  return 0;
-}
-
-],, no_matroska=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-      AC_LANG_C
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_matroska" = "x" -a -f conf.matroskatest ; then
-    AC_MSG_RESULT(yes)
-
-    AC_MSG_CHECKING(Matroska version)
-
-    matroska_version=`cat conf.matroskatest`
-    mk_MAJVER=`echo $1 | cut -d"." -f1`
-    mk_MINVER=`echo $1 | cut -d"." -f2`
-    mk_RELVER=`echo $1 | cut -d"." -f3`
-    mver_ok=`sed 's;\.;\ ;g' < conf.matroskatest | (read -a mver
-    if test ${mver[[0]]} -gt $mk_MAJVER ; then
-      mver_ok=1
-    elif test ${mver[[0]]} -lt $mk_MAJVER ; then
-      mver_ok=0
-    else
-      if test ${mver[[1]]} -gt $mk_MINVER ; then
-        mver_ok=1
-      elif test ${mver[[1]]} -lt $mk_MINVER ; then
-        mver_ok=0
-      else
-        if test ${mver[[2]]} -ge $mk_RELVER ; then
-          mver_ok=1
-        else
-          mver_ok=0
-        fi
-      fi
-    fi
-    echo $mver_ok )`
-    if test "$mver_ok" = "1" ; then
-      AC_MSG_RESULT($matroska_version ok)
-       ifelse([$2], , :, [$2])     
-    else
-      AC_MSG_RESULT($matroska_version too old)
-      echo '*** Your Matroska version is too old. Upgrade to at least version'
-      echo '*** $1 and re-run configure.'
-       ifelse([$3], , :, [$3])     
-    fi
-
-  else
-     AC_MSG_RESULT(no)
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(MATROSKA_CFLAGS)
-  AC_SUBST(MATROSKA_LIBS)
-  rm -f conf.matroskatest
-])
diff --git a/m4/ogg.m4 b/m4/ogg.m4
deleted file mode 100644
index 0e1f1abf..00000000
--- a/m4/ogg.m4
+++ /dev/null
@@ -1,102 +0,0 @@
-# Configure paths for libogg
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_OGG],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
-AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
-AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-
-  if test "x$ogg_libraries" != "x" ; then
-    OGG_LIBS="-L$ogg_libraries"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    OGG_LIBS="-L$prefix/lib"
-  fi
-
-  OGG_LIBS="$OGG_LIBS -logg"
-
-  if test "x$ogg_includes" != "x" ; then
-    OGG_CFLAGS="-I$ogg_includes"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_CFLAGS="-I$ogg_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    OGG_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Ogg)
-  no_ogg=""
-
-
-  if test "x$enable_oggtest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Ogg is sufficiently new.
-dnl
-      rm -f conf.oggtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ogg/ogg.h>
-
-int main ()
-{
-  system("touch conf.oggtest");
-  return 0;
-}
-
-],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_ogg" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.oggtest ; then
-       :
-     else
-       echo "*** Could not run Ogg test program, checking why..."
-       CFLAGS="$CFLAGS $OGG_CFLAGS"
-       LIBS="$LIBS $OGG_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <ogg/ogg.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
-       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
-       echo "*** or that you have moved Ogg since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     OGG_CFLAGS=""
-     OGG_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(OGG_CFLAGS)
-  AC_SUBST(OGG_LIBS)
-  rm -f conf.oggtest
-])
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
deleted file mode 100644
index 6a288931..00000000
--- a/m4/vorbis.m4
+++ /dev/null
@@ -1,128 +0,0 @@
-# Configure paths for libvorbis
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-# thomasvs added check for vorbis_bitrate_addblock which is new in rc3
-# thomasvs added check for OV_ECTL_RATEMANAGE_SET which is new in 1.0 final
-
-dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_VORBIS],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(vorbis,[  --with-vorbis=PFX   Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_WITH(vorbis-libraries,[  --with-vorbis-libraries=DIR   Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="")
-AC_ARG_WITH(vorbis-includes,[  --with-vorbis-includes=DIR   Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="")
-AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
-
-  if test "x$vorbis_libraries" != "x" ; then
-    VORBIS_LIBS="-L$vorbis_libraries"
-  elif test "x$vorbis_prefix" != "x" ; then
-    VORBIS_LIBS="-L$vorbis_prefix/lib"
-  elif test "x$prefix" != "xNONE"; then
-    VORBIS_LIBS="-L$prefix/lib"
-  fi
-
-  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
-  VORBISFILE_LIBS="-lvorbisfile"
-  VORBISENC_LIBS="-lvorbisenc"
-
-  if test "x$vorbis_includes" != "x" ; then
-    VORBIS_CFLAGS="-I$vorbis_includes"
-  elif test "x$vorbis_prefix" != "x" ; then
-    VORBIS_CFLAGS="-I$vorbis_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    VORBIS_CFLAGS="-I$prefix/include"
-  fi
-
-
-  AC_MSG_CHECKING(for Vorbis)
-  no_vorbis=""
-
-
-  if test "x$enable_vorbistest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Vorbis is sufficiently new.
-dnl
-      rm -f conf.vorbistest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-int main ()
-{
-    vorbis_block 	vb;
-    vorbis_dsp_state	vd;
-    vorbis_info		vi;
-
-    vorbis_info_init (&vi);
-    vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
-    vorbis_analysis_init (&vd, &vi);
-    vorbis_block_init (&vd, &vb);
-    /* this function was added in 1.0rc3, so this is what we're testing for */
-    vorbis_bitrate_addblock (&vb);
-
-    /* this define was added in 1.0 final */
-#ifdef OV_ECTL_RATEMANAGE_SET
-    system("touch conf.vorbistest");
-    return 0;
-#else
-    return -1;
-#endif
-}
-
-],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_vorbis" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.vorbistest ; then
-       :
-     else
-       echo "*** Could not run Vorbis test program, checking why..."
-       CFLAGS="$CFLAGS $VORBIS_CFLAGS"
-       LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <vorbis/codec.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
-       echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
-       echo "*** or that you have moved Vorbis since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     VORBIS_CFLAGS=""
-     VORBIS_LIBS=""
-     VORBISFILE_LIBS=""
-     VORBISENC_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(VORBIS_CFLAGS)
-  AC_SUBST(VORBIS_LIBS)
-  AC_SUBST(VORBISFILE_LIBS)
-  AC_SUBST(VORBISENC_LIBS)
-  rm -f conf.vorbistest
-])