Add GSM full rate codec to LCR's source repository

[lcr.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 38eaec6..8a3cba3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl    Boston, MA 02110-1301, USA.
 dnl This keeps being the first instruction.
 dnl Change the 2nd argument if the version increases
 dnl 1st + 2nd argument is used for distribution package name
-AC_INIT(lcr, 1.11, andreas@eversberg.eu)
+AC_INIT(lcr, 1.14, andreas@eversberg.eu)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([main.c])
 AM_CONFIG_HEADER(config.h)
@@ -33,11 +33,12 @@ AM_CONFIG_HEADER(config.h)
 # fix warnings from autoconf + automake
 AC_GNU_SOURCE
 # AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE(lcr,1.11)
+AM_INIT_AUTOMAKE(lcr,1.14)
 
 
 
 # Checks for programs.
+AC_PROG_GREP
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_CC
@@ -90,60 +91,45 @@ AS_IF([test "x$with_asterisk" != xno],
       ])
 
 if test "x$with_asterisk" = "xyes"; then
+       dnl detect whether asterisk/indications.h defines ast_tone_zone_sound (1.6.2
+       dnl and later), ind_tone_zone_sound (1.6.0) or tone_zone_sound (1.4)
        ast_tone_zone_sound=
+       apc_test_result=
        ast_1_8_or_higher=
 
-       AC_MSG_CHECKING([for struct tone_zone_sound in asterisk/indications.h])
-       tzs_test_result=no
-       AC_COMPILE_IFELSE([
-               AC_LANG_PROGRAM(
-                       [[#include <asterisk.h>],
-                       [#include <asterisk/linkedlists.h>],
-                       [#include <asterisk/indications.h>]],
-                       [[struct tone_zone_sound * ts = NULL; (void) ts->data;]])],
-               [tzs_test_result=yes])
-       AC_MSG_RESULT([$tzs_test_result])
-
-       if test "x$tzs_test_result" = "xyes"; then
-               ast_tone_zone_sound=tone_zone_sound
-       fi
-
-       if test "x$ast_tone_zone_sound" = "x"; then
-               AC_MSG_CHECKING([for struct ast_tone_zone_sound in asterisk/indications.h])
-               tzs_test_result=no
-               AC_COMPILE_IFELSE([
-                       AC_LANG_PROGRAM(
-                               [[#include <asterisk.h>],
-                               [#include <asterisk/linkedlists.h>],
-                               [#include <asterisk/indications.h>]],
-                               [[struct ast_tone_zone_sound * ts = NULL; (void) ts->name;]])],
-                       [tzs_test_result=yes])
-               AC_MSG_RESULT([$tzs_test_result])
-
-               if test "x$tzs_test_result" = "xyes"; then
-                       ast_tone_zone_sound=ast_tone_zone_sound
-               fi
-       fi
+       AC_CHECK_TYPE([struct ast_tone_zone_sound],
+               [ast_tone_zone_sound=ast_tone_zone_sound], [], [
+#include <asterisk.h>
+#include <asterisk/linkedlists.h>
+#include <asterisk/indications.h>])
+
+       AS_IF([test "x$ast_tone_zone_sound" = "x"],
+               [AC_CHECK_TYPE([struct ind_tone_zone_sound],
+                       [ast_tone_zone_sound=ind_tone_zone_sound], [], [
+#include <asterisk.h>
+#include <asterisk/linkedlists.h>
+#include <asterisk/indications.h>])])
+       AS_IF([test "x$ast_tone_zone_sound" = "x"],
+               [AC_CHECK_TYPE([struct tone_zone_sound],
+                       [ast_tone_zone_sound=tone_zone_sound], [], [
+#include <asterisk.h>
+#include <asterisk/indications.h>])])
 
        if test "x$ast_tone_zone_sound" = "x"; then
                AC_MSG_FAILURE([No ast_tone_zone_sound, confused...])
        fi
 
-       AC_MSG_CHECKING([for struct ast_party_caller in asterisk/channel.h])
-       apc_test_result=no
-       AC_COMPILE_IFELSE([
-               AC_LANG_PROGRAM(
-                       [[#include <asterisk.h>],
-                       [#include <asterisk/channel.h>]],
-                       [[struct ast_party_caller * caller = NULL; (void) caller->id;]])],
-               [apc_test_result=yes])
-       AC_MSG_RESULT([$apc_test_result])
+
+       AC_CHECK_TYPE([struct ast_party_caller],
+               [apc_test_result=yes], [], [
+#include <asterisk.h>
+#include <asterisk/channel.h>])
 
        if test "x$apc_test_result" = "xyes"; then
                ast_1_8_or_higher="-DAST_1_8_OR_HIGHER"
        fi
 
-       AST_CFLAGS="-Dtone_zone_sound=$ast_tone_zone_sound $ast_1_8_or_higher"
+       AST_CFLAGS="-Dast_tone_zone_sound=$ast_tone_zone_sound $ast_1_8_or_higher"
 
        AC_SUBST([AST_CFLAGS])
 fi
@@ -197,15 +183,6 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" )
 
 AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes")
 
-AS_IF([test "x$with_gsm_bs" == xyes -o "x$with_gsm_ms" == xyes],
-       [AC_MSG_CHECKING(/usr/include/gsm/gsm.h)
-       if test -e /usr/include/gsm/gsm.h; then
-               AC_MSG_RESULT(yes)
-       else
-       AC_MSG_FAILURE([You have enabled GSM, but /usr/include/gsm/gsm.h not found! Please install the lossy GSM codec. Be sure to install it in /usr/ and not in /usr/local/. You will also find a copy on http://www.linux-call-router.de.])
-       fi
-       ])
-
 # check for ss5
 AC_ARG_WITH([ss5],
        [AS_HELP_STRING([--with-ss5],