FS-9670: just use pkg-config to locate amr libs and add debian requirements

diff --git a/configure.ac b/configure.ac
index 6e3b1f9d16ba2757c9b018ce11a0d28a7861bbc2..539ab5d385809c6092963353c781c2214a9c77bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -829,6 +829,10 @@ PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
   AM_CONDITIONAL([HAVE_MPG123],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
 
+PKG_CHECK_MODULES([AMR], [opencore-amrnb >= 0.1.0],[
+               AM_CONDITIONAL([HAVE_AMR],[true])],[
+               AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AMR],[false])])
+
 AC_CHECK_LIB(apr-1, apr_pool_mutex_set, use_system_apr=yes, use_system_apr=no)
 AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
 AC_CHECK_LIB(aprutil-1, apr_queue_pop_timeout, use_system_aprutil=yes, use_system_aprutil=no)
@@ -1926,17 +1930,6 @@ AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
 AM_CONDITIONAL(ISFREEBSD, [test `uname -s` = FreeBSD])
 AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64])
 
-AC_ARG_ENABLE(amr,
-[AC_HELP_STRING([--disable-amr],[build without opencore-amrnb])],[enable_amr="$enable_amr"],[enable_amr="yes"])
-
-if test x"$enable_amr" = x"yes" ; then
-       PKG_CHECK_MODULES([AMR], [opencore-amrnb >= 0.1.0],[
-               AM_CONDITIONAL([HAVE_AMR],[true])],[
-               AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AMR],[false])])
-else
-       AM_CONDITIONAL([HAVE_AMR],[false])
-fi
-
 AM_CONDITIONAL(HAVE_AMRWB, [ test -d ${switch_srcdir}/libs/amrwb ])
 AM_CONDITIONAL(HAVE_G723_1, [ test -d ${switch_srcdir}/libs/libg723_1 ])
 AM_CONDITIONAL(HAVE_G729, [ test -d ${switch_srcdir}/libs/libg729 ])

diff --git a/debian/control-modules b/debian/control-modules
index 575980319746d6e6a9fed31bf855d04daaea0ace..fc87d47c05ea14478a38b3dd468eccfef77c3bb3 100644 (file)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -291,6 +291,7 @@ Description: mod_unimrcp
 Module: codecs/mod_amr
 Description: mod_amr
  Adds mod_amr.
+Build-Depends: libopencore-amrnb-dev
 
 Module: codecs/mod_amrwb
 Description: mod_amrwb