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

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Feb 15 13:01:50 2013
New Revision: 381569

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381569
Log:
Stop using pkg-config.  Split out pjlib/pjlib-util/pjnath, and lib check each.

Modified:
    team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in
    team/qwell/pjsip-shared-libs/configure
    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/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=381569&r1=381568&r2=381569
==============================================================================
--- team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in (original)
+++ team/qwell/pjsip-shared-libs/build_tools/menuselect-deps.in Fri Feb 15 13:01:50 2013
@@ -44,7 +44,9 @@
 OSPTK=@PBX_OSPTK@
 OSS=@PBX_OSS@
 PGSQL=@PBX_PGSQL@
-PJSIP=@PBX_PJSIP@
+PJLIB=@PBX_PJLIB@
+PJLIB_UTIL=@PBX_PJLIB_UTIL@
+PJNATH=@PBX_PJNATH@
 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=381569&r1=381568&r2=381569
==============================================================================
--- team/qwell/pjsip-shared-libs/configure.ac (original)
+++ team/qwell/pjsip-shared-libs/configure.ac Fri Feb 15 13:01:50 2013
@@ -427,7 +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([PJSIP], [PJSIP], [pjsip])
+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])
@@ -1988,7 +1990,9 @@
    fi
 fi
 
-AST_PKG_CONFIG_CHECK([PJSIP], [libpjproject])
+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/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=381569&r1=381568&r2=381569
==============================================================================
--- team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in (original)
+++ team/qwell/pjsip-shared-libs/include/asterisk/autoconfig.h.in Fri Feb 15 13:01:50 2013
@@ -551,8 +551,14 @@
 /* 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 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/pjsip-shared-libs/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/makeopts.in?view=diff&rev=381569&r1=381568&r2=381569
==============================================================================
--- team/qwell/pjsip-shared-libs/makeopts.in (original)
+++ team/qwell/pjsip-shared-libs/makeopts.in Fri Feb 15 13:01:50 2013
@@ -218,8 +218,14 @@
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@
 
-PJSIP_INCLUDE=@PJSIP_INCLUDE@
-PJSIP_LIB=@PJSIP_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/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=381569&r1=381568&r2=381569
==============================================================================
--- team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c (original)
+++ team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c Fri Feb 15 13:01:50 2013
@@ -29,7 +29,9 @@
  */
 
 /*** MODULEINFO
-	<depend>pjsip</depend>
+	<depend>pjlib</depend>
+	<depend>pjlib_util</depend>
+	<depend>pjnath</depend>
 	<support_level>core</support_level>
  ***/