kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace res_ais with a new module, res_corosync.

Browse Source 
This patch removes res_ais and introduces a new module, res_corosync.
The OpenAIS project is deprecated and is now just a wrapper around
Corosync.  This module provides the same functionality using the same
core infrastructure, but without the use of the deprecated components.

Technically res_ais could have been used with an AIS implementation other
than OpenAIS, but that is the only one I know of that was ever used.

Review: https://reviewboard.asterisk.org/r/1700/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2012-02-05 10:58:37 +00:00
parent a898eb4d07
commit 055a19e128
13 changed files with 700 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 350839 .
# From configure.ac Revision: 353317 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for asterisk trunk.
#
@@ -629,9 +629,6 @@ PBX_MSG_NOSIGNAL
PBX_IXJUSER
PBX_H323
CONFIG_GMIME
AIS_LIB
AIS_INCLUDE
PBX_AIS
OPENH323_BUILD
OPENH323_SUFFIX
OPENH323_LIBDIR
@@ -884,10 +881,6 @@ PBX_OPENR2
OPENR2_DIR
OPENR2_INCLUDE
OPENR2_LIB
PBX_OPENAIS
OPENAIS_DIR
OPENAIS_INCLUDE
OPENAIS_LIB
PBX_OGG
OGG_DIR
OGG_INCLUDE
@@ -1016,6 +1009,10 @@ PBX_CURSES
CURSES_DIR
CURSES_INCLUDE
CURSES_LIB
PBX_COROSYNC
COROSYNC_DIR
COROSYNC_INCLUDE
COROSYNC_LIB
PBX_CAP
CAP_DIR
CAP_INCLUDE
@@ -1180,6 +1177,7 @@ with_bfd
with_execinfo
with_bluetooth
with_cap
with_cpg
with_curses
with_crypto
with_dahdi
@@ -1212,7 +1210,6 @@ with_neon29
with_netsnmp
with_newt
with_ogg
with_openais
with_openr2
with_osptk
with_oss
@@ -1895,6 +1892,7 @@ Optional Packages:
--with-execinfo=PATH use Stack Backtrace files in PATH
--with-bluetooth=PATH use Bluetooth files in PATH
--with-cap=PATH use POSIX 1.e capabilities files in PATH
--with-cpg=PATH use Corosync files in PATH
--with-curses=PATH use curses files in PATH
--with-crypto=PATH use OpenSSL Cryptography files in PATH
--with-dahdi=PATH use DAHDI files in PATH
@@ -1928,7 +1926,6 @@ Optional Packages:
--with-netsnmp=PATH use Net-SNMP files in PATH
--with-newt=PATH use newt files in PATH
--with-ogg=PATH use OGG files in PATH
--with-openais=PATH use OpenAIS files in PATH
--with-openr2=PATH use MFR2 files in PATH
--with-osptk=PATH use OSP Toolkit files in PATH
--with-oss=PATH use Open Sound System files in PATH
@@ -8072,6 +8069,38 @@ fi
COROSYNC_DESCRIP="Corosync"
COROSYNC_OPTION="cpg"
PBX_COROSYNC=0
# Check whether --with-cpg was given.
if test "${with_cpg+set}" = set; then :
withval=$with_cpg;
case ${withval} in
n|no)
USE_COROSYNC=no
# -1 is a magic value used by menuselect to know that the package
# was disabled, other than 'not found'
PBX_COROSYNC=-1
;;
y|ye|yes)
ac_mandatory_list="${ac_mandatory_list} COROSYNC"
;;
*)
COROSYNC_DIR="${withval}"
ac_mandatory_list="${ac_mandatory_list} COROSYNC"
;;
esac
fi
CURSES_DESCRIP="curses"
CURSES_OPTION="curses"
PBX_CURSES=0
@@ -9441,38 +9470,6 @@ fi
OPENAIS_DESCRIP="OpenAIS"
OPENAIS_OPTION="openais"
PBX_OPENAIS=0
# Check whether --with-openais was given.
if test "${with_openais+set}" = set; then :
withval=$with_openais;
case ${withval} in
n|no)
USE_OPENAIS=no
# -1 is a magic value used by menuselect to know that the package
# was disabled, other than 'not found'
PBX_OPENAIS=-1
;;
y|ye|yes)
ac_mandatory_list="${ac_mandatory_list} OPENAIS"
;;
*)
OPENAIS_DIR="${withval}"
ac_mandatory_list="${ac_mandatory_list} OPENAIS"
;;
esac
fi
OPENR2_DESCRIP="MFR2"
OPENR2_OPTION="openr2"
PBX_OPENR2=0
@@ -25818,40 +25815,31 @@ fi
# This is a bit complex... in reality, Asterisk's AIS support is dependent on finding
# *any* implementation of AIS, not just OpenAIS. However, the configure script needs
# to know the specifics of each possible implementation, and then represent the one
# that was found as 'AIS'.
PBX_AIS=0
# OpenAIS installs its libraries into /usr/lib/openais by default, so check there
if test "x${PBX_OPENAIS}" != "x1" -a "${USE_OPENAIS}" != "no"; then
if test "x${PBX_COROSYNC}" != "x1" -a "${USE_COROSYNC}" != "no"; then
pbxlibdir=""
# if --with-OPENAIS=DIR has been specified, use it.
if test "x${OPENAIS_DIR}" != "x"; then
if test -d ${OPENAIS_DIR}/lib; then
pbxlibdir="-L${OPENAIS_DIR}/lib"
# if --with-COROSYNC=DIR has been specified, use it.
if test "x${COROSYNC_DIR}" != "x"; then
if test -d ${COROSYNC_DIR}/lib; then
pbxlibdir="-L${COROSYNC_DIR}/lib"
else
pbxlibdir="-L${OPENAIS_DIR}"
pbxlibdir="-L${COROSYNC_DIR}"
fi
fi
pbxfuncname="saClmInitialize"
pbxfuncname="cpg_join"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_OPENAIS_FOUND=yes
AST_COROSYNC_FOUND=yes
else
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
as_ac_Lib=`$as_echo "ac_cv_lib_SaClm_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lSaClm" >&5
$as_echo_n "checking for ${pbxfuncname} in -lSaClm... " >&6; }
as_ac_Lib=`$as_echo "ac_cv_lib_cpg_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcpg" >&5
$as_echo_n "checking for ${pbxfuncname} in -lcpg... " >&6; }
if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lSaClm ${pbxlibdir} -L/usr/lib/openais -L/usr/lib64/openais $LIBS"
LIBS="-lcpg ${pbxlibdir} -lcfg $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -25883,47 +25871,47 @@ eval ac_res=\$$as_ac_Lib
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
AST_OPENAIS_FOUND=yes
AST_COROSYNC_FOUND=yes
else
AST_OPENAIS_FOUND=no
AST_COROSYNC_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
fi
# now check for the header.
if test "${AST_OPENAIS_FOUND}" = "yes"; then
OPENAIS_LIB="${pbxlibdir} -lSaClm -L/usr/lib/openais -L/usr/lib64/openais"
# if --with-OPENAIS=DIR has been specified, use it.
if test "x${OPENAIS_DIR}" != "x"; then
OPENAIS_INCLUDE="-I${OPENAIS_DIR}/include"
if test "${AST_COROSYNC_FOUND}" = "yes"; then
COROSYNC_LIB="${pbxlibdir} -lcpg -lcfg"
# if --with-COROSYNC=DIR has been specified, use it.
if test "x${COROSYNC_DIR}" != "x"; then
COROSYNC_INCLUDE="-I${COROSYNC_DIR}/include"
fi
OPENAIS_INCLUDE="${OPENAIS_INCLUDE} "
if test "xopenais/saClm.h" = "x" ; then # no header, assume found
OPENAIS_HEADER_FOUND="1"
COROSYNC_INCLUDE="${COROSYNC_INCLUDE} "
if test "xcorosync/cpg.h" = "x" ; then # no header, assume found
COROSYNC_HEADER_FOUND="1"
else # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPENAIS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "openais/saClm.h" "ac_cv_header_openais_saClm_h" "$ac_includes_default"
if test "x$ac_cv_header_openais_saClm_h" = xyes; then :
OPENAIS_HEADER_FOUND=1
CPPFLAGS="${CPPFLAGS} ${COROSYNC_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "corosync/cpg.h" "ac_cv_header_corosync_cpg_h" "$ac_includes_default"
if test "x$ac_cv_header_corosync_cpg_h" = xyes; then :
COROSYNC_HEADER_FOUND=1
else
OPENAIS_HEADER_FOUND=0
COROSYNC_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
fi
if test "x${OPENAIS_HEADER_FOUND}" = "x0" ; then
OPENAIS_LIB=""
OPENAIS_INCLUDE=""
if test "x${COROSYNC_HEADER_FOUND}" = "x0" ; then
COROSYNC_LIB=""
COROSYNC_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
OPENAIS_LIB=""
COROSYNC_LIB=""
fi
PBX_OPENAIS=1
PBX_COROSYNC=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENAIS 1
#define HAVE_COROSYNC 1
_ACEOF
fi
@@ -25932,21 +25920,6 @@ fi
if test "${PBX_OPENAIS}" = 1; then
PBX_AIS=1
if test -n "${OPENAIS_DIR}"; then
AIS_INCLUDE="${OPENAIS_INCLUDE}/openais"
AIS_LIB="-lSaEvt ${OPENAIS_LIB}"
else
AIS_INCLUDE="-I/usr/include/openais"
AIS_LIB="-lSaClm -lSaEvt -L/usr/lib/openais -L/usr/lib64/openais"
fi
fi
if test "x${PBX_SPEEX}" != "x1" -a "${USE_SPEEX}" != "no"; then
pbxlibdir=""