From 11904d63bea8d361e6d1d3a77cc815f4d0812651 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Mon, 25 Jan 2016 20:00:26 +0000
Subject: [PATCH] amrnb, amrwb: unconditionally depend on opencore-amr*b >=
 0.1.3

We don't really need to cater for older versions any more.
---
 configure.ac            | 22 ++--------------------
 ext/amrnb/amrnbdec.h    |  4 ----
 ext/amrnb/amrnbenc.h    |  4 ----
 ext/amrwbdec/amrwbdec.h |  5 -----
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/configure.ac b/configure.ac
index d551697..d30c73a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,31 +277,13 @@ AG_GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
 dnl *** amr-nb ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
 AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
-  PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [
-    if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrnb; then
-      AC_DEFINE(HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrnb])
-    fi
-    HAVE_AMRNB="yes"
-  ], [
-    HAVE_AMRNB="no"
-  ])
-  AC_SUBST(AMRNB_CFLAGS)
-  AC_SUBST(AMRNB_LIBS)
+  AG_GST_PKG_CHECK_MODULES(AMRNB, opencore-amrnb >= 0.1.3)
 ])
 
 dnl *** amr-wb dec ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
 AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
-  PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [
-    if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrwb; then
-      AC_DEFINE(HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrwb])
-    fi
-    HAVE_AMRWB="yes"
-  ], [
-    HAVE_AMRWB="no"
-  ])
-  AC_SUBST(AMRWB_CFLAGS)
-  AC_SUBST(AMRWB_LIBS)
+  AG_GST_PKG_CHECK_MODULES(AMRWB, opencore-amrwb >= 0.1.3)
 ])
 
 dnl *** cdio ***
diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h
index 6bda1ef..f8407a2 100644
--- a/ext/amrnb/amrnbdec.h
+++ b/ext/amrnb/amrnbdec.h
@@ -23,11 +23,7 @@
 #include <gst/gst.h>
 #include <gst/audio/gstaudiodecoder.h>
 
-#ifdef HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
 #include <opencore-amrnb/interf_dec.h>
-#else
-#include <interf_dec.h>
-#endif
 
 G_BEGIN_DECLS
 
diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h
index f5345ff..9546a44 100644
--- a/ext/amrnb/amrnbenc.h
+++ b/ext/amrnb/amrnbenc.h
@@ -23,11 +23,7 @@
 #include <gst/gst.h>
 #include <gst/audio/gstaudioencoder.h>
 
-#ifdef HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
 #include <opencore-amrnb/interf_enc.h>
-#else
-#include <interf_enc.h>
-#endif
 
 G_BEGIN_DECLS
 
diff --git a/ext/amrwbdec/amrwbdec.h b/ext/amrwbdec/amrwbdec.h
index 478d599..059038a 100644
--- a/ext/amrwbdec/amrwbdec.h
+++ b/ext/amrwbdec/amrwbdec.h
@@ -23,13 +23,8 @@
 #include <gst/gst.h>
 #include <gst/audio/gstaudiodecoder.h>
 
-#ifdef HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER
 #include <opencore-amrwb/dec_if.h>
 #include <opencore-amrwb/if_rom.h>
-#else
-#include <dec_if.h>
-#include <if_rom.h>
-#endif
 
 G_BEGIN_DECLS
 
-- 
2.7.4