[gst-cvs] gst-plugins-ugly: amr: Use opencore-amr pkg-config files if possible

[Sebastian Dröge]

Module: gst-plugins-ugly
Branch: master
Commit: bd8df13ab02c38bb7a12e0ee07b16b05ff75f546
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=bd8df13ab02c38bb7a12e0ee07b16b05ff75f546

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Aug 17 17:31:10 2009 +0200

amr: Use opencore-amr pkg-config files if possible

This makes it possible to build the plugins when the libraries
are installed at non-standard locations.

Fixes bug #591348.

---

 configure.ac |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index b64271b..77e048a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,21 +234,27 @@ 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, [
-  AG_GST_CHECK_LIBHEADER(AMRNB, opencore-amrnb,
-		      Decoder_Interface_init, -lm,
-		      opencore-amrnb/interf_dec.h,
-		      AMRNB_LIBS="-lopencore-amrnb -lm"
-		      AC_SUBST(AMRNB_LIBS))
+  PKG_CHECK_MODULES(AMRNB, opencore-amrnb, HAVE_AMRNB="yes",
+      [ AG_GST_CHECK_LIBHEADER(AMRNB, opencore-amrnb,
+		           Decoder_Interface_init, -lm,
+		           opencore-amrnb/interf_dec.h,
+			   AMRNB_LIBS="-lopencore-amrnb")
+      ])
+  AC_SUBST(AMRNB_CFLAGS)
+  AC_SUBST(AMRNB_LIBS)
 ])
 
 dnl *** amr-wb dec ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
 AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
-  AG_GST_CHECK_LIBHEADER(AMRWB, opencore-amrwb,
-			D_IF_decode, ,
-			opencore-amrwb/dec_if.h,
-			AMRWB_LIBS="-lopencore-amrwb"
-			AC_SUBST(AMRWB_LIBS))
+  PKG_CHECK_MODULES(AMRWB, opencore-amrwb, HAVE_AMRWB="yes",
+      [ AG_GST_CHECK_LIBHEADER(AMRWB, opencore-amrwb,
+			   D_IF_decode, ,
+			   opencore-amrwb/dec_if.h,
+			   AMRWB_LIBS="-lopencore-amrwb")
+      ])
+  AC_SUBST(AMRWB_CFLAGS)
+  AC_SUBST(AMRWB_LIBS)
 ])
 
 dnl *** cdio ***