[asterisk-commits] branch oej/securertp-trunk r34786 - in
/team/oej/securertp-trunk: ./ build_to...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jun 19 02:36:50 MST 2006
Author: oej
Date: Mon Jun 19 04:36:50 2006
New Revision: 34786
URL: http://svn.digium.com/view/asterisk?rev=34786&view=rev
Log:
Update
Modified:
team/oej/securertp-trunk/Makefile
team/oej/securertp-trunk/build_tools/menuselect.c
team/oej/securertp-trunk/configure
Modified: team/oej/securertp-trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/Makefile?rev=34786&r1=34785&r2=34786&view=diff
==============================================================================
--- team/oej/securertp-trunk/Makefile (original)
+++ team/oej/securertp-trunk/Makefile Mon Jun 19 04:36:50 2006
@@ -415,9 +415,6 @@
db1-ast/libdb1.a:
$(MAKE) -C db1-ast libdb1.a
-
-res_srtp.so: res_srtp.o
- $(CC) $(SOLINK) -o $@ $(CFLAGS) $(SRTP_INCLUDE) $< $(SRTP_LIB)
res_srtp.so: res_srtp.o
$(CC) $(SOLINK) -o $@ $(CFLAGS) $(SRTP_INCLUDE) $< $(SRTP_LIB)
Modified: team/oej/securertp-trunk/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/build_tools/menuselect.c?rev=34786&r1=34785&r2=34786&view=diff
==============================================================================
--- team/oej/securertp-trunk/build_tools/menuselect.c (original)
+++ team/oej/securertp-trunk/build_tools/menuselect.c Mon Jun 19 04:36:50 2006
@@ -24,18 +24,18 @@
* \brief A menu-driven system for Asterisk module selection
*/
+#include "asterisk.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "asterisk.h"
-
#include "mxml/mxml.h"
#include "menuselect.h"
#include "asterisk/linkedlists.h"
+#include "asterisk/utils.h"
#undef MENUSELECT_DEBUG
@@ -517,7 +517,7 @@
had_changes = 1;
if (mem->remove_on_change) {
- for (buf = strdupa(mem->remove_on_change), file = strsep(&buf, " ");
+ for (buf = ast_strdupa(mem->remove_on_change), file = strsep(&buf, " ");
file;
file = strsep(&buf, " "))
unlink(file);
@@ -525,7 +525,7 @@
}
if (cat->remove_on_change && had_changes) {
- for (buf = strdupa(cat->remove_on_change), file = strsep(&buf, " ");
+ for (buf = ast_strdupa(cat->remove_on_change), file = strsep(&buf, " ");
file;
file = strsep(&buf, " "))
unlink(file);
Modified: team/oej/securertp-trunk/configure
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/configure?rev=34786&r1=34785&r2=34786&view=diff
==============================================================================
--- team/oej/securertp-trunk/configure (original)
+++ team/oej/securertp-trunk/configure Mon Jun 19 04:36:50 2006
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 33953 .
+# From configure.ac Revision: 34062 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59e.
+# Generated by GNU Autoconf 2.59d.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -751,6 +751,9 @@
ZLIB_LIB
ZLIB_INCLUDE
PBX_LIBZLIB
+SRTP_LIB
+SRTP_INCLUDE
+PBX_LIBSRTP
EDITLINE_LIBS
OSS_LIB
OSS_INCLUDE
@@ -1406,6 +1409,7 @@
--with-tinfo=PATH use Term Info files in PATH
--with-vorbis=PATH use Vorbis files in PATH
--with-z=PATH use zlib files in PATH
+ --with-srtp=PATH use libSRTP files in PATH
--with-ossaudio=PATH use Open Sound System files in PATH
--with-tonezone=PATH use Zaptel files in PATH
--with-gsm=PATH use libgsm files in PATH, or 'internal'
@@ -1491,7 +1495,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.59e
+generated by GNU Autoconf 2.59d
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1507,7 +1511,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.59e. Invocation command line was
+generated by GNU Autoconf 2.59d. Invocation command line was
$ $0 $@
@@ -15421,6 +15425,478 @@
+
+# Check whether --with-srtp was given.
+if test "${with_srtp+set}" = set; then
+ withval=$with_srtp;
+case ${withval} in
+ n|no)
+ USE_SRTP=no
+ ;;
+ y|ye|yes)
+ SRTP_MANDATORY="yes"
+ ;;
+ *)
+ SRTP_DIR="${withval}"
+ SRTP_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+
+PBX_LIBSRTP=0
+
+if test "${USE_SRTP}" != "no"; then
+ pbxlibdir=""
+ if test "x${SRTP_DIR}" != "x"; then
+ pbxlibdir="-L${srtp_DIR}/lib"
+ fi
+ { echo "$as_me:$LINENO: checking for srtp_init in -lsrtp" >&5
+echo $ECHO_N "checking for srtp_init in -lsrtp... $ECHO_C" >&6; }
+if test "${ac_cv_lib_srtp_srtp_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsrtp ${pbxlibdir} $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char srtp_init ();
+int
+main ()
+{
+return srtp_init ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_srtp_srtp_init=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_srtp_srtp_init=no
+fi
+
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_srtp_srtp_init" >&5
+echo "${ECHO_T}$ac_cv_lib_srtp_srtp_init" >&6; }
+if test $ac_cv_lib_srtp_srtp_init = yes; then
+ AST_SRTP_FOUND=yes
+else
+ AST_SRTP_FOUND=no
+fi
+
+
+ if test "${AST_SRTP_FOUND}" = "yes"; then
+ SRTP_LIB="-lsrtp "
+ SRTP_HEADER_FOUND="1"
+ if test "x${SRTP_DIR}" != "x"; then
+ SRTP_LIB="${pbxlibdir} ${SRTP_LIB}"
+ SRTP_INCLUDE="-I${SRTP_DIR}/include"
+ if test "xsrtp/srtp.h" != "x" ; then
+ as_ac_Header=`echo "ac_cv_header_${SRTP_DIR}/include/srtp/srtp.h" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for ${SRTP_DIR}/include/srtp/srtp.h" >&5
+echo $ECHO_N "checking for ${SRTP_DIR}/include/srtp/srtp.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking ${SRTP_DIR}/include/srtp/srtp.h usability" >&5
+echo $ECHO_N "checking ${SRTP_DIR}/include/srtp/srtp.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${SRTP_DIR}/include/srtp/srtp.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking ${SRTP_DIR}/include/srtp/srtp.h presence" >&5
+echo $ECHO_N "checking ${SRTP_DIR}/include/srtp/srtp.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <${SRTP_DIR}/include/srtp/srtp.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${SRTP_DIR}/include/srtp/srtp.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for ${SRTP_DIR}/include/srtp/srtp.h" >&5
+echo $ECHO_N "checking for ${SRTP_DIR}/include/srtp/srtp.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ SRTP_HEADER_FOUND=1
+else
+ SRTP_HEADER_FOUND=0
+fi
+
+
+ fi
+ else
+ if test "xsrtp/srtp.h" != "x" ; then
+ if test "${ac_cv_header_srtp_srtp_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for srtp/srtp.h" >&5
+echo $ECHO_N "checking for srtp/srtp.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_srtp_srtp_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_srtp_srtp_h" >&5
+echo "${ECHO_T}$ac_cv_header_srtp_srtp_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking srtp/srtp.h usability" >&5
+echo $ECHO_N "checking srtp/srtp.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <srtp/srtp.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking srtp/srtp.h presence" >&5
+echo $ECHO_N "checking srtp/srtp.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <srtp/srtp.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: srtp/srtp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: srtp/srtp.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: srtp/srtp.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: srtp/srtp.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: srtp/srtp.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: srtp/srtp.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: srtp/srtp.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: srtp/srtp.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: srtp/srtp.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for srtp/srtp.h" >&5
+echo $ECHO_N "checking for srtp/srtp.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_srtp_srtp_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_srtp_srtp_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_srtp_srtp_h" >&5
+echo "${ECHO_T}$ac_cv_header_srtp_srtp_h" >&6; }
+
+fi
+if test $ac_cv_header_srtp_srtp_h = yes; then
+ SRTP_HEADER_FOUND=1
+else
+ SRTP_HEADER_FOUND=0
+fi
+
+
+ fi
+ fi
+ if test "x${SRTP_HEADER_FOUND}" = "x0" ; then
+ if test ! -z "${SRTP_MANDATORY}" ;
+ then
+ echo " ***"
+ echo " *** It appears that you do not have the srtp development package installed."
+ echo " *** Please install it to include libSRTP support, or re-run configure"
+ echo " *** without explicitly specifying --with-srtp"
+ exit 1
+ fi
+ SRTP_LIB=""
+ SRTP_INCLUDE=""
+ PBX_LIBSRTP=0
+ else
+ PBX_LIBSRTP=1
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SRTP 1
+_ACEOF
+
+ fi
+ elif test ! -z "${SRTP_MANDATORY}";
+ then
+ echo "***"
+ echo "*** The libSRTP installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** without explicity specifying --with-srtp"
+ exit 1
+ fi
+fi
+
+
+
+
+
EDITLINE_LIBS=""
if test "x$TERMCAP_LIB" != "x" ; then
EDITLINE_LIBS="$TERMCAP_LIB"
@@ -26769,7 +27245,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59e. Invocation command line was
+generated by GNU Autoconf 2.59d. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -26818,7 +27294,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59e,
+configured by $0, generated by GNU Autoconf 2.59d,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -27179,6 +27655,9 @@
ZLIB_LIB!$ZLIB_LIB$ac_delim
ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
PBX_LIBZLIB!$PBX_LIBZLIB$ac_delim
+SRTP_LIB!$SRTP_LIB$ac_delim
+SRTP_INCLUDE!$SRTP_INCLUDE$ac_delim
+PBX_LIBSRTP!$PBX_LIBSRTP$ac_delim
EDITLINE_LIBS!$EDITLINE_LIBS$ac_delim
OSS_LIB!$OSS_LIB$ac_delim
OSS_INCLUDE!$OSS_INCLUDE$ac_delim
@@ -27223,7 +27702,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -27242,7 +27721,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -27255,8 +27734,6 @@
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
@@ -27504,7 +27981,7 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
More information about the asterisk-commits
mailing list