Bump version to 1.11

[lcr.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7bd5d87..0c7e67d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@
 dnl    This file is part of linux-call-router
 dnl    Copyright (C) 2007 Joerg Habenicht (j.habenicht@gmx.de)
 dnl    Copyright (C) 2008 Peter Schlaile (peter -at- schlaile.de)
+dnl    Copyright (C) 2010 Andreas Eversberg (jolly@eversberg.eu)
 
 dnl    This program is free software; you can redistribute it and/or
 dnl    modify it under the terms of the GNU General Public License as
@@ -24,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.7, andreas@eversberg.eu)
+AC_INIT(lcr, 1.11, andreas@eversberg.eu)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([main.c])
 AM_CONFIG_HEADER(config.h)
@@ -32,7 +33,7 @@ AM_CONFIG_HEADER(config.h)
 # fix warnings from autoconf + automake
 AC_GNU_SOURCE
 # AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE(lcr,1.7)
+AM_INIT_AUTOMAKE(lcr,1.11)
 
 
 
@@ -70,6 +71,7 @@ AS_IF([test "x$with_asterisk" != xno],
 
 if test "x$with_asterisk" = "xyes"; then
        ast_tone_zone_sound=
+       ast_1_8_or_higher=
 
        AC_MSG_CHECKING([for struct tone_zone_sound in asterisk/indications.h])
        tzs_test_result=no
@@ -107,7 +109,22 @@ if test "x$with_asterisk" = "xyes"; then
                AC_MSG_FAILURE([No ast_tone_zone_sound, confused...])
        fi
 
-       AST_CFLAGS="-Dtone_zone_sound=$ast_tone_zone_sound"
+       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])
+
+       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"
+
        AC_SUBST([AST_CFLAGS])
 fi
 
@@ -141,45 +158,34 @@ AS_IF([test "x$with_ssl" != xno],
 # check for gsm-bs
 AC_ARG_WITH([gsm-bs],
        [AS_HELP_STRING([--with-gsm-bs],
-                       [compile with OpenBSC support @<:@default=check@:>@])
+                       [compile with OpenBSC support @<:@default=no@:>@])
        ],
        [],
        [with_gsm_bs="check"])
 
-AS_IF([test "x$with_gsm_bs" != xno],
-      [AC_CHECK_FILE([openbsc/include/openbsc/gsm_data.h],
-                       [with_gsm_bs="yes"],
-                       [if test "x$with_gsm_bs" != xcheck ; then
-                         AC_MSG_FAILURE(
-                           [--with-gsm-bs was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC and libosmocore source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ openbsc ; ln -s patch_to_libosmocore libosmocore])
-                     fi
-                    ])
-      ])
-
 AM_CONDITIONAL(ENABLE_GSM_BS, test "x$with_gsm_bs" == "xyes" )
 
 # check for gsm-ms
 AC_ARG_WITH([gsm-ms],
        [AS_HELP_STRING([--with-gsm-ms],
-                       [compile with Osmocom-bb support @<:@default=check@:>@])
+                       [compile with Osmocom-bb support @<:@default=no@:>@])
        ],
        [],
        [with_gsm_ms="check"])
 
-AS_IF([test "x$with_gsm_ms" != xno],
-      [AC_CHECK_FILE([layer23/include/osmocom/osmocom_data.h],
-                       [with_gsm_ms="yes"],
-                       [if test "x$with_gsm_ms" != xcheck ; then
-                         AC_MSG_FAILURE(
-                           [--with-gsm-ms was given, but osmocom-bb/include/osmocom/osmocom_data.h was not found! Pleas link Osmocom-BB and libosmocore source directory to LCR source directory: ln -s path_to_osmocom-bb/src/host/layer23/ layer23 ; ln -s path_to_libosmocore libosmocore])
-                     fi
-                    ])
-      ])
-
 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],
@@ -225,3 +231,10 @@ AC_CHECK_FUNCS([gettimeofday memmove memset mkdir socket strcasecmp strchr strer
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
+
+
+AS_IF([test "x$with_gsm_bs" == xyes],[AC_MSG_NOTICE( Compiled with GSM network side support )],[AC_MSG_NOTICE( Not compiled with GSM network side support)])
+AS_IF([test "x$with_gsm_ms" == xyes],[AC_MSG_NOTICE( Compiled with GSM mobile side support )],[AC_MSG_NOTICE( Not compiled with GSM mobile side support)])
+AS_IF([test "x$with_asterisk" == xyes],[AC_MSG_NOTICE( Compiled with Asterisk channel driver support )],[AC_MSG_NOTICE( Not compiled with Asterisk channel driver support)])
+AS_IF([test "x$with_ss5" == xyes],[AC_MSG_NOTICE( Compiled with CCITT No.5 support )],[AC_MSG_NOTICE( Not compiled with CCITT No.5 support)])
+