[asterisk-commits] qwell: branch qwell/pjsip-shared-libs r381360 - in /team/qwell/pjsip-shared-l...

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Feb 13 13:57:06 2013
New Revision: 381360

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381360
Log:
Initial stab at adding pjsip to configure script.

Modified:
    team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in
    team/qwell/pjsip-shared-libs/configure.ac
    team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in
    team/qwell/pjsip-shared-libs/makeopts.in
    team/qwell/pjsip-shared-libs/res/Makefile
    team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c

Modified: team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in?view=diff&rev=381360&r1=381359&r2=381360
==============================================================================
--- team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in (original)
+++ team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in Wed Feb 13 13:57:06 2013
@@ -44,6 +44,7 @@
 OSPTK=@PBX_OSPTK@
 OSS=@PBX_OSS@
 PGSQL=@PBX_PGSQL@
+PJSIP=@PBX_PJSIP@
 POPT=@PBX_POPT@
 PORTAUDIO=@PBX_PORTAUDIO@
 PRI=@PBX_PRI@

Modified: team/qwell/pjsip-shared-libs/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/configure.ac?view=diff&rev=381360&r1=381359&r2=381360
==============================================================================
--- team/qwell/pjsip-shared-libs/configure.ac (original)
+++ team/qwell/pjsip-shared-libs/configure.ac Wed Feb 13 13:57:06 2013
@@ -427,6 +427,7 @@
 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([PJSIP], [PJSIP], [pjsip])
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
@@ -1987,6 +1988,7 @@
    fi
 fi
 
+AST_PKG_CONFIG_CHECK([PJSIP], [libpjproject])
 AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
 
 AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])

Modified: team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in?view=diff&rev=381360&r1=381359&r2=381360
==============================================================================
--- team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in (original)
+++ team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in Wed Feb 13 13:57:06 2013
@@ -550,6 +550,9 @@
 
 /* Define to indicate presence of the pg_encoding_to_char API. */
 #undef HAVE_PGSQL_pg_encoding_to_char
+
+/* Define if your system has the PJSIP libraries. */
+#undef HAVE_PJSIP
 
 /* Define to 1 if your system defines IP_PKTINFO. */
 #undef HAVE_PKTINFO

Modified: team/qwell/pjsip-shared-libs/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/makeopts.in?view=diff&rev=381360&r1=381359&r2=381360
==============================================================================
--- team/qwell/pjsip-shared-libs/makeopts.in (original)
+++ team/qwell/pjsip-shared-libs/makeopts.in Wed Feb 13 13:57:06 2013
@@ -218,6 +218,9 @@
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@
 
+PJSIP_INCLUDE=@PJSIP_INCLUDE@
+PJSIP_LIB=@PJSIP_LIB@
+
 POPT_INCLUDE=@POPT_INCLUDE@
 POPT_LIB=@POPT_LIB@
 

Modified: team/qwell/pjsip-shared-libs/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/res/Makefile?view=diff&rev=381360&r1=381359&r2=381360
==============================================================================
--- team/qwell/pjsip-shared-libs/res/Makefile (original)
+++ team/qwell/pjsip-shared-libs/res/Makefile Wed Feb 13 13:57:06 2013
@@ -67,26 +67,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
-
-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)

Modified: team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c?view=diff&rev=381360&r1=381359&r2=381360
==============================================================================
--- team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c (original)
+++ team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c Wed Feb 13 13:57:06 2013
@@ -29,6 +29,7 @@
  */
 
 /*** MODULEINFO
+	<depend>pjsip</depend>
 	<support_level>core</support_level>
  ***/