[xiph-commits] r15772 - trunk/ezstream/m4
moritz at svn.xiph.org
moritz at svn.xiph.org
Sun Mar 15 06:12:46 PDT 2009
Author: moritz
Date: 2009-03-15 06:12:46 -0700 (Sun, 15 Mar 2009)
New Revision: 15772
Removed:
trunk/ezstream/m4/ogg.m4
trunk/ezstream/m4/vorbis.m4
Modified:
trunk/ezstream/m4/Makefile.am
Log:
Remove ogg.m4 and vorbis.m4; the ones installed by libogg/-vorbis are fine.
Modified: trunk/ezstream/m4/Makefile.am
===================================================================
--- trunk/ezstream/m4/Makefile.am 2009-03-15 11:15:28 UTC (rev 15771)
+++ trunk/ezstream/m4/Makefile.am 2009-03-15 13:12:46 UTC (rev 15772)
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = 1.9 foreign
-EXTRA_DIST = ogg.m4 shout.m4 vorbis.m4 xiph_compiler.m4 xiph_xml2.m4
+EXTRA_DIST = shout.m4 xiph_compiler.m4 xiph_xml2.m4
CLEANFILES = core *.core *~ .*~
Deleted: trunk/ezstream/m4/ogg.m4
===================================================================
--- trunk/ezstream/m4/ogg.m4 2009-03-15 11:15:28 UTC (rev 15771)
+++ trunk/ezstream/m4/ogg.m4 2009-03-15 13:12:46 UTC (rev 15772)
@@ -1,69 +0,0 @@
-# Configure paths for libogg
-# updated by Karl Heyes 10-Jun-2003
-# Jack Moffitt <jack at 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 OGG_LDFLAGS and OGG_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_OGG],
-[dnl
-AC_ARG_VAR([OGG_PREFIX],[path to Ogg installation])
-AC_ARG_WITH(ogg,
- [AS_HELP_STRING([--with-ogg=PREFIX],
- [Prefix where libogg is installed (optional)])],
- [ogg_prefix="$withval"], [
- if test x"$OGG_PREFIX" != "x"; then
- ogg_prefix="$OGG_PREFIX"
- else
- ogg_prefix=/usr/local
- fi
- ])
-if test "x$ogg_prefix" = "xyes"; then
- if test "x$prefix" = "xNONE"; then
- ogg_prefix=/usr/local
- else
- ogg_prefix="$prefix"
- fi
-fi
-
-XIPH_GCC_WARNING([-I$ogg_prefix/include],,
- [ OGG_CFLAGS="-I$ogg_prefix/include"
- OGG_LDFLAGS="-L$ogg_prefix/lib"
- ])
-AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
-[dnl
-OGG_LIBS="-logg"
-
-#
-# check if the installed Ogg is sufficiently new.
-#
-ac_save_CFLAGS="$CFLAGS"
-ac_save_LIBS="$LIBS"
-ac_save_LDFLAGS="$LDFLAGS"
-CFLAGS="$CFLAGS $OGG_CFLAGS"
-LIBS="$LIBS $OGG_LIBS"
-LDFLAGS="$LDFLAGS $OGG_LDFLAGS"
-AC_TRY_LINK_FUNC(ogg_sync_init,
- [ xt_cv_lib_ogg=ok ],
- [ AC_TRY_LINK([#include <ogg/ogg.h>],,
- [ xt_cv_lib_ogg="pre v1.0, needs updating" ],
- [ xt_cv_lib_ogg="not found" ])
- ])
-CFLAGS="$ac_save_CFLAGS"
-LDFLAGS="$ac_save_LDFLAGS"
-LIBS="$ac_save_LIBS"
-])
-if test "x$xt_cv_lib_ogg" = "xok"; then
- ifelse([$1],,,[$1])
- AC_DEFINE([HAVE_OGG], [1], [Define if you have libogg installed])
-else
- OGG_LIBS=""
- OGG_CFLAGS=""
- OGG_LDFLAGS=""
- ifelse([$2],,,[$2])
-fi
-AC_SUBST(OGG_LIBS)
-AC_SUBST(OGG_CFLAGS)
-AC_SUBST(OGG_LDFLAGS)
-])
Deleted: trunk/ezstream/m4/vorbis.m4
===================================================================
--- trunk/ezstream/m4/vorbis.m4 2009-03-15 11:15:28 UTC (rev 15771)
+++ trunk/ezstream/m4/vorbis.m4 2009-03-15 13:12:46 UTC (rev 15772)
@@ -1,95 +0,0 @@
-# Configure paths for libvorbis
-# Jack Moffitt <jack at icecast.org> 10-21-2000
-# updated by Karl Heyes 31-Mar-2003
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS VORBIS_LIBS
-dnl VORBIS_VORBISENC_LIBS VORBIS_VORBISFILE_LIBS VORBIS_LDFLAGS
-dnl
-
-AC_DEFUN([XIPH_PATH_VORBIS],
-[dnl
-AC_REQUIRE([XIPH_PATH_OGG])
-
-dnl Get the cflags and libraries for vorbis
-dnl
-AC_ARG_VAR([VORBIS_PREFIX],[path to Vorbis installation])
-AC_ARG_WITH(vorbis,
- AS_HELP_STRING([--with-vorbis=PREFIX],
- [Prefix where libvorbis is installed (optional)]),
- [vorbis_prefix="$withval"], [
- if test x"$VORBIS_PREFIX" != "x"; then
- vorbis_prefix="$VORBIS_PREFIX"
- else
- vorbis_prefix=/usr/local
- fi
- ])
-if test "x$vorbis_prefix" = "xyes"; then
- if test "x$prefix" = "xNONE"; then
- vorbis_prefix="/usr/local"
- else
- vorbis_prefix="$prefix"
- fi
-fi
-
-VORBIS_CFLAGS="$OGG_CFLAGS"
-VORBIS_LDFLAGS="$OGG_LDFLAGS"
-if test "x$vorbis_prefix" != "x$ogg_prefix"; then
- XIPH_GCC_WARNING(-I"$vorbis_prefix/include",,
- [VORBIS_CFLAGS="$VORBIS_CFLAGS -I$vorbis_prefix/include"
- VORBIS_LDFLAGS="-L$vorbis_prefix/lib $VORBIS_LDFLAGS"
- ])
-fi
-
-VORBIS_LIBS="-lvorbis"
-VORBISFILE_LIBS="-lvorbisfile"
-VORBISENC_LIBS="-lvorbisenc"
-
-xt_save_LIBS="$LIBS"
-xt_save_LDFLAGS="$LDFLAGS"
-xt_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $VORBIS_CFLAGS"
-LDFLAGS="$LDFLAGS $VORBIS_LDFLAGS"
-LIBS="$LIBS $VORBIS_LIBS"
-xt_lib_vorbis="not found"
-AC_MSG_CHECKING([for libvorbis])
-AC_TRY_LINK_FUNC(ogg_stream_init, [xt_lib_vorbis=ok],
- [LIBS="$LIBS $OGG_LIBS -lm"
- AC_TRY_LINK_FUNC(vorbis_info_init,
- [xt_lib_vorbis=ok
- VORBIS_LIBS="$VORBIS_LIBS $OGG_LIBS -lm"],
- )
- ])
-
-AC_MSG_RESULT([$xt_lib_vorbis])
-if test "x$xt_lib_vorbis" = "xok"; then
-#
-# Now check if the installed Vorbis is sufficiently new.
-#
-AC_CHECK_TYPES([struct ovectl_ratemanage_arg],,
- [xt_lib_vorbis="old version found"], [
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
- ])
-fi
-CPPFLAGS="$xt_save_CPPFLAGS"
-LIBS="$xt_save_LIBS"
-LDFLAGS="$xt_save_LDFLAGS"
-
-if test "x$xt_lib_vorbis" = "xok"; then
- ifelse([$1], ,[:], [$1])
-else
- VORBIS_CFLAGS=""
- VORBIS_LDFLAGS=""
- VORBIS_LIBS=""
- VORBISFILE_LIBS=""
- VORBISENC_LIBS=""
- ifelse([$2], ,, [$2])
-fi
-AC_SUBST(VORBIS_CFLAGS)
-AC_SUBST(VORBIS_LDFLAGS)
-AC_SUBST(VORBIS_LIBS)
-AC_SUBST(VORBISFILE_LIBS)
-AC_SUBST(VORBISENC_LIBS)
-])
More information about the commits
mailing list