diff options
author | Joshua Colp <jcolp@digium.com> | 2013-12-03 18:01:36 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2013-12-03 18:01:36 +0000 |
commit | b8025e789de01ffa20214499e57b017db1f91f03 (patch) | |
tree | 2c13f7db3f8798468285f3142c763a680e32eb0c /configure | |
parent | 3357c494cb21f24b7185ee3b255bc0cd72d48a55 (diff) |
res_pjsip_session: Add support for PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE flag.
Newer versions of PJSIP have changed to using a flag for the
PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE instead of a define. This adds a
configure check to detect the presence of the flag and use it if found.
........
Merged revisions 403329 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 64 |
1 files changed, 63 insertions, 1 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 402865 . +# From configure.ac Revision: 403161 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for asterisk trunk. # @@ -899,6 +899,10 @@ PBX_PORTAUDIO PORTAUDIO_DIR PORTAUDIO_INCLUDE PORTAUDIO_LIB +PBX_PJSIP_REPLACE_MEDIA_STREAM +PJSIP_REPLACE_MEDIA_STREAM_DIR +PJSIP_REPLACE_MEDIA_STREAM_INCLUDE +PJSIP_REPLACE_MEDIA_STREAM_LIB PBX_PJ_TRANSACTION_GRP_LOCK PJ_TRANSACTION_GRP_LOCK_DIR PJ_TRANSACTION_GRP_LOCK_INCLUDE @@ -10167,6 +10171,18 @@ PBX_PJ_TRANSACTION_GRP_LOCK=0 +PJSIP_REPLACE_MEDIA_STREAM_DESCRIP="PJSIP Media Stream Replacement Support" +PJSIP_REPLACE_MEDIA_STREAM_OPTION=pjsip +PJSIP_REPLACE_MEDIA_STREAM_DIR=${PJPROJECT_DIR} + +PBX_PJSIP_REPLACE_MEDIA_STREAM=0 + + + + + + + PORTAUDIO_DESCRIP="PortAudio" PORTAUDIO_OPTION="portaudio" PBX_PORTAUDIO=0 @@ -23738,6 +23754,52 @@ fi + if test "x${PBX_PJSIP_REPLACE_MEDIA_STREAM}" != "x1" -a "${USE_PJSIP_REPLACE_MEDIA_STREAM}" != "no"; then + if test "x" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5 +$as_echo_n "checking for ... " >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5 +$as_echo_n "checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h... " >&6; } + fi + saved_cppflags="${CPPFLAGS}" + if test "x${PJSIP_REPLACE_MEDIA_STREAM_DIR}" != "x"; then + PJSIP_REPLACE_MEDIA_STREAM_INCLUDE="-I${PJSIP_REPLACE_MEDIA_STREAM_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${PJSIP_REPLACE_MEDIA_STREAM_INCLUDE}" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include <pjmedia.h> +int +main () +{ + pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + PBX_PJSIP_REPLACE_MEDIA_STREAM=1 + +$as_echo "#define HAVE_PJSIP_REPLACE_MEDIA_STREAM 1" >>confdefs.h + + + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + + if test "x${PBX_POPT}" != "x1" -a "${USE_POPT}" != "no"; then pbxlibdir="" # if --with-POPT=DIR has been specified, use it. |