X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=configure;h=4c24728844cbd596d67bf8fb175929d628792fc8;hp=6ac36cb0addbb7adc0260e057f62cc5a1193a441;hb=da91d7d85fe092122e35ece52695f98345738359;hpb=fc6a1a6e99c90e47a998d56f852c7db29f44dc35;ds=sidebyside

diff --git a/configure b/configure
index 6ac36cb..4c24728 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for lcr 1.7.
+# Generated by GNU Autoconf 2.65 for lcr 1.8.
 #
 # Report bugs to <andreas@eversberg.eu>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='lcr'
 PACKAGE_TARNAME='lcr'
-PACKAGE_VERSION='1.7'
-PACKAGE_STRING='lcr 1.7'
+PACKAGE_VERSION='1.8'
+PACKAGE_STRING='lcr 1.8'
 PACKAGE_BUGREPORT='andreas@eversberg.eu'
 PACKAGE_URL=''
 
@@ -1260,7 +1260,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures lcr 1.7 to adapt to many kinds of systems.
+\`configure' configures lcr 1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1326,7 +1326,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of lcr 1.7:";;
+     short | recursive ) echo "Configuration of lcr 1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1430,7 +1430,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-lcr configure 1.7
+lcr configure 1.8
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1893,7 +1893,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by lcr $as_me 1.7, which was
+It was created by lcr $as_me 1.8, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -4022,7 +4022,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=lcr
- VERSION=1.7
+ VERSION=1.8
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5326,6 +5326,7 @@ fi
 
 if test "x$with_asterisk" = "xyes"; then
 	ast_tone_zone_sound=
+	ast_1_8_or_higher=
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct tone_zone_sound in asterisk/indications.h" >&5
 $as_echo_n "checking for struct tone_zone_sound in asterisk/indications.h... " >&6; }
@@ -5392,7 +5393,35 @@ as_fn_error "No ast_tone_zone_sound, confused...
 See \`config.log' for more details." "$LINENO" 5; }
 	fi
 
-	AST_CFLAGS="-Dtone_zone_sound=$ast_tone_zone_sound"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ast_party_caller in asterisk/channel.h" >&5
+$as_echo_n "checking for struct ast_party_caller in asterisk/channel.h... " >&6; }
+	apc_test_result=no
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#include <asterisk.h>,
+			#include <asterisk/channel.h>
+int
+main ()
+{
+struct ast_party_caller * caller = NULL; (void) caller->id;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  apc_test_result=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apc_test_result" >&5
+$as_echo "$apc_test_result" >&6; }
+
+	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"
+
 
 fi
 
@@ -5493,7 +5522,7 @@ fi
 if test "x$with_gsm_bs" != xno; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking openbsc/include/openbsc/gsm_data.h" >&5
 $as_echo_n "checking openbsc/include/openbsc/gsm_data.h... " >&6; }
-       if test -d openbsc/include/openbsc/gsm_data.h; then
+       if test -e openbsc/include/openbsc/gsm_data.h; then
 		with_gsm_bs="yes"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -5502,6 +5531,9 @@ $as_echo "yes" >&6; }
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "--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
 See \`config.log' for more details." "$LINENO" 5; }
+       else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        fi
 
 fi
@@ -5526,17 +5558,20 @@ fi
 
 
 if test "x$with_gsm_ms" != xno; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking layer23/include/osmocom/osmocom_data.h" >&5
-$as_echo_n "checking layer23/include/osmocom/osmocom_data.h... " >&6; }
-       if test -d layer23/include/osmocom/osmocom_data.h; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking layer23/include/osmocom/bb/common/osmocom_data.h" >&5
+$as_echo_n "checking layer23/include/osmocom/bb/common/osmocom_data.h... " >&6; }
+       if test -e layer23/include/osmocom/bb/common/osmocom_data.h; then
 		with_gsm_ms="yes"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-       elif test "x$with_gsm_bs" != xcheck ; then
+       elif test "x$with_gsm_ms" != xcheck ; then
 		{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "--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
+as_fn_error "--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
 See \`config.log' for more details." "$LINENO" 5; }
+       else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        fi
 
 fi
@@ -7676,7 +7711,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by lcr $as_me 1.7, which was
+This file was extended by lcr $as_me 1.8, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7742,7 +7777,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-lcr config.status 1.7
+lcr config.status 1.8
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"