summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2013-09-13 09:17:38 +0100
committerTim-Philipp Müller <tim@centricular.net>2013-09-13 09:17:38 +0100
commit803c39bf3d773c5a841658f3126aa505d0596a6c (patch)
treef88b9d232133418cab49d561a9bf7bf3ab12ac1c
parent58e6f33e3544a12ced84e6c78a11aaec5c492f82 (diff)
configure: rely solely on pkg-config to find libogg and libvorbis
And get rid of AS_SCRUB_INCLUDES https://bugzilla.gnome.org/show_bug.cgi?id=707658
-rw-r--r--configure.ac11
1 files changed, 0 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 10493a95e..f853bbf21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -683,11 +683,6 @@ dnl *** ogg ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OGG, true)
AG_GST_CHECK_FEATURE(OGG, [Xiph Ogg library], ogg, [
AG_GST_PKG_CHECK_MODULES(OGG, ogg >= 1.0)
- if test $HAVE_OGG = no
- then
- XIPH_PATH_OGG(HAVE_OGG="yes", HAVE_OGG="no")
- AS_SCRUB_INCLUDE(OGG_CFLAGS)
- fi
])
dnl *** pango ***
@@ -703,15 +698,9 @@ AG_GST_CHECK_FEATURE(THEORA, [Xiph Theora video codec], theora, [
])
dnl *** vorbis ***
-dnl AM_PATH_VORBIS only takes two options
translit(dnm, m, l) AM_CONDITIONAL(USE_VORBIS, true)
AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [
AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0)
- if test $HAVE_VORBIS = no
- then
- XIPH_PATH_VORBIS(HAVE_VORBIS="yes", HAVE_VORBIS="no")
- AS_SCRUB_INCLUDE(VORBIS_CFLAGS)
- fi
])
if test "x$HAVE_VORBIS" = "xyes"; then