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

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Feb 15 15:35:04 CST 2013 

Author: qwell
Date: Fri Feb 15 15:35:00 2013
New Revision: 381587

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381587
Log:
Multiple revisions 381360,381362,381569,381583

........
  r381360 | qwell | 2013-02-13 13:57:06 -0600 (Wed, 13 Feb 2013) | 2 lines
  
  Initial stab at adding pjsip to configure script.
........
  r381362 | qwell | 2013-02-13 15:24:00 -0600 (Wed, 13 Feb 2013) | 1 line
  
  Update configure script.
........
  r381569 | qwell | 2013-02-15 13:01:50 -0600 (Fri, 15 Feb 2013) | 2 lines
  
  Stop using pkg-config.  Split out pjlib/pjlib-util/pjnath, and lib check each.
........
  r381583 | qwell | 2013-02-15 15:22:53 -0600 (Fri, 15 Feb 2013) | 1 line
  
  Kill checkout of pjproject.
........

Merged revisions 381360,381362,381569,381583 from http://svn.asterisk.org/svn/asterisk/team/qwell/pjsip-shared-libs

Removed:
    team/qwell/pimp_my_sip-butnotwithpjproject/res/pjproject/
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
    team/qwell/pimp_my_sip-butnotwithpjproject/res/Makefile
    team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c

Propchange: team/qwell/pimp_my_sip-butnotwithpjproject/
------------------------------------------------------------------------------
--- branchmerge (original)
+++ branchmerge Fri Feb 15 15:35:00 2013
@@ -1,2 +1,1 @@
-/team/group/pimp_my_sip:1-381583
-/team/qwell/pjsip-shared-libs:1-381358
+/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

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=381587&r1=381586&r2=381587
==============================================================================
--- 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:35:00 2013
@@ -44,6 +44,9 @@
 OSPTK=@PBX_OSPTK@
 OSS=@PBX_OSS@
 PGSQL=@PBX_PGSQL@
+PJLIB=@PBX_PJLIB@
+PJLIB_UTIL=@PBX_PJLIB_UTIL@
+PJNATH=@PBX_PJNATH@
 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=381587&r1=381586&r2=381587
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac Fri Feb 15 15:35:00 2013
@@ -427,6 +427,9 @@
 AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
 AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
 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([PJNATH], [PJSIP NAT Helper], [pjnath])
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
@@ -1987,6 +1990,9 @@
    fi
 fi
 
+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([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=381587&r1=381586&r2=381587
==============================================================================
--- 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:35:00 2013
@@ -550,6 +550,15 @@
 
 /* Define to indicate presence of the pg_encoding_to_char API. */
 #undef HAVE_PGSQL_pg_encoding_to_char
+
+/* Define to 1 if you have the PJLIB library. */
+#undef HAVE_PJLIB
+
+/* Define to 1 if you have the PJLIB-Util library. */
+#undef HAVE_PJLIB_UTIL
+
+/* Define to 1 if you have the PJSIP NAT Helper library. */
+#undef HAVE_PJNATH
 
 /* 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=381587&r1=381586&r2=381587
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in Fri Feb 15 15:35:00 2013
@@ -218,6 +218,15 @@
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_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@
+
 POPT_INCLUDE=@POPT_INCLUDE@
 POPT_LIB=@POPT_LIB@
 

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/Makefile?view=diff&rev=381587&r1=381586&r2=381587
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/Makefile (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/Makefile Fri Feb 15 15:35:00 2013
@@ -44,7 +44,7 @@
 ael/ael_lex.o ael/ael.tab.o ael/pval.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ael_share)
 
 $(if $(filter res_sip,$(EMBEDDED_MODS)),modules.link,res_sip.so): $(subst .c,.o,$(wildcard res_sip/*.c))
-$(subst .c,.o,$(wildcard res_sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_sip) $(PJ_CFLAGS)
+$(subst .c,.o,$(wildcard res_sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_sip)
 
 ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ael/ael_lex.c: ael/ael.flex
@@ -70,35 +70,4 @@
 ael/pval.o: ael/pval.c
 
 clean::
-	@if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
 	rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i res_sip/*.o res_sip/*.i
-
-dist-clean::
-	rm -f pjproject/build.mak
-
-pjproject/build.mak: pjproject/aconfigure
-	(cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --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)
-
-ifneq ($(findstring $(MAKECMDGOALS),all),)
--include pjproject/build.mak
-endif
-
-.PHONY: FORCE
-FORCE:
-
-$(PJ_LIB_FILES): FORCE
-	$(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
-
-res_rtp_asterisk.o: $(PJ_LIB_FILES)
-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
-
-res_sip/%.o: $(PJ_LIB_FILES)
-
-res_sip.o: $(PJ_LIB_FILES)
-res_sip.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-res_sip.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
-res_sip.so: LIBS+=-Wl,--whole-archive $(PJ_LDLIBS) -Wl,--no-whole-archive
-
-res_sip_%.o: _ASTCFLAGS+=$(PJ_CFLAGS)

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c?view=diff&rev=381587&r1=381586&r2=381587
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c Fri Feb 15 15:35:00 2013
@@ -29,6 +29,9 @@
  */
 
 /*** MODULEINFO
+	<depend>pjlib</depend>
+	<depend>pjlib_util</depend>
+	<depend>pjnath</depend>
 	<support_level>core</support_level>
  ***/

More information about the asterisk-commits mailing list