[svn-commits] may: branch may/smpp r401883 - in /team/may/smpp/trunk: ./ addons/ build_tools/

[SVN commits to the Digium repositories]

Author: may
Date: Fri Oct 25 11:02:16 2013
New Revision: 401883

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401883
Log:
add dependence to res_smpp
add configure option for smpp34 library
........

Merged revisions 401882 from http://svn.asterisk.org/svn/asterisk/team/may/smpp/branches/10

Modified:
    team/may/smpp/trunk/   (props changed)
    team/may/smpp/trunk/addons/res_smpp.c
    team/may/smpp/trunk/build_tools/menuselect-deps.in
    team/may/smpp/trunk/configure
    team/may/smpp/trunk/configure.ac

Propchange: team/may/smpp/trunk/
------------------------------------------------------------------------------
--- smpp-10-merge (original)
+++ smpp-10-merge Fri Oct 25 11:02:16 2013
@@ -1,1 +1,1 @@
-/team/may/smpp/branches/10:1-401376
+/team/may/smpp/branches/10:1-401882

Propchange: team/may/smpp/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 25 11:02:16 2013
@@ -1,1 +1,1 @@
-/team/may/smpp/branches/10:400905-401373
+/team/may/smpp/branches/10:400905-401373,401882

Modified: team/may/smpp/trunk/addons/res_smpp.c
URL: http://svnview.digium.com/svn/asterisk/team/may/smpp/trunk/addons/res_smpp.c?view=diff&rev=401883&r1=401882&r2=401883
==============================================================================
--- team/may/smpp/trunk/addons/res_smpp.c (original)
+++ team/may/smpp/trunk/addons/res_smpp.c Fri Oct 25 11:02:16 2013
@@ -10,6 +10,7 @@
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
 	<support_level>extended</support_level>
+	<depend>smpp34</depend>
  ***/
 
 // todo

Modified: team/may/smpp/trunk/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/team/may/smpp/trunk/build_tools/menuselect-deps.in?view=diff&rev=401883&r1=401882&r2=401883
==============================================================================
--- team/may/smpp/trunk/build_tools/menuselect-deps.in (original)
+++ team/may/smpp/trunk/build_tools/menuselect-deps.in Fri Oct 25 11:02:16 2013
@@ -72,3 +72,4 @@
 ZLIB=@PBX_ZLIB@
 TIMERFD=@PBX_TIMERFD@
 NATIVE_ARCH=@AST_NATIVE_ARCH@
+SMPP34=@PBX_SMPP34@

Modified: team/may/smpp/trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/may/smpp/trunk/configure.ac?view=diff&rev=401883&r1=401882&r2=401883
==============================================================================
--- team/may/smpp/trunk/configure.ac (original)
+++ team/may/smpp/trunk/configure.ac Fri Oct 25 11:02:16 2013
@@ -486,6 +486,7 @@
 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
 AST_EXT_LIB_SETUP([X11], [X11], [x11])
 AST_EXT_LIB_SETUP([ZLIB], [zlib compression], [z])
+AST_EXT_LIB_SETUP([SMPP34], [smpp34 library], [smpp34])
 
 # check for basic system features and functionality before
 # checking for package libraries
@@ -2299,6 +2300,7 @@
 AC_LANG_POP
 
 AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
+AST_EXT_LIB_CHECK([SMPP34], [smpp34], [str_tlv_id], [smpp34.h])
 
 if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
 	# Does ODBC support wide characters?