X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=configure.ac;h=cf41b2c34007f6224e2c548b23df658870e77928;hp=f0c60c277117ba31e96c7ffe6191703589f9f2e6;hb=ad6182c219d7787dd1ded5645af17100b67f53e9;hpb=4bb07fd2de15008f85c9ee4e65936bb944f5fb5c

diff --git a/configure.ac b/configure.ac
index f0c60c2..cf41b2c 100644
--- 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.9, 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.9)
 
 
 
@@ -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
 
@@ -148,11 +165,13 @@ AC_ARG_WITH([gsm-bs],
 
 AS_IF([test "x$with_gsm_bs" != xno],
       [AC_MSG_CHECKING(openbsc/include/openbsc/gsm_data.h)
-       if test -d openbsc/include/openbsc/gsm_data.h; then
+       if test -e openbsc/include/openbsc/gsm_data.h; then
 		with_gsm_bs="yes"
 		AC_MSG_RESULT(yes)
        elif 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! Please link OpenBSC and libosmocore source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ openbsc ; ln -s patch_to_libosmocore libosmocore])
+       else
+		AC_MSG_RESULT(no)
        fi
       ])
 
@@ -167,12 +186,14 @@ AC_ARG_WITH([gsm-ms],
 	[with_gsm_ms="check"])
 
 AS_IF([test "x$with_gsm_ms" != xno],
-      [AC_MSG_CHECKING(layer23/include/osmocom/osmocom_data.h)
-       if test -d layer23/include/osmocom/osmocom_data.h; then
+      [AC_MSG_CHECKING(layer23/include/osmocom/bb/common/osmocom_data.h)
+       if test -e layer23/include/osmocom/bb/common/osmocom_data.h; then
 		with_gsm_ms="yes"
 		AC_MSG_RESULT(yes)
-       elif test "x$with_gsm_bs" != xcheck ; then
-		AC_MSG_FAILURE([--with-gsm-ms was given, but layer23/include/osmocom/osmocom_data.h was not found! Please 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])
+       elif test "x$with_gsm_ms" != xcheck ; then
+		AC_MSG_FAILURE([--with-gsm-ms was given, but layer23/include/osmocom/bb/common/osmocom_data.h was not found! Please 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])
+       else
+		AC_MSG_RESULT(no)
        fi
       ])