[asterisk-commits] qwell: branch qwell/pimp_my_sip-butnotwithpjproject r382861 - in /team/qwell/...

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Mar 12 12:14:51 2013
New Revision: 382861

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382861
Log:
Switch everything to pkg-config'd pjproject.

Modified:
    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

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=382861&r1=382860&r2=382861
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in Tue Mar 12 12:14:51 2013
@@ -45,9 +45,6 @@
 OSS=@PBX_OSS@
 PGSQL=@PBX_PGSQL@
 PJPROJECT=@PBX_PJPROJECT@
-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/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac?view=diff&rev=382861&r1=382860&r2=382861
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac Tue Mar 12 12:14:51 2013
@@ -428,9 +428,6 @@
 AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
 AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
 AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject])
-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,9 +1990,6 @@
 
 AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])
 
-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=382861&r1=382860&r2=382861
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in Tue Mar 12 12:14:51 2013
@@ -553,15 +553,6 @@
 
 /* Define if your system has the PJPROJECT libraries. */
 #undef HAVE_PJPROJECT
-
-/* 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=382861&r1=382860&r2=382861
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in Tue Mar 12 12:14:51 2013
@@ -221,24 +221,6 @@
 PJPROJECT_INCLUDE=@PJPROJECT_INCLUDE@
 PJPROJECT_LIB=@PJPROJECT_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@