[asterisk-commits] branch jcollie/bug7021 r37142 - in
/team/jcollie/bug7021: ./ apps/ build_tool...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Jul 6 06:30:38 MST 2006
Author: jcollie
Date: Thu Jul 6 08:30:38 2006
New Revision: 37142
URL: http://svn.digium.com/view/asterisk?rev=37142&view=rev
Log:
Merged revisions 37066,37085-37087,37105,37123,37141 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r37066 | kpfleming | 2006-07-05 14:59:34 -0500 (Wed, 05 Jul 2006) | 2 lines
massive rework of configure script, and split of AST_EXT_LIB into separate macros, reducing code duplication
........
r37085 | kpfleming | 2006-07-05 15:12:29 -0500 (Wed, 05 Jul 2006) | 2 lines
update dependency information to match new names for dependencies
........
r37086 | kpfleming | 2006-07-05 15:15:43 -0500 (Wed, 05 Jul 2006) | 2 lines
update OSS so it works again
........
r37087 | mogorman | 2006-07-05 15:28:54 -0500 (Wed, 05 Jul 2006) | 2 lines
solves issue with bug 7468. but with a patch that works
........
r37105 | kpfleming | 2006-07-05 16:28:30 -0500 (Wed, 05 Jul 2006) | 2 lines
allow codec_gsm to be built using internal GSM library again (oops!)
........
r37123 | oej | 2006-07-06 02:25:32 -0500 (Thu, 06 Jul 2006) | 2 lines
Include h.264 in "show codecs"
........
r37141 | kpfleming | 2006-07-06 08:07:47 -0500 (Thu, 06 Jul 2006) | 2 lines
make chan_zap use proper test for libpri support
........
Modified:
team/jcollie/bug7021/ (props changed)
team/jcollie/bug7021/acinclude.m4
team/jcollie/bug7021/apps/app_osplookup.c
team/jcollie/bug7021/apps/app_voicemail.c
team/jcollie/bug7021/build_tools/menuselect-deps.in
team/jcollie/bug7021/cdr/cdr_radius.c
team/jcollie/bug7021/channels/chan_zap.c
team/jcollie/bug7021/codecs/Makefile
team/jcollie/bug7021/codecs/codec_gsm.c
team/jcollie/bug7021/codecs/codec_speex.c
team/jcollie/bug7021/configure
team/jcollie/bug7021/configure.ac
team/jcollie/bug7021/formats/format_ogg_vorbis.c
team/jcollie/bug7021/frame.c
team/jcollie/bug7021/include/asterisk/autoconfig.h.in
team/jcollie/bug7021/makeopts.in
team/jcollie/bug7021/res/res_jabber.c
Propchange: team/jcollie/bug7021/
------------------------------------------------------------------------------
automerge = *
Propchange: team/jcollie/bug7021/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 6 08:30:38 2006
@@ -1,1 +1,1 @@
-/trunk:1-37049
+/trunk:1-37141
Modified: team/jcollie/bug7021/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/acinclude.m4?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/acinclude.m4 (original)
+++ team/jcollie/bug7021/acinclude.m4 Thu Jul 6 08:30:38 2006
@@ -1,73 +1,83 @@
-# AST_EXT_LIB([NAME], [FUNCTION], [package header], [package symbol name], [package friendly name], [additional LIB data])
+# AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
-AC_DEFUN([AST_EXT_LIB],
+AC_DEFUN([AST_EXT_LIB_SETUP],
[
-AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
+$1_DESCRIP="$2"
+$1_OPTION="$3"
+AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),[
case ${withval} in
n|no)
- USE_$4=no
+ USE_$1=no
;;
y|ye|yes)
- $4_MANDATORY="yes"
+ $1_MANDATORY="yes"
;;
*)
- $4_DIR="${withval}"
- $4_MANDATORY="yes"
+ $1_DIR="${withval}"
+ $1_MANDATORY="yes"
;;
esac
])
+PBX_$1=0
+AC_SUBST([$1_LIB])
+AC_SUBST([$1_INCLUDE])
+AC_SUBST([PBX_$1])
+])
-PBX_LIB$4=0
+# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data])
-if test "${USE_$4}" != "no"; then
+AC_DEFUN([AST_EXT_LIB_CHECK],
+[
+if test "${USE_$1}" != "no"; then
pbxlibdir=""
- if test "x${$4_DIR}" != "x"; then
- pbxlibdir="-L${$1_DIR} -L${$1_DIR}/lib"
+ if test "x${$1_DIR}" != "x"; then
+ if test -d ${$1_DIR}/lib; then
+ pbxlibdir="-L${$1_DIR}/lib"
+ else
+ pbxlibdir="-L${$1_DIR}"
+ fi
fi
- AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $6)
+ AC_CHECK_LIB([$2], [$3], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], ${pbxlibdir} $5)
- if test "${AST_$4_FOUND}" = "yes"; then
- $4_LIB="-l$1 $6"
- $4_HEADER_FOUND="1"
- if test "x${$4_DIR}" != "x"; then
- $4_LIB="${pbxlibdir} ${$4_LIB}"
- $4_INCLUDE="-I${$4_DIR}/include"
- if test "x$3" != "x" ; then
- AC_CHECK_HEADER([${$4_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ if test "${AST_$1_FOUND}" = "yes"; then
+ $1_LIB="-l$2 $5"
+ $1_HEADER_FOUND="1"
+ if test "x${$1_DIR}" != "x"; then
+ $1_LIB="${pbxlibdir} ${$1_LIB}"
+ $1_INCLUDE="-I${$1_DIR}/include"
+ if test "x$4" != "x" ; then
+ AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0] )
fi
else
- if test "x$3" != "x" ; then
- AC_CHECK_HEADER([$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ if test "x$4" != "x" ; then
+ AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0] )
fi
fi
- if test "x${$4_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${$4_MANDATORY}" ;
+ if test "x${$1_HEADER_FOUND}" = "x0" ; then
+ if test ! -z "${$1_MANDATORY}" ;
then
echo " ***"
- echo " *** It appears that you do not have the $1 development package installed."
- echo " *** Please install it to include $5 support, or re-run configure"
- echo " *** without explicitly specifying --with-$1"
+ echo " *** It appears that you do not have the $2 development package installed."
+ echo " *** Please install it to include ${$1_DESCRIP} support, or re-run configure"
+ echo " *** without explicitly specifying --with-${$1_OPTION}"
exit 1
fi
- $4_LIB=""
- $4_INCLUDE=""
- PBX_LIB$4=0
+ $1_LIB=""
+ $1_INCLUDE=""
+ PBX_$1=0
else
- PBX_LIB$4=1
- AC_DEFINE_UNQUOTED([HAVE_$4], 1, [Define to indicate the $5 library])
+ PBX_$1=1
+ AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to indicate the ${$1_DESCRIP} library])
fi
- elif test ! -z "${$4_MANDATORY}";
+ elif test ! -z "${$1_MANDATORY}";
then
echo "***"
- echo "*** The $5 installation on this system appears to be broken."
+ echo "*** The ${$1_DESCRIP} installation on this system appears to be broken."
echo "*** Either correct the installation, or run configure"
- echo "*** without explicity specifying --with-$1"
+ echo "*** without explicitly specifying --with-${$1_OPTION}"
exit 1
fi
fi
-AC_SUBST([$4_LIB])
-AC_SUBST([$4_INCLUDE])
-AC_SUBST([PBX_LIB$4])
])
Modified: team/jcollie/bug7021/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/apps/app_osplookup.c?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/apps/app_osplookup.c (original)
+++ team/jcollie/bug7021/apps/app_osplookup.c Thu Jul 6 08:30:38 2006
@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
- <depend>libosptk</depend>
+ <depend>osptk</depend>
<depend>ssl</depend>
***/
Modified: team/jcollie/bug7021/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/apps/app_voicemail.c?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/apps/app_voicemail.c (original)
+++ team/jcollie/bug7021/apps/app_voicemail.c Thu Jul 6 08:30:38 2006
@@ -50,6 +50,10 @@
</member>
<member name="EXTENDED_ODBC_STORAGE" displayname="Storage of Voicemail using ODBC (extended)">
<depend>unixodbc</depend>
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
+ <depend>imap_tk</depend>
<defaultenabled>no</defaultenabled>
</member>
</category>
Modified: team/jcollie/bug7021/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/build_tools/menuselect-deps.in?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/build_tools/menuselect-deps.in (original)
+++ team/jcollie/bug7021/build_tools/menuselect-deps.in Thu Jul 6 08:30:38 2006
@@ -1,30 +1,31 @@
-ASOUND=@PBX_LIBALSA@
+ASOUND=@PBX_ALSA@
CURL=@PBX_CURL@
-FREETDS=@PBX_LIBFREETDS@
+FREETDS=@PBX_FREETDS@
GTK=@PBX_GTK@
H323=@PBX_H323@
KDE=@PBX_KDE@
-LIBNEWT=@PBX_LIBNEWT@
-LIBOSPTK=@PBX_LIBOSPTK@
-LIBPOPT=@PBX_LIBPOPT@
-LIBPRI=@PBX_LIBLIBPRI@
-LIBSPEEX=@PBX_LIBSPEEX@
-LIBVORBIS=@PBX_LIBVORBIS@
-NBS=@PBX_LIBNBS@
-LIBOGG=@PBX_LIBOGG@
-OSSAUDIO=@PBX_LIBOSS@
-PGSQL=@PBX_LIBpq@
+NEWT=@PBX_NEWT@
+OSPTK=@PBX_OSPTK@
+POPT=@PBX_POPT@
+PRI=@PBX_PRI@
+SPEEX=@PBX_SPEEX@
+VORBIS=@PBX_VORBIS@
+NBS=@PBX_NBS@
+OGG=@PBX_OGG@
+OSSAUDIO=@PBX_OSS@
+PGSQL=@PBX_PGSQL@
QT=@PBX_QT@
-RADIUSCLIENT=@PBX_LIBRADIUSCLIENT@
-SQLITE=@PBX_LIBSQLITE@
-SSL=@PBX_LIBOPENSSL@
-UNIXODBC=@PBX_LIBUNIXODBC@
-VPBAPI=@PBX_LIBvpb@
+RADIUS=@PBX_RADIUS@
+SQLITE=@PBX_SQLITE@
+SSL=@PBX_OPENSSL@
+UNIXODBC=@PBX_UNIXODBC@
+VPBAPI=@PBX_VPB@
WIN32=@OSISWIN32@
-ZLIB=@PBX_LIBZLIB@
-TONEZONE=@PBX_LIBTONEZONE@
+ZLIB=@PBX_ZLIB@
+TONEZONE=@PBX_TONEZONE@
ZAPTEL=@PBX_ZAPTEL@
-LIBGSM=@PBX_LIBgsm@
-IKSEMEL=@PBX_LIBIKSEMEL@
+GSM=@PBX_GSM@
+IKSEMEL=@PBX_IKSEMEL@
IXJUSER=@PBX_IXJUSER@
NETSNMP=@PBX_NETSNMP@
+IMAP_TK=@PBX_IMAP_TK@
Modified: team/jcollie/bug7021/cdr/cdr_radius.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/cdr/cdr_radius.c?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/cdr/cdr_radius.c (original)
+++ team/jcollie/bug7021/cdr/cdr_radius.c Thu Jul 6 08:30:38 2006
@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
- <depend>radiusclient</depend>
+ <depend>radius</depend>
***/
#include "asterisk.h"
Modified: team/jcollie/bug7021/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/channels/chan_zap.c?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/channels/chan_zap.c (original)
+++ team/jcollie/bug7021/channels/chan_zap.c Thu Jul 6 08:30:38 2006
@@ -40,7 +40,7 @@
/*** MODULEINFO
<depend>zaptel</depend>
<depend>tonezone</depend>
- <use>libpri</use>
+ <use>pri</use>
***/
#include "asterisk.h"
@@ -67,7 +67,7 @@
#include <zaptel/zaptel.h>
#include <zaptel/tonezone.h>
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
#include <libpri.h>
#endif
@@ -113,7 +113,7 @@
};
static struct ast_jb_conf global_jbconf;
-#if !defined(ZT_SIG_EM_E1) || (defined(HAVE_LIBPRI) && !defined(ZT_SIG_HARDHDLC))
+#if !defined(ZT_SIG_EM_E1) || (defined(HAVE_PRI) && !defined(ZT_SIG_HARDHDLC))
#error "Your zaptel is too old. Please update"
#endif
@@ -155,7 +155,7 @@
#define NEED_MFDETECT(p) (((p)->sig == SIG_FEATDMF) || ((p)->sig == SIG_FEATDMF_TA) || ((p)->sig == SIG_E911) || ((p)->sig == SIG_FGC_CAMA) || ((p)->sig == SIG_FGC_CAMAMF) || ((p)->sig == SIG_FEATB))
static const char tdesc[] = "Zapata Telephony Driver"
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
" w/PRI"
#endif
;
@@ -295,7 +295,7 @@
static int priindication_oob = 0;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static int minunused = 2;
static int minidle = 0;
static char idleext[AST_MAX_EXTENSION];
@@ -334,7 +334,7 @@
static int ifcount = 0;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
AST_MUTEX_DEFINE_STATIC(pridebugfdlock);
#endif
@@ -401,7 +401,7 @@
static int ringt_base = DEFAULT_RINGT;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
#define PVT_TO_CHANNEL(p) (((p)->prioffset) | ((p)->logicalspan << 8) | (p->pri->mastertrunkgroup ? 0x10000 : 0))
#define PRI_CHANNEL(p) ((p) & 0xff)
@@ -593,7 +593,7 @@
unsigned int usedistinctiveringdetection:1;
unsigned int zaptrcallerid:1; /*!< should we use the callerid from incoming call on zap transfer or not */
unsigned int transfertobusy:1; /*!< allow flash-transfers to busy channels */
-#if defined(HAVE_LIBPRI)
+#if defined(HAVE_PRI)
unsigned int alerting:1;
unsigned int alreadyhungup:1;
unsigned int isidlecall:1;
@@ -677,7 +677,7 @@
int polarityonanswerdelay;
struct timeval polaritydelaytv;
int sendcalleridafter;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
struct zt_pri *pri;
struct zt_pvt *bearer;
struct zt_pvt *realcall;
@@ -723,7 +723,7 @@
.func_channel_read = zt_func_read,
};
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
#define GET_CHANNEL(p) ((p)->bearer ? (p)->bearer->channel : p->channel)
#else
#define GET_CHANNEL(p) ((p)->channel)
@@ -731,7 +731,7 @@
struct zt_pvt *round_robin[32];
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static inline int pri_grab(struct zt_pvt *pvt, struct zt_pri *pri)
{
int res;
@@ -798,13 +798,13 @@
return res;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static void wakeup_sub(struct zt_pvt *p, int a, struct zt_pri *pri)
#else
static void wakeup_sub(struct zt_pvt *p, int a, void *pri)
#endif
{
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri)
ast_mutex_unlock(&pri->lock);
#endif
@@ -822,20 +822,20 @@
} else
break;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri)
ast_mutex_lock(&pri->lock);
#endif
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static void zap_queue_frame(struct zt_pvt *p, struct ast_frame *f, struct zt_pri *pri)
#else
static void zap_queue_frame(struct zt_pvt *p, struct ast_frame *f, void *pri)
#endif
{
/* We must unlock the PRI to avoid the possibility of a deadlock */
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri)
ast_mutex_unlock(&pri->lock);
#endif
@@ -853,7 +853,7 @@
} else
break;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri)
ast_mutex_lock(&pri->lock);
#endif
@@ -1011,7 +1011,7 @@
ast_mutex_lock(&p->lock);
index = zt_get_index(ast, p, 0);
if ((index == SUB_REAL) && p->owner) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if ((p->sig == SIG_PRI) && (ast->_state == AST_STATE_DIALING) && !p->proceeding) {
if (p->setup_ack) {
if (!pri_grab(p, p->pri)) {
@@ -1097,7 +1097,7 @@
return buf;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static char *dialplan2str(int dialplan)
{
if (dialplan == -1) {
@@ -1716,7 +1716,7 @@
struct zt_pvt *p = ast->tech_pvt;
int x, res, index,mysig;
char *c, *n, *l;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
char *s = NULL;
#endif
char dest[256]; /* must be same length as p->dialdest */
@@ -1873,7 +1873,7 @@
ast_mutex_unlock(&p->lock);
return -1;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
/* Start the trunk, if not GR-303 */
if (!p->pri) {
#endif
@@ -1886,7 +1886,7 @@
return -1;
}
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
}
#endif
ast_log(LOG_DEBUG, "Dialing '%s'\n", c);
@@ -1984,7 +1984,7 @@
ast_mutex_unlock(&p->lock);
return -1;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->pri) {
struct pri_sr *sr;
#ifdef SUPPORT_USERUSER
@@ -2199,7 +2199,7 @@
return 0;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static char *zap_send_keypad_facility_app = "ZapSendKeypadFacility";
static char *zap_send_keypad_facility_synopsis = "Send digits out of band over a PRI";
@@ -2480,7 +2480,7 @@
p->faxhandled = 0;
p->pulsedial = 0;
p->onhooktime = time(NULL);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
p->proceeding = 0;
p->progress = 0;
p->alerting = 0;
@@ -2496,7 +2496,7 @@
if (res < 0)
ast_log(LOG_WARNING, "Unable to set law on channel %d to default\n", p->channel);
/* Perform low level hangup if no owner left */
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->pri) {
#ifdef SUPPORT_USERUSER
const char *useruser = pbx_builtin_getvar_helper(ast,"USERUSERINFO");
@@ -2604,7 +2604,7 @@
x = 0;
ast_channel_setoption(ast,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->bearer) {
ast_log(LOG_DEBUG, "Freeing up bearer channel %d\n", p->bearer->channel);
/* Free up the bearer channel as well, and
@@ -2714,7 +2714,7 @@
zt_train_ec(p);
}
break;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
case SIG_PRI:
/* Send a pri acknowledge */
if (!pri_grab(p, p->pri)) {
@@ -3544,7 +3544,7 @@
else
p->pulsedial = 0;
ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!p->proceeding && p->sig == SIG_PRI && p->pri && p->pri->overlapdial) {
/* absorb event */
} else {
@@ -3557,7 +3557,7 @@
p->subs[index].f.subclass = res & 0xff;
dtmf_frame.subclass = res & 0xff;
p->subs[index].f.next = ast_frdup(&dtmf_frame);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
}
#endif
/* Unmute conference, return the captured digit */
@@ -3636,7 +3636,7 @@
}
break;
case ZT_EVENT_ALARM:
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->call) {
if (p->pri && p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@ -3987,7 +3987,7 @@
break;
case ZT_EVENT_NOALARM:
p->inalarm = 0;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
/* Extremely unlikely but just in case */
if (p->bearer)
p->bearer->inalarm = 0;
@@ -4661,7 +4661,7 @@
f = NULL;
}
} else if (f->frametype == AST_FRAME_DTMF) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
/* Don't accept in-band DTMF when in overlap dial mode */
f->frametype = AST_FRAME_NULL;
@@ -4781,7 +4781,7 @@
}
#if 0
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
ast_mutex_lock(&p->lock);
if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
if (p->pri->pri) {
@@ -4868,7 +4868,7 @@
if (index == SUB_REAL) {
switch (condition) {
case AST_CONTROL_BUSY:
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->priindication_oob && p->sig == SIG_PRI) {
chan->hangupcause = AST_CAUSE_USER_BUSY;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
@@ -4889,7 +4889,7 @@
res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_BUSY);
break;
case AST_CONTROL_RINGING:
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if ((!p->alerting) && p->sig==SIG_PRI && p->pri && !p->outgoing && (chan->_state != AST_STATE_UP)) {
if (p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@ -4913,7 +4913,7 @@
break;
case AST_CONTROL_PROCEEDING:
ast_log(LOG_DEBUG,"Received AST_CONTROL_PROCEEDING on %s\n",chan->name);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
if (p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@ -4931,7 +4931,7 @@
break;
case AST_CONTROL_PROGRESS:
ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
p->digital = 0; /* Digital-only calls isn't allows any inband progress messages */
if (!p->progress && p->sig==SIG_PRI && p->pri && !p->outgoing) {
if (p->pri->pri) {
@@ -4950,7 +4950,7 @@
break;
case AST_CONTROL_CONGESTION:
chan->hangupcause = AST_CAUSE_CONGESTION;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->priindication_oob && p->sig == SIG_PRI) {
chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
@@ -4969,7 +4969,7 @@
#endif
res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);
break;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
case AST_CONTROL_HOLD:
if (p->pri) {
if (!pri_grab(p, p->pri)) {
@@ -5055,7 +5055,7 @@
}
y = 1;
do {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (i->bearer || (i->pri && (i->sig == SIG_FXSKS)))
ast_string_field_build(tmp, name, "Zap/%d:%d-%d", i->pri->trunkgroup, i->channel, y);
else
@@ -5110,7 +5110,7 @@
i->dsp = NULL;
if (i->dsp) {
i->dsp_features = features & ~DSP_PROGRESS_TALK;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
/* We cannot do progress detection until receives PROGRESS message */
if (i->outgoing && (i->sig == SIG_PRI)) {
/* Remember requested DSP features, don't treat
@@ -5168,7 +5168,7 @@
#endif
tmp->cid.cid_pres = i->callingpres;
tmp->cid.cid_ton = i->cid_ton;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
tmp->transfercapability = transfercapability;
pbx_builtin_setvar_helper(tmp, "TRANSFERCAPABILITY", ast_transfercapability2str(transfercapability));
if (transfercapability & PRI_TRANS_CAP_DIGITAL)
@@ -5277,7 +5277,7 @@
if (p->dsp)
ast_dsp_digitreset(p->dsp);
switch (p->sig) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
case SIG_PRI:
/* Now loop looking for an extension */
ast_copy_string(exten, p->exten, sizeof(exten));
@@ -5881,7 +5881,7 @@
case SIG_FXSLS:
case SIG_FXSGS:
case SIG_FXSKS:
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->pri) {
/* This is a GR-303 trunk actually. Wait for the first ring... */
struct ast_frame *f;
@@ -6711,7 +6711,7 @@
pollres = ast_fdisset(pfds, i->subs[SUB_REAL].zfd, count, &spoint);
if (pollres & POLLIN) {
if (i->owner || i->subs[SUB_REAL].owner) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!i->pri)
#endif
ast_log(LOG_WARNING, "Whoa.... I'm owned but found (%d) in read...\n", i->subs[SUB_REAL].zfd);
@@ -6753,7 +6753,7 @@
}
if (pollres & POLLPRI) {
if (i->owner || i->subs[SUB_REAL].owner) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!i->pri)
#endif
ast_log(LOG_WARNING, "Whoa.... I'm owned but found (%d)...\n", i->subs[SUB_REAL].zfd);
@@ -6816,7 +6816,7 @@
return 0;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static int pri_resolve_span(int *span, int channel, int offset, struct zt_spaninfo *si)
{
int x;
@@ -6950,7 +6950,7 @@
wlist = &iflist;
wend = &ifend;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri) {
wlist = &pri->crvs;
wend = &pri->crvend;
@@ -7023,7 +7023,7 @@
return NULL;
}
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if ((signalling == SIG_PRI) || (signalling == SIG_GR303FXOKS) || (signalling == SIG_GR303FXSKS)) {
int offset;
int myswitchtype;
@@ -7315,7 +7315,7 @@
zt_set_hook(tmp->subs[SUB_REAL].zfd, ZT_ONHOOK);
}
ioctl(tmp->subs[SUB_REAL].zfd,ZT_SETTONEZONE,&tmp->tonezone);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
/* the dchannel is down so put the channel in alarm */
if (tmp->pri && !pri_is_up(tmp->pri))
tmp->inalarm = 1;
@@ -7415,7 +7415,7 @@
/* If no owner definitely available */
if (!p->owner) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
/* Trust PRI */
if (p->pri) {
if (p->resetting || p->call)
@@ -7523,7 +7523,7 @@
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static int pri_find_empty_chan(struct zt_pri *pri, int backwards)
{
int x;
@@ -7565,7 +7565,7 @@
char opt=0;
int res=0, y=0;
int backwards = 0;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
int crv;
int bearer = -1;
int trunkgroup;
@@ -7625,7 +7625,7 @@
x = CHAN_PSEUDO;
channelmatch = x;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
else if ((res = sscanf(s, "%d:%d%c%d", &trunkgroup, &crv, &opt, &y)) > 1) {
if ((trunkgroup < 1) || (crv < 1)) {
ast_log(LOG_WARNING, "Unable to determine trunk group and CRV for data %s\n", (char *)data);
@@ -7673,7 +7673,7 @@
goto next;
callwait = (p->owner != NULL);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri && (p->subs[SUB_REAL].zfd < 0)) {
if (p->sig != SIG_FXSKS) {
/* Gotta find an actual channel to use for this
@@ -7710,7 +7710,7 @@
}
p->outgoing = 1;
tmp = zt_new(p, AST_STATE_RESERVED, 0, p->owner ? SUB_CALLWAIT : SUB_REAL, 0, 0);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (p->bearer) {
/* Log owner to bearer channel, too */
p->bearer->owner = tmp;
@@ -7772,7 +7772,7 @@
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
struct zt_pvt *p;
@@ -9550,7 +9550,7 @@
"Ends PRI debug output to file" },
};
-#endif /* HAVE_LIBPRI */
+#endif /* HAVE_PRI */
static int zap_destroy_channel(int fd, int argc, char **argv)
{
@@ -9624,7 +9624,7 @@
char tmps[20] = "";
ast_mutex_t *lock;
struct zt_pvt *start;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
int trunkgroup;
struct zt_pri *pri = NULL;
int x;
@@ -9633,7 +9633,7 @@
lock = &iflock;
start = iflist;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (argc == 4) {
if ((trunkgroup = atoi(argv[3])) < 1)
return RESULT_SHOWUSAGE;
@@ -9656,7 +9656,7 @@
return RESULT_SHOWUSAGE;
ast_mutex_lock(lock);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
ast_cli(fd, FORMAT2, pri ? "CRV" : "Chan", "Extension", "Context", "Language", "MusicOnHold");
#else
ast_cli(fd, FORMAT2, "Chan", "Extension", "Context", "Language", "MusicOnHold");
@@ -9686,7 +9686,7 @@
int x;
ast_mutex_t *lock;
struct zt_pvt *start;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
char *c;
int trunkgroup;
struct zt_pri *pri=NULL;
@@ -9697,7 +9697,7 @@
if (argc != 4)
return RESULT_SHOWUSAGE;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if ((c = strchr(argv[3], ':'))) {
if (sscanf(argv[3], "%d:%d", &trunkgroup, &channel) != 2)
return RESULT_SHOWUSAGE;
@@ -9724,7 +9724,7 @@
tmp = start;
while (tmp) {
if (tmp->channel == channel) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri)
ast_cli(fd, "Trunk/CRV: %d/%d\n", trunkgroup, tmp->channel);
else
@@ -9762,7 +9762,7 @@
if (tmp->slaves[x])
ast_cli(fd, "Slave Channel: %d\n", tmp->slaves[x]->channel);
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (tmp->pri) {
ast_cli(fd, "PRI Flags: ");
if (tmp->resetting)
@@ -10118,7 +10118,7 @@
{
int x = 0;
struct zt_pvt *p, *pl;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
int i;
for (i = 0; i < NUM_SPANS; i++) {
if (pris[i].master != AST_PTHREADT_NULL)
@@ -10174,7 +10174,7 @@
iflist = NULL;
ifcount = 0;
ast_mutex_unlock(&iflock);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
for (i = 0; i < NUM_SPANS; i++) {
if (pris[i].master && (pris[i].master != AST_PTHREADT_NULL))
pthread_join(pris[i].master, NULL);
@@ -10186,7 +10186,7 @@
static int unload_module(void *mod)
{
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
int y;
for (y = 0; y < NUM_SPANS; y++)
ast_mutex_destroy(&pris[y].lock);
@@ -10207,7 +10207,7 @@
int y;
int found_pseudo = 0;
int cur_radio = 0;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
int spanno;
int i;
int logicalspan;
@@ -10227,7 +10227,7 @@
/* It's a little silly to lock it, but we mind as well just to be sure */
ast_mutex_lock(&iflock);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!reload) {
/* Process trunkgroups first */
v = ast_variable_browse(cfg, "trunkgroups");
@@ -10296,7 +10296,7 @@
while(v) {
/* Create the interface list */
if (!strcasecmp(v->name, "channel")
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
|| !strcasecmp(v->name, "crv")
#endif
) {
@@ -10310,7 +10310,7 @@
}
c = v->value;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
pri = NULL;
if (!strcasecmp(v->name, "crv")) {
if (sscanf(c, "%d:%n", &trunkgroup, &y) != 1) {
@@ -10364,7 +10364,7 @@
}
if (cur_outsignalling < 0) cur_outsignalling = cur_signalling;
for (x = start; x <= finish; x++) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
tmp = mkintf(x, cur_signalling, cur_outsignalling, cur_radio, pri, reload);
#else
tmp = mkintf(x, cur_signalling, cur_outsignalling, cur_radio, NULL, reload);
@@ -10372,7 +10372,7 @@
if (tmp) {
if (option_verbose > 2) {
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (pri)
ast_verbose(VERBOSE_PREFIX_3 "%s CRV %d:%d, %s signalling\n", reload ? "Reconfigured" : "Registered", trunkgroup,x, sig2str(tmp->sig));
else
@@ -10672,7 +10672,7 @@
} else if (!strcasecmp(v->value, "featb")) {
cur_signalling = SIG_FEATB;
cur_radio = 0;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
} else if (!strcasecmp(v->value, "pri_net")) {
cur_radio = 0;
cur_signalling = SIG_PRI;
@@ -10729,7 +10729,7 @@
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
} else if (!strcasecmp(v->name, "pridialplan")) {
if (!strcasecmp(v->value, "national")) {
dialplan = PRI_NATIONAL_ISDN + 1;
@@ -10858,7 +10858,7 @@
} else if (!strcasecmp(v->name, "facilityenable")) {
facilityenable = ast_true(v->value);
#endif /* PRI_GETSET_TIMERS */
-#endif /* HAVE_LIBPRI */
+#endif /* HAVE_PRI */
} else if (!strcasecmp(v->name, "cadence")) {
/* setup to scan our argument */
int element_count, c[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@@ -11016,7 +11016,7 @@
}
ast_mutex_unlock(&iflock);
ast_config_destroy(cfg);
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
if (!reload) {
for (x = 0; x < NUM_SPANS; x++) {
if (pris[x].pvts[0]) {
@@ -11038,7 +11038,7 @@
{
int res;
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
int y,i;
memset(pris, 0, sizeof(pris));
for (y = 0; y < NUM_SPANS; y++) {
@@ -11062,7 +11062,7 @@
__unload_module();
return -1;
}
-#ifdef HAVE_LIBPRI
+#ifdef HAVE_PRI
ast_string_field_init(&inuse, 16);
ast_string_field_set(&inuse, name, "GR-303InUse");
ast_cli_register_multiple(zap_pri_cli, sizeof(zap_pri_cli) / sizeof(zap_pri_cli[0]));
Modified: team/jcollie/bug7021/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/codecs/Makefile?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/codecs/Makefile (original)
+++ team/jcollie/bug7021/codecs/Makefile Thu Jul 6 08:30:38 2006
@@ -23,9 +23,9 @@
all: _all
-ifeq ($(LIBGSM_LIB),internal)
-LIBGSM_INCLUDE:=-Igsm/inc
-LIBGSM_LIB:=
+ifeq ($(GSM_LIB),internal)
+GSM_INCLUDE:=-Igsm/inc
+GSM_LIB:=
codec_gsm.so: gsm/lib/libgsm.a
endif
Modified: team/jcollie/bug7021/codecs/codec_gsm.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/codecs/codec_gsm.c?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/codecs/codec_gsm.c (original)
+++ team/jcollie/bug7021/codecs/codec_gsm.c Thu Jul 6 08:30:38 2006
@@ -27,7 +27,7 @@
*/
/*** MODULEINFO
- <depend>libgsm</depend>
+ <depend>gsm</depend>
***/
#include "asterisk.h"
Modified: team/jcollie/bug7021/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/codecs/codec_speex.c?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/codecs/codec_speex.c (original)
+++ team/jcollie/bug7021/codecs/codec_speex.c Thu Jul 6 08:30:38 2006
@@ -28,7 +28,7 @@
*/
/*** MODULEINFO
- <depend>libspeex</depend>
+ <depend>speex</depend>
***/
#include "asterisk.h"
Modified: team/jcollie/bug7021/configure
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/configure?rev=37142&r1=37141&r2=37142&view=diff
==============================================================================
--- team/jcollie/bug7021/configure (original)
+++ team/jcollie/bug7021/configure Thu Jul 6 08:30:38 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 36960 .
+# From configure.ac Revision: 37086 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e.
#
@@ -690,100 +690,108 @@
LN
DOT
AST_DEVMODE
-EGREP
ALSA_LIB
ALSA_INCLUDE
-PBX_LIBALSA
+PBX_ALSA
CURSES_LIB
CURSES_INCLUDE
-PBX_LIBCURSES
-gsm_LIB
-gsm_INCLUDE
-PBX_LIBgsm
-KDE_INCLUDE
-KDE_LIB
-PBX_KDE
-KDEINIT
-KDEDIR
+PBX_CURSES
+GSM_LIB
+GSM_INCLUDE
+PBX_GSM
IKSEMEL_LIB
IKSEMEL_INCLUDE
-PBX_LIBIKSEMEL
+PBX_IKSEMEL
+IMAP_TK_LIB
+IMAP_TK_INCLUDE
+PBX_IMAP_TK
+KDE_LIB
+KDE_INCLUDE
+PBX_KDE
NBS_LIB
NBS_INCLUDE
-PBX_LIBNBS
+PBX_NBS
NCURSES_LIB
NCURSES_INCLUDE
-PBX_LIBNCURSES
-NETSNMP_CONFIG
+PBX_NCURSES
NETSNMP_LIB
+NETSNMP_INCLUDE
PBX_NETSNMP
NEWT_LIB
NEWT_INCLUDE
-PBX_LIBNEWT
+PBX_NEWT
UNIXODBC_LIB
UNIXODBC_INCLUDE
-PBX_LIBUNIXODBC
+PBX_UNIXODBC
OGG_LIB
OGG_INCLUDE
-PBX_LIBOGG
+PBX_OGG
OSPTK_LIB
OSPTK_INCLUDE
-PBX_LIBOSPTK
+PBX_OSPTK
OSS_LIB
OSS_INCLUDE
-PBX_LIBOSS
-PG_CONFIG
-pq_INCLUDE
-pq_LIB
-PBX_LIBpq
+PBX_OSS
POPT_LIB
POPT_INCLUDE
-PBX_LIBPOPT
-LIBPRI_LIB
-LIBPRI_INCLUDE
-PBX_LIBLIBPRI
+PBX_POPT
+PGSQL_LIB
+PGSQL_INCLUDE
+PBX_PGSQL
+PRI_LIB
+PRI_INCLUDE
+PBX_PRI
+PWLIB_LIB
PWLIB_INCLUDE
-PWLIB_LIB
-PBX_LIBPWLIB
+PBX_PWLIB
+QT_LIB
QT_INCLUDE
-QT_LIB
-QTMOC
PBX_QT
-RADIUSCLIENT_LIB
-RADIUSCLIENT_INCLUDE
-PBX_LIBRADIUSCLIENT
+RADIUS_LIB
+RADIUS_INCLUDE
+PBX_RADIUS
SPEEX_LIB
SPEEX_INCLUDE
-PBX_LIBSPEEX
+PBX_SPEEX
SQLITE_LIB
SQLITE_INCLUDE
-PBX_LIBSQLITE
+PBX_SQLITE
OPENSSL_LIB
OPENSSL_INCLUDE
-PBX_LIBOPENSSL
+PBX_OPENSSL
FREETDS_LIB
FREETDS_INCLUDE
-PBX_LIBFREETDS
+PBX_FREETDS
TERMCAP_LIB
TERMCAP_INCLUDE
-PBX_LIBTERMCAP
+PBX_TERMCAP
TINFO_LIB
TINFO_INCLUDE
-PBX_LIBTINFO
+PBX_TINFO
TONEZONE_LIB
TONEZONE_INCLUDE
-PBX_LIBTONEZONE
+PBX_TONEZONE
VORBIS_LIB
VORBIS_INCLUDE
-PBX_LIBVORBIS
+PBX_VORBIS
+VPB_LIB
VPB_INCLUDE
-VPB_LIB
-PBX_LIBvpb
+PBX_VPB
ZLIB_LIB
ZLIB_INCLUDE
-PBX_LIBZLIB
+PBX_ZLIB
+ZAPTEL_LIB
ZAPTEL_INCLUDE
PBX_ZAPTEL
+ALLOCA
+EGREP
+LIBOBJS
+POW_LIB
+KDEINIT
+KDEDIR
+NETSNMP_CONFIG
+PG_CONFIG
+QTMOC
EDITLINE_LIB
PBX_H323
PBX_IXJUSER
@@ -794,9 +802,6 @@
CURL
PBX_CURL
CURLLIB
-ALLOCA
-LIBOBJS
-POW_LIB
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -1392,24 +1397,24 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-asound=PATH use Advanced Linux Sound Architecture files in PATH
--with-curses=PATH use curses files in PATH
- --with-gsm=PATH use libgsm files in PATH, or 'internal'
+ --with-gsm=PATH use GSM files in PATH , or 'internal'
+ --with-iksemel=PATH use Iksemel Jabber Library files in PATH
+ --with-imap=PATH use UW IMAP Toolkit files in PATH
--with-kde=PATH use KDE files in PATH
- --with-iksemel=PATH use Iksemel Jabber Library files in PATH
--with-nbs=PATH use Network Broadcast Sound files in PATH
--with-ncurses=PATH use ncurses files in PATH
- --with-netsnmp=PATH use Net-SNMP in PATH
+ --with-netsnmp=PATH use Net-SNMP files in PATH
--with-newt=PATH use newt files in PATH
--with-odbc=PATH use unixODBC files in PATH
--with-ogg=PATH use OGG files in PATH
--with-osptk=PATH use OSP Toolkit files in PATH
- --with-ossaudio=PATH use Open Sound System files in PATH
- --with-pq=PATH use PostgreSQL files in PATH
+ --with-oss=PATH use Open Sound System files in PATH
--with-popt=PATH use popt files in PATH
+ --with-postgres=PATH use PostgreSQL files in PATH
--with-pri=PATH use ISDN PRI files in PATH
- --with-pwlib=PATH use PWLib files in PATH
+ --with-pwlib=PATH use PWlib files in PATH
--with-qt=PATH use Qt files in PATH
- --with-radiusclient-ng=PATH
- use Radius Client files in PATH
+ --with-radius=PATH use Radius Client files in PATH
--with-speex=PATH use Speex files in PATH
--with-sqlite=PATH use SQLite files in PATH
--with-ssl=PATH use OpenSSL files in PATH
@@ -1418,7 +1423,7 @@
--with-tinfo=PATH use Term Info files in PATH
--with-tonezone=PATH use tonezone files in PATH
--with-vorbis=PATH use Vorbis files in PATH
- --with-vpb=PATH use vpb files in PATH
+ --with-vpb=PATH use Voicetronix API files in PATH
--with-z=PATH use zlib files in PATH
--with-zaptel=PATH use Zaptel files in PATH
@@ -2226,10 +2231,10 @@
# XXX temporary hack to let FreeBSD use the default paths
# for local stuff. We need a better solution.
if test x"${CPPFLAGS}" = x; then
- CPPFLAGS="-I /usr/local/include"
+ CPPFLAGS="-I/usr/local/include"
fi
if test x"${LDFLAGS}" = x; then
- LDFLAGS="-L /usr/local/lib"
+ LDFLAGS="-L/usr/local/lib"
fi
;;
*openbsd*)
@@ -5546,8 +5551,849 @@
-# from here on down, library checking should be done in alphabetical order
+# package option names should be in alphabetical order
# by the --with option name, to make things easier for the users :-)
+
+
+ALSA_DESCRIP="Advanced Linux Sound Architecture"
+ALSA_OPTION="asound"
+
+# Check whether --with-asound was given.
+if test "${with_asound+set}" = set; then
+ withval=$with_asound;
+case ${withval} in
+ n|no)
+ USE_ALSA=no
+ ;;
+ y|ye|yes)
+ ALSA_MANDATORY="yes"
+ ;;
+ *)
+ ALSA_DIR="${withval}"
+ ALSA_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_ALSA=0
+
+
+
+
+
+CURSES_DESCRIP="curses"
+CURSES_OPTION="curses"
+
+# Check whether --with-curses was given.
+if test "${with_curses+set}" = set; then
+ withval=$with_curses;
+case ${withval} in
+ n|no)
+ USE_CURSES=no
+ ;;
+ y|ye|yes)
+ CURSES_MANDATORY="yes"
+ ;;
+ *)
+ CURSES_DIR="${withval}"
+ CURSES_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_CURSES=0
+
+
+
+
+
+GSM_DESCRIP="GSM"
+GSM_OPTION="gsm"
+
+# Check whether --with-gsm was given.
+if test "${with_gsm+set}" = set; then
+ withval=$with_gsm;
+case ${withval} in
+ n|no)
+ USE_GSM=no
+ ;;
+ y|ye|yes)
+ GSM_MANDATORY="yes"
+ ;;
+ *)
+ GSM_DIR="${withval}"
+ GSM_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_GSM=0
+
+
+
+
+
+IKSEMEL_DESCRIP="Iksemel Jabber Library"
+IKSEMEL_OPTION="iksemel"
+
+# Check whether --with-iksemel was given.
+if test "${with_iksemel+set}" = set; then
+ withval=$with_iksemel;
+case ${withval} in
+ n|no)
+ USE_IKSEMEL=no
+ ;;
+ y|ye|yes)
+ IKSEMEL_MANDATORY="yes"
+ ;;
+ *)
+ IKSEMEL_DIR="${withval}"
+ IKSEMEL_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_IKSEMEL=0
+
+
+
+
+
+IMAP_TK_DESCRIP="UW IMAP Toolkit"
+IMAP_TK_OPTION="imap"
+
+# Check whether --with-imap was given.
+if test "${with_imap+set}" = set; then
+ withval=$with_imap;
+case ${withval} in
+ n|no)
+ USE_IMAP_TK=no
+ ;;
+ y|ye|yes)
+ IMAP_TK_MANDATORY="yes"
+ ;;
+ *)
+ IMAP_TK_DIR="${withval}"
+ IMAP_TK_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_IMAP_TK=0
+
+
+
+
+
+KDE_DESCRIP="KDE"
+KDE_OPTION="kde"
+
+# Check whether --with-kde was given.
+if test "${with_kde+set}" = set; then
+ withval=$with_kde;
+case ${withval} in
+ n|no)
+ USE_KDE=no
+ ;;
+ y|ye|yes)
+ KDE_MANDATORY="yes"
+ ;;
+ *)
+ KDE_DIR="${withval}"
+ KDE_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_KDE=0
+
+
+
+
+
+NBS_DESCRIP="Network Broadcast Sound"
+NBS_OPTION="nbs"
+
+# Check whether --with-nbs was given.
+if test "${with_nbs+set}" = set; then
+ withval=$with_nbs;
+case ${withval} in
+ n|no)
+ USE_NBS=no
+ ;;
+ y|ye|yes)
+ NBS_MANDATORY="yes"
+ ;;
+ *)
+ NBS_DIR="${withval}"
+ NBS_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_NBS=0
+
+
+
+
+
+NCURSES_DESCRIP="ncurses"
+NCURSES_OPTION="ncurses"
+
+# Check whether --with-ncurses was given.
+if test "${with_ncurses+set}" = set; then
+ withval=$with_ncurses;
+case ${withval} in
+ n|no)
+ USE_NCURSES=no
+ ;;
+ y|ye|yes)
+ NCURSES_MANDATORY="yes"
+ ;;
+ *)
+ NCURSES_DIR="${withval}"
+ NCURSES_MANDATORY="yes"
+ ;;
+esac
+
+fi
+
+PBX_NCURSES=0
+
+
+
+
+
+NETSNMP_DESCRIP="Net-SNMP"
+NETSNMP_OPTION="netsnmp"
+
+# Check whether --with-netsnmp was given.
+if test "${with_netsnmp+set}" = set; then
+ withval=$with_netsnmp;
+case ${withval} in
+ n|no)
+ USE_NETSNMP=no
+ ;;
+ y|ye|yes)
+ NETSNMP_MANDATORY="yes"
+ ;;
+ *)
+ NETSNMP_DIR="${withval}"
[... 27975 lines stripped ...]
More information about the asterisk-commits
mailing list