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

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Feb 15 15:42:46 CST 2013 

Author: qwell
Date: Fri Feb 15 15:42:43 2013
New Revision: 381588

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381588
Log:
Add pjsip to configure script.  Give a few modules some dependencies.

Modified:
    team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in
    team/qwell/pimp_my_sip-butnotwithpjproject/channels/Makefile
    team/qwell/pimp_my_sip-butnotwithpjproject/channels/chan_gulp.c
    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
    team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip.c
    team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_rfc3326.c
    team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_session.c

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=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in Fri Feb 15 15:42:43 2013
@@ -47,6 +47,9 @@
 PJLIB=@PBX_PJLIB@
 PJLIB_UTIL=@PBX_PJLIB_UTIL@
 PJNATH=@PBX_PJNATH@
+PJSIP=@PBX_PJSIP@
+PJSIP_SIMPLE=@PBX_PJSIP_SIMPLE@
+PJSIP_UA=@PBX_PJSIP_UA@
 POPT=@PBX_POPT@
 PORTAUDIO=@PBX_PORTAUDIO@
 PRI=@PBX_PRI@

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/channels/Makefile?view=diff&rev=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/channels/Makefile (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/channels/Makefile Fri Feb 15 15:42:43 2013
@@ -114,10 +114,3 @@
 h323/libchanh323.a: h323/Makefile.ast
 	$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
 
-../res/pjproject/build.mak:
-	cd ../res/pjproject && ./configure AR="" CFLAGS=-fPIC  --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec
-
-include ../res/pjproject/build.mak
-
-chan_gulp.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/channels/chan_gulp.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/channels/chan_gulp.c?view=diff&rev=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/channels/chan_gulp.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/channels/chan_gulp.c Fri Feb 15 15:42:43 2013
@@ -26,6 +26,8 @@
  */
 
 /*** MODULEINFO
+	<depend>pjsip</depend>
+	<depend>pjsip_ua</depend>
 	<depend>res_sip</depend>
 	<depend>res_sip_session</depend>
 	<support_level>core</support_level>

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=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac Fri Feb 15 15:42:43 2013
@@ -430,6 +430,9 @@
 AST_EXT_LIB_SETUP([PJLIB], [PJLIB], [pj])
 AST_EXT_LIB_SETUP([PJLIB_UTIL], [PJLIB-Util], [pjlib-util])
 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])
+AST_EXT_LIB_SETUP([PJSIP_UA], [PJSIP UA], [pjsip-ua])
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
@@ -1993,6 +1996,9 @@
 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([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])
+AST_EXT_LIB_CHECK([PJSIP_UA], [pjsip-ua], [pjsip_inv_usage_init], [pjsip_ua.h])
 AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
 
 AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.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=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in Fri Feb 15 15:42:43 2013
@@ -559,6 +559,15 @@
 
 /* Define to 1 if you have the PJSIP NAT Helper library. */
 #undef HAVE_PJNATH
+
+/* Define to 1 if you have the PJSIP library. */
+#undef HAVE_PJSIP
+
+/* Define to 1 if you have the PJSIP SIMPLE library. */
+#undef HAVE_PJSIP_SIMPLE
+
+/* Define to 1 if you have the PJSIP UA library. */
+#undef HAVE_PJSIP_UA
 
 /* Define to 1 if your system defines IP_PKTINFO. */
 #undef HAVE_PKTINFO

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=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in Fri Feb 15 15:42:43 2013
@@ -227,6 +227,24 @@
 PJNATH_INCLUDE=@PJNATH_INCLUDE@
 PJNATH_LIB=@PJNATH_LIB@
 
+PJLIB_INCLUDE=@PJLIB_INCLUDE@
+PJLIB_LIB=@PJLIB_LIB@
+
+PJLIB_UTIL_INCLUDE=@PJLIB_UTIL_INCLUDE@
+PJLIB_UTIL_LIB=@PJLIB_UTIL_LIB@
+
+PJNATH_INCLUDE=@PJNATH_INCLUDE@
+PJNATH_LIB=@PJNATH_LIB@
+
+PJSIP_INCLUDE=@PJSIP_INCLUDE@
+PJSIP_LIB=@PJSIP_LIB@
+
+PJSIP_SIMPLE_INCLUDE=@PJSIP_SIMPLE_INCLUDE@
+PJSIP_SIMPLE_LIB=@PJSIP_SIMPLE_LIB@
+
+PJSIP_UA_INCLUDE=@PJSIP_UA_INCLUDE@
+PJSIP_UA_LIB=@PJSIP_UA_LIB@
+
 POPT_INCLUDE=@POPT_INCLUDE@
 POPT_LIB=@POPT_LIB@
 

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip.c?view=diff&rev=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip.c Fri Feb 15 15:42:43 2013
@@ -38,6 +38,7 @@
 #include "asterisk/sorcery.h"
 
 /*** MODULEINFO
+	<depend>pjsip_simple</depend>
 	<depend>res_sorcery_config</depend>
 	<support_level>core</support_level>
  ***/

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_rfc3326.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_rfc3326.c?view=diff&rev=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_rfc3326.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_rfc3326.c Fri Feb 15 15:42:43 2013
@@ -17,6 +17,7 @@
  */
 
 /*** MODULEINFO
+	<depend>pjsip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_session.c?view=diff&rev=381588&r1=381587&r2=381588
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_session.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/res_sip_session.c Fri Feb 15 15:42:43 2013
@@ -17,6 +17,7 @@
 */
 
 /*** MODULEINFO
+	<depend>pjsip_ua</depend>
 	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/

More information about the svn-commits mailing list