summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-09-14 02:11:40 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-09-14 02:11:40 +0000
commit5e0aa5a045efc995564dd443bd1a4aac7ccc4f74 (patch)
treee8605d3fc7716cb3806d33aad2fb65398a9c4e77
parent4811fba5ed5c00d4211f6145cc8559f88c0086a1 (diff)
downloadxine-lib-5e0aa5a045efc995564dd443bd1a4aac7ccc4f74.tar.gz
xine-lib-5e0aa5a045efc995564dd443bd1a4aac7ccc4f74.tar.bz2
Remove.
CVS patchset: 8246 CVS date: 2006/09/14 02:11:40
-rw-r--r--m4/ogg.m495
-rw-r--r--m4/speex.m494
-rw-r--r--m4/theora.m499
-rw-r--r--m4/vorbis.m4100
4 files changed, 0 insertions, 388 deletions
diff --git a/m4/ogg.m4 b/m4/ogg.m4
deleted file mode 100644
index 30a9fa17d..000000000
--- a/m4/ogg.m4
+++ /dev/null
@@ -1,95 +0,0 @@
-# Configure paths for libogg
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
-dnl
-AC_DEFUN([AM_PATH_OGG],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ogg-prefix, AC_HELP_STRING([--with-ogg-prefix=DIR], [prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_ENABLE(oggtest, AC_HELP_STRING([--disable-oggtest], [do not try to compile and run a test Ogg program]), enable_oggtest=$enableval, enable_oggtest=yes)
-
- if test x$ogg_prefix != x ; then
- ogg_args="$ogg_args --prefix=$ogg_prefix"
- OGG_CFLAGS="-I$ogg_prefix/include"
- OGG_LIBS="-L$ogg_prefix/$XINE_LIBNAME"
- fi
-
- OGG_LIBS="$OGG_LIBS -logg"
-
- 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,
- AC_TRY_LINK([
-#include <stdio.h>
-#include <ogg/ogg.h>
-], [ return 0; ],, no_ogg=yes))
- 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. In the latter case, you"
- echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
- 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/speex.m4 b/m4/speex.m4
deleted file mode 100644
index 5e763a946..000000000
--- a/m4/speex.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-# Configure paths for libspeex
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl AM_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS
-dnl
-AC_DEFUN([AM_PATH_SPEEX],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(speex-prefix, AC_HELP_STRING([--with-speex-prefix=DIR], [prefix where libspeex is installed (optional)]), speex_prefix="$withval", speex_prefix="")
-AC_ARG_ENABLE(speextest, AC_HELP_STRING([--disable-speextest], [do not try to compile and run a test Speex program]), enable_speextest=$enableval, enable_speextest=yes)
-
- if test x$speex_prefix != x ; then
- speex_args="$speex_args --prefix=$speex_prefix"
- SPEEX_CFLAGS="-I$speex_prefix/include"
- SPEEX_LIBDIR="-L$speex_prefix/$XINE_LIBNAME"
- fi
-
- SPEEX_LIBS="$SPEEX_LIBDIR -lspeex -lm"
-
- AC_MSG_CHECKING(for Speex)
- no_speex=""
-
-
- if test "x$enable_speextest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SPEEX_CFLAGS"
- LIBS="$LIBS $SPEEX_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Speex is sufficiently new.
-dnl
- rm -f conf.speextest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <speex.h>
-
-int main ()
-{
- system("touch conf.speextest");
- return 0;
-}
-
-],, no_speex=yes,
- AC_TRY_LINK([
-#include <stdio.h>
-#include <speex.h>
-], [ return 0; ],, no_speex=yes))
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_speex" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.speextest ; then
- :
- else
- echo "*** Could not run Speex test program, checking why..."
- CFLAGS="$CFLAGS $SPEEX_CFLAGS"
- LIBS="$LIBS $SPEEX_LIBS $OGG_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <speex.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Speex or finding the wrong"
- echo "*** version of Speex. If it is not finding Speex, 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 Speex was incorrectly installed"
- echo "*** or that you have moved Speex since it was installed." ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- SPEEX_CFLAGS=""
- SPEEX_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(SPEEX_CFLAGS)
- AC_SUBST(SPEEX_LIBS)
- rm -f conf.speextest
-])
diff --git a/m4/theora.m4 b/m4/theora.m4
deleted file mode 100644
index 879a1ceec..000000000
--- a/m4/theora.m4
+++ /dev/null
@@ -1,99 +0,0 @@
-# Configure paths for libtheora
-# Andreas Heinchen <andreas.heinchen@gmx.de> 04-18-2003
-# Shamelessly adapted from Jack Moffitt's version for libvorbis
-# who had stolen it from Owen Taylor and Manish Singh
-
-dnl AM_PATH_THEORA([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libtheora, and define THEORA_CFLAGS and THEORA_LIBS
-dnl
-AC_DEFUN([AM_PATH_THEORA],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(theora-prefix, AC_HELP_STRING([--with-theora-prefix=DIR], [prefix where libtheora is installed (optional)]), theora_prefix="$withval", theora_prefix="")
-AC_ARG_ENABLE(theoratest, AC_HELP_STRING([--disable-theoratest], [do not try to compile and run a test Vorbis program]), enable_theoratest=$enableval, enable_theoratest=yes)
-
- if test x$theora_prefix != x ; then
- theora_args="$theora_args --prefix=$theora_prefix"
- THEORA_CFLAGS="-I$theora_prefix/include"
- THEORA_LIBDIR="-L$theora_prefix/$XINE_LIBNAME"
- fi
-
- THEORA_LIBS="$THEORA_LIBDIR -ltheora -lm"
-
- AC_MSG_CHECKING(for Theora)
- no_theora=""
-
-
- if test "x$enable_theoratest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $THEORA_CFLAGS"
- LIBS="$LIBS $THEORA_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Theora is sufficiently new.
-dnl
- rm -f conf.theoratest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <theora/theora.h>
-
-int main ()
-{
- system("touch conf.theoratest");
- return 0;
-}
-
-],, no_theora=yes,
- AC_TRY_LINK([
-#include <stdio.h>
-#include <theora/theora.h>
-], [ return 0; ],, no_theora=yes))
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_theora" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.theoratest ; then
- :
- else
- echo "*** Could not run Theora test program, checking why..."
- CFLAGS="$CFLAGS $THEORA_CFLAGS"
- LIBS="$LIBS $THEORA_LIBS $OGG_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <theora/theora.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Theora or finding the wrong"
- echo "*** version of Theora. If it is not finding Theora, 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 Theora was incorrectly installed"
- echo "*** or that you have moved Theora since it was installed." ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- THEORA_CFLAGS=""
- THEORA_LIBS=""
- THEORAFILE_LIBS=""
- THEORAENC_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(THEORA_CFLAGS)
- AC_SUBST(THEORA_LIBS)
- AC_SUBST(THEORAFILE_LIBS)
- AC_SUBST(THEORAENC_LIBS)
- rm -f conf.theoratest
-])
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
deleted file mode 100644
index 12dd5bedc..000000000
--- a/m4/vorbis.m4
+++ /dev/null
@@ -1,100 +0,0 @@
-# Configure paths for libvorbis
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
-dnl
-AC_DEFUN([AM_PATH_VORBIS],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(vorbis-prefix, AC_HELP_STRING([--with-vorbis-prefix=DIR], [prefix where libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_ENABLE(vorbistest, AC_HELP_STRING([--disable-vorbistest], [do not try to compile and run a test Vorbis program]), enable_vorbistest=$enableval, enable_vorbistest=yes)
-
- if test x$vorbis_prefix != x ; then
- vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
- VORBIS_CFLAGS="-I$vorbis_prefix/include"
- VORBIS_LIBDIR="-L$vorbis_prefix/$XINE_LIBNAME"
- fi
-
- VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
- VORBISFILE_LIBS="-lvorbisfile"
- VORBISENC_LIBS="-lvorbisenc"
-
- 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"
- LIBS="$LIBS $VORBIS_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>
-
-int main ()
-{
- system("touch conf.vorbistest");
- return 0;
-}
-
-],, no_vorbis=yes,
- AC_TRY_LINK([
-#include <stdio.h>
-#include <vorbis/codec.h>
-], [ return 0; ],, no_vorbis=yes))
- 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
-])