[asterisk-commits] russell: trunk r121403 - in /trunk: ./ build_tools/ include/asterisk/

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jun  9 19:43:06 2008
New Revision: 121403

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121403
Log:
Merge a couple of configure script checks in from team/russell/events.  This adds
the checks for the CLM and EVT services from the SAForum AIS.  I'm going to work
on merging in changes from this branch in pieces.

Modified:
    trunk/build_tools/menuselect-deps.in
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in
    trunk/makeopts.in

Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=121403&r1=121402&r2=121403
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Mon Jun  9 19:43:06 2008
@@ -29,6 +29,8 @@
 POPT=@PBX_POPT@
 PORTAUDIO=@PBX_PORTAUDIO@
 PRI=@PBX_PRI@
+SACLM=@PBX_SACLM@
+SAEVT=@PBX_SAEVT@
 RADIUS=@PBX_RADIUS@
 SPANDSP=@PBX_SPANDSP@
 SPEEX=@PBX_SPEEX@

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=121403&r1=121402&r2=121403
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jun  9 19:43:06 2008
@@ -240,6 +240,8 @@
 AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
 AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
 AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
+AST_EXT_LIB_SETUP([SACLM], [SAForum AIS CLM], [SaClm])
+AST_EXT_LIB_SETUP([SAEVT], [SAForum AIS EVT], [SaEvt])
 AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
 AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
 AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
@@ -1348,6 +1350,9 @@
 
 AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
 
+AST_EXT_LIB_CHECK([SACLM], [SaClm], [saClmInitialize], [openais/saClm.h])
+AST_EXT_LIB_CHECK([SAEVT], [SaEvt], [saEvtInitialize], [openais/saEvt.h])
+
 AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
 
 # See if the main speex library contains the preprocess functions

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=121403&r1=121402&r2=121403
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Mon Jun  9 19:43:06 2008
@@ -681,6 +681,18 @@
 
 /* Define RTLD_NOLOAD headers version */
 #undef HAVE_RTLD_NOLOAD_VERSION
+
+/* Define this to indicate the ${SACLM_DESCRIP} library */
+#undef HAVE_SACLM
+
+/* Define to indicate the ${SACLM_DESCRIP} library version */
+#undef HAVE_SACLM_VERSION
+
+/* Define this to indicate the ${SAEVT_DESCRIP} library */
+#undef HAVE_SAEVT
+
+/* Define to indicate the ${SAEVT_DESCRIP} library version */
+#undef HAVE_SAEVT_VERSION
 
 /* Define to 1 if your system has /sbin/launchd. */
 #undef HAVE_SBIN_LAUNCHD

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=121403&r1=121402&r2=121403
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Mon Jun  9 19:43:06 2008
@@ -154,6 +154,12 @@
 PWLIB_INCLUDE=@PWLIB_INCLUDE@
 PWLIB_LIB=@PWLIB_LIB@
 
+SACLM_INCLUDE=@SACLM_INCLUDE@
+SACLM_LIB=@SACLM_LIB@
+
+SAEVT_INCLUDE=@SAEVT_INCLUDE@
+SAEVT_LIB=@SAEVT_LIB@
+
 RADIUS_INCLUDE=@RADIUS_INCLUDE@
 RADIUS_LIB=@RADIUS_LIB@