1 Upstream-Status: Backport
3 From 593ddf4bb9dc3c4d97bdde8d087db42147511274 Mon Sep 17 00:00:00 2001
4 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
5 Date: Sat, 3 Mar 2012 16:56:13 +0000
6 Subject: [PATCH 1/2] configure: get rid of non-pkg-config ways to check for
10 configure.ac | 22 ++++++++++------------
11 1 file changed, 10 insertions(+), 12 deletions(-)
13 diff --git a/configure.ac b/configure.ac
14 index e5be3ed..3c2e341 100644
17 @@ -250,12 +250,11 @@ AG_GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
19 translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
20 AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
21 - PKG_CHECK_MODULES(AMRNB, opencore-amrnb, HAVE_AMRNB="yes",
22 - [ AG_GST_CHECK_LIBHEADER(AMRNB, opencore-amrnb,
23 - Decoder_Interface_init, $LIBM,
24 - opencore-amrnb/interf_dec.h,
25 - AMRNB_LIBS="-lopencore-amrnb")
27 + PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [
32 AC_SUBST(AMRNB_CFLAGS)
35 @@ -263,12 +262,11 @@ AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
36 dnl *** amr-wb dec ***
37 translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
38 AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
39 - PKG_CHECK_MODULES(AMRWB, opencore-amrwb, HAVE_AMRWB="yes",
40 - [ AG_GST_CHECK_LIBHEADER(AMRWB, opencore-amrwb,
42 - opencore-amrwb/dec_if.h,
43 - AMRWB_LIBS="-lopencore-amrwb")
45 + PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [
50 AC_SUBST(AMRWB_CFLAGS)