[svn-commits] qwell: branch qwell/pimp_my_sip-butnotwithpjproject r381767 - in /team/qwell/...

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Feb 19 13:11:21 2013
New Revision: 381767

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381767
Log:
Multiple revisions 381765-381766

........
  r381765 | qwell | 2013-02-19 13:09:01 -0600 (Tue, 19 Feb 2013) | 1 line
  
  Add pjmedia to build system.
........
  r381766 | qwell | 2013-02-19 13:09:28 -0600 (Tue, 19 Feb 2013) | 1 line
  
  bootstrap
........

Merged revisions 381765-381766 from http://svn.asterisk.org/svn/asterisk/team/qwell/pjsip-shared-libs

Modified:
    team/qwell/pimp_my_sip-butnotwithpjproject/   (props changed)
    team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in
    team/qwell/pimp_my_sip-butnotwithpjproject/configure
    team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac
    team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in
    team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in

Propchange: team/qwell/pimp_my_sip-butnotwithpjproject/
------------------------------------------------------------------------------
--- branchmerge (original)
+++ branchmerge Tue Feb 19 13:11:21 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-381583 /team/qwell/pjsip-shared-libs:1-381358,381360,381362-381393,381395-381417,381419-381439,381441-381460,381462-381500,381502-381538,381540-381554,381556-381561,381563-381573,381575-381583
+/team/group/pimp_my_sip:1-381583 /team/qwell/pjsip-shared-libs:1-381358,381360,381362-381393,381395-381417,381419-381439,381441-381460,381462-381500,381502-381538,381540-381554,381556-381561,381563-381573,381575-381583,381765-381766

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in?view=diff&rev=381767&r1=381766&r2=381767
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in Tue Feb 19 13:11:21 2013
@@ -46,6 +46,7 @@
 PGSQL=@PBX_PGSQL@
 PJLIB=@PBX_PJLIB@
 PJLIB_UTIL=@PBX_PJLIB_UTIL@
+PJMEDIA=@PBX_PJMEDIA@
 PJNATH=@PBX_PJNATH@
 PJSIP=@PBX_PJSIP@
 PJSIP_SIMPLE=@PBX_PJSIP_SIMPLE@

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac?view=diff&rev=381767&r1=381766&r2=381767
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac Tue Feb 19 13:11:21 2013
@@ -429,6 +429,7 @@
 AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
 AST_EXT_LIB_SETUP([PJLIB], [PJLIB], [pj])
 AST_EXT_LIB_SETUP([PJLIB_UTIL], [PJLIB-Util], [pjlib-util])
+AST_EXT_LIB_SETUP([PJMEDIA], [PJMEDIA], [pjmedia])
 AST_EXT_LIB_SETUP([PJNATH], [PJSIP NAT Helper], [pjnath])
 AST_EXT_LIB_SETUP([PJSIP], [PJSIP], [pjsip])
 AST_EXT_LIB_SETUP([PJSIP_SIMPLE], [PJSIP SIMPLE], [pjsip-simple])
@@ -1995,6 +1996,7 @@
 
 AST_EXT_LIB_CHECK([PJLIB], [pj], [pj_init], [pjlib.h])
 AST_EXT_LIB_CHECK([PJLIB_UTIL], [pjlib-util], [pjlib_util_init], [pjlib-util.h])
+AST_EXT_LIB_CHECK([PJMEDIA], [pjmedia], [pjmedia_session_create], [pjmedia.h])
 AST_EXT_LIB_CHECK([PJNATH], [pjnath], [pjnath_init], [pjnath.h])
 AST_EXT_LIB_CHECK([PJSIP], [pjsip], [pjsip_endpt_create], [pjsip.h])
 AST_EXT_LIB_CHECK([PJSIP_SIMPLE], [pjsip-simple], [pjsip_subscribe_method], [pjsip_simple.h])

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in?view=diff&rev=381767&r1=381766&r2=381767
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in Tue Feb 19 13:11:21 2013
@@ -556,6 +556,9 @@
 
 /* Define to 1 if you have the PJLIB-Util library. */
 #undef HAVE_PJLIB_UTIL
+
+/* Define to 1 if you have the PJMEDIA library. */
+#undef HAVE_PJMEDIA
 
 /* Define to 1 if you have the PJSIP NAT Helper library. */
 #undef HAVE_PJNATH

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in?view=diff&rev=381767&r1=381766&r2=381767
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in Tue Feb 19 13:11:21 2013
@@ -224,6 +224,9 @@
 PJLIB_UTIL_INCLUDE=@PJLIB_UTIL_INCLUDE@
 PJLIB_UTIL_LIB=@PJLIB_UTIL_LIB@
 
+PJMEDIA_INCLUDE=@PJMEDIA_INCLUDE@
+PJMEDIA_LIB=@PJMEDIA_LIB@
+
 PJNATH_INCLUDE=@PJNATH_INCLUDE@
 PJNATH_LIB=@PJNATH_LIB@