diff --git a/configure.ac b/configure.ac
index b64271b07c..77e048ad65 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 ***