diff options
| -rw-r--r-- | ext/Makefile.am | 4 | ||||
| -rw-r--r-- | m4/Makefile.am | 1 | ||||
| -rw-r--r-- | m4/gst-ivorbis.m4 | 68 |
3 files changed, 1 insertions, 72 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 1e239464a..b78d80c97 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -391,7 +391,6 @@ SUBDIRS=\ $(GSM_DIR) \ $(G729_DIR) \ $(HERMES_DIR) \ - $(IVORBIS_DIR) \ $(JACK_DIR) \ $(JP2K_DIR) \ $(KATE_DIR) \ @@ -445,7 +444,6 @@ DIST_SUBDIRS = \ faad \ flite \ gsm \ - ivorbis \ ladspa \ jack \ jp2k \ @@ -477,4 +475,4 @@ DIST_SUBDIRS = \ theora \ timidity \ xvid \ - zbar + zbar diff --git a/m4/Makefile.am b/m4/Makefile.am index 2872f0562..094c3fdb8 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -16,7 +16,6 @@ EXTRA_DIST = \ gst-alsa.m4 \ gst-artsc.m4 \ gst-fionread.m4 \ - gst-ivorbis.m4 \ gst-matroska.m4 \ gst-sdl.m4 \ gst-shout2.m4 \ diff --git a/m4/gst-ivorbis.m4 b/m4/gst-ivorbis.m4 deleted file mode 100644 index ae35bbb5d..000000000 --- a/m4/gst-ivorbis.m4 +++ /dev/null @@ -1,68 +0,0 @@ -# Configure paths for Tremor - -dnl XIPH_PATH_IVORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libivorbis, and define IVORBIS_CFLAGS and IVORBIS_LIBS -dnl -AC_DEFUN([XIPH_PATH_IVORBIS], -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ivorbis,[ --with-ivorbis=PFX Prefix where libivorbis is installed (optional)], ivorbis_prefix="$withval", ivorbis_prefix="") -AC_ARG_WITH(ivorbis-libraries,[ --with-ivorbis-libraries=DIR Directory where libivorbis library is installed (optional)], ivorbis_libraries="$withval", ivorbis_libraries="") -AC_ARG_WITH(ivorbis-includes,[ --with-ivorbis-includes=DIR Directory where libivorbis header files are installed (optional)], ivorbis_includes="$withval", ivorbis_includes="") -AC_ARG_ENABLE(ivorbistest, [ --disable-ivorbistest Do not try to compile and run a test Ivorbis program],, enable_ivorbistest=yes) - - if test "x$ivorbis_libraries" != "x" ; then - IVORBIS_LIBS="-L$ivorbis_libraries" - elif test "x$ivorbis_prefix" != "x" ; then - IVORBIS_LIBS="-L$ivorbis_prefix/lib" - elif test "x$prefix" != "xNONE"; then - IVORBIS_LIBS="-L$prefix/lib" - fi - - IVORBIS_LIBS="$IVORBIS_LIBS -lvorbisidec -lm" - - if test "x$ivorbis_includes" != "x" ; then - IVORBIS_CFLAGS="-I$ivorbis_includes" - elif test "x$ivorbis_prefix" != "x" ; then - IVORBIS_CFLAGS="-I$ivorbis_prefix/include" - elif test "x$prefix" != "xNONE"; then - IVORBIS_CFLAGS="-I$prefix/include" - fi - - AC_MSG_CHECKING(for Tremor) - no_ivorbis="" - - if test "x$enable_ivorbistest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $IVORBIS_CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $IVORBIS_LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Tremor is sufficiently new. -dnl - rm -f conf.ivorbistest - AC_TRY_COMPILE([ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <tremor/codec.h> -],,, no_ivorbis=yes) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_ivorbis" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - IVORBIS_CFLAGS="" - IVORBIS_LIBS="" - IVORBISFILE_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(IVORBIS_CFLAGS) - AC_SUBST(IVORBIS_LIBS) - AC_SUBST(IVORBISFILE_LIBS) -]) |