[asterisk-commits] branch oej/cdr_radius r28864 - in
/team/oej/cdr_radius: ./ apps/ channels/ ch...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri May 19 16:09:41 MST 2006
Author: russell
Date: Fri May 19 18:09:41 2006
New Revision: 28864
URL: http://svn.digium.com/view/asterisk?rev=28864&view=rev
Log:
resolve conflicts and get in sync with trunk
Modified:
team/oej/cdr_radius/ (props changed)
team/oej/cdr_radius/Makefile
team/oej/cdr_radius/UPGRADE.txt
team/oej/cdr_radius/acinclude.m4
team/oej/cdr_radius/app.c
team/oej/cdr_radius/apps/app_hasnewvoicemail.c
team/oej/cdr_radius/apps/app_voicemail.c
team/oej/cdr_radius/asterisk.c
team/oej/cdr_radius/channels/chan_iax2.c
team/oej/cdr_radius/channels/chan_sip.c
team/oej/cdr_radius/channels/chan_skinny.c
team/oej/cdr_radius/channels/h323/Makefile
team/oej/cdr_radius/cli.c
team/oej/cdr_radius/configure
team/oej/cdr_radius/configure.ac
team/oej/cdr_radius/include/asterisk/app.h
team/oej/cdr_radius/makeopts.in
team/oej/cdr_radius/manager.c
team/oej/cdr_radius/pbx.c
team/oej/cdr_radius/pbx/pbx_spool.c
team/oej/cdr_radius/sample.call
team/oej/cdr_radius/utils/Makefile
team/oej/cdr_radius/utils/smsq.c
Propchange: team/oej/cdr_radius/
------------------------------------------------------------------------------
automerge = *
Propchange: team/oej/cdr_radius/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Fri May 19 18:09:41 2006
@@ -1,1 +1,1 @@
-oej at edvina.net
+russell at digium.com
Propchange: team/oej/cdr_radius/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/cdr_radius/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 19 18:09:41 2006
@@ -1,1 +1,1 @@
-/trunk:1-28723
+/trunk:1-28834
Modified: team/oej/cdr_radius/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/Makefile?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/Makefile (original)
+++ team/oej/cdr_radius/Makefile Fri May 19 18:09:41 2006
@@ -82,41 +82,27 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
ifeq ($(OSARCH),SunOS)
- ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
- ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
- ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
- ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
- ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
- ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
- ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+ ASTETCDIR=/etc/opt/asterisk
+ ASTLIBDIR=/opt/asterisk/lib
+ ASTVARLIBDIR=/var/opt/asterisk/lib
+ ASTSPOOLDIR=/var/opt/asterisk/spool
+ ASTLOGDIR=/var/opt/asterisk/log
+ ASTHEADERDIR=/opt/asterisk/usr/include/asterisk
+ ASTBINDIR=/opt/asterisk/usr/bin
+ ASTSBINDIR=/opt/asterisk/usr/sbin
+ ASTVARRUNDIR=/var/opt/asterisk/run
+ ASTMANDIR=/opt/asterisk/usr/share/man
else
-ifeq ($(OSARCH),FreeBSD)
- PREFIX?=/usr/local
- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-else
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-endif
+ ASTETCDIR=$(sysconfdir)/asterisk
+ ASTLIBDIR=$(libdir)/asterisk
+ ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
+ ASTHEADERDIR=$(includedir)/asterisk
+ ASTBINDIR=$(bindir)
+ ASTSBINDIR=$(sbindir)
+ ASTVARRUNDIR=$(localstatedir)/run
+ ASTMANDIR=$(mandir)
endif
ASTDATADIR?=$(ASTVARLIBDIR)
@@ -279,9 +265,6 @@
endif
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-ASTCFLAGS+=-fomit-frame-pointer
-endif
MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
OTHER_SUBDIRS=utils stdtime agi
Modified: team/oej/cdr_radius/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/UPGRADE.txt?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/UPGRADE.txt (original)
+++ team/oej/cdr_radius/UPGRADE.txt Fri May 19 18:09:41 2006
@@ -107,6 +107,12 @@
to specify which DTMF digits can be used to accept a recording and
which digits can be used to cancel a recording.
+* ast_app_messagecount has been renamed to ast_app_inboxcount. There is now a
+ new ast_app_messagecount function which takes a single context/mailbox/folder
+ mailbox specification and returns the message count for that folder only.
+ This addresses the deficiency of not being able to count the number of
+ messages in folders other than INBOX and Old.
+
Manager:
* After executing the 'status' manager action, the "Status" manager events
Modified: team/oej/cdr_radius/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/acinclude.m4?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/acinclude.m4 (original)
+++ team/oej/cdr_radius/acinclude.m4 Fri May 19 18:09:41 2006
@@ -20,17 +20,17 @@
PBX_LIB$4=0
if test "${USE_$4}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${$4_DIR}" != "x"; then
- libdir="-L${$4_DIR}/lib"
+ pbxlibdir="-L${$1_DIR}/lib"
fi
- AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${libdir} $6)
+ AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $6)
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="${libdir} ${$4_LIB}"
+ $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] )
Modified: team/oej/cdr_radius/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/app.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/app.c (original)
+++ team/oej/cdr_radius/app.c Fri May 19 18:09:41 2006
@@ -145,23 +145,23 @@
}
static int (*ast_has_voicemail_func)(const char *mailbox, const char *folder) = NULL;
-static int (*ast_messagecount_func)(const char *mailbox, int *newmsgs, int *oldmsgs) = NULL;
-static int (*ast_messagecount2_func)(const char *context, const char *mailbox, const char *folder) = NULL;
+static int (*ast_inboxcount_func)(const char *mailbox, int *newmsgs, int *oldmsgs) = NULL;
+static int (*ast_messagecount_func)(const char *context, const char *mailbox, const char *folder) = NULL;
void ast_install_vm_functions(int (*has_voicemail_func)(const char *mailbox, const char *folder),
- int (*messagecount_func)(const char *mailbox, int *newmsgs, int *oldmsgs),
- int (*messagecount2_func)(const char *context, const char *mailbox, const char *folder))
+ int (*inboxcount_func)(const char *mailbox, int *newmsgs, int *oldmsgs),
+ int (*messagecount_func)(const char *context, const char *mailbox, const char *folder))
{
ast_has_voicemail_func = has_voicemail_func;
+ ast_inboxcount_func = inboxcount_func;
ast_messagecount_func = messagecount_func;
- ast_messagecount2_func = messagecount2_func;
}
void ast_uninstall_vm_functions(void)
{
ast_has_voicemail_func = NULL;
+ ast_inboxcount_func = NULL;
ast_messagecount_func = NULL;
- ast_messagecount2_func = NULL;
}
int ast_app_has_voicemail(const char *mailbox, const char *folder)
@@ -178,15 +178,15 @@
}
-int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
+int ast_app_inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
{
static int warned = 0;
if (newmsgs)
*newmsgs = 0;
if (oldmsgs)
*oldmsgs = 0;
- if (ast_messagecount_func)
- return ast_messagecount_func(mailbox, newmsgs, oldmsgs);
+ if (ast_inboxcount_func)
+ return ast_inboxcount_func(mailbox, newmsgs, oldmsgs);
if (!warned && (option_verbose > 2)) {
warned++;
@@ -196,11 +196,11 @@
return 0;
}
-int ast_app_messagecount2(const char *context, const char *mailbox, const char *folder)
+int ast_app_messagecount(const char *context, const char *mailbox, const char *folder)
{
static int warned = 0;
- if (ast_messagecount2_func)
- return ast_messagecount2_func(context, mailbox, folder);
+ if (ast_messagecount_func)
+ return ast_messagecount_func(context, mailbox, folder);
if (!warned && (option_verbose > 2)) {
warned++;
Modified: team/oej/cdr_radius/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/apps/app_hasnewvoicemail.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/apps/app_hasnewvoicemail.c (original)
+++ team/oej/cdr_radius/apps/app_hasnewvoicemail.c Fri May 19 18:09:41 2006
@@ -128,7 +128,7 @@
priority_jump = 1;
}
- vmcount = ast_app_messagecount2(context, vmbox, vmfolder);
+ vmcount = ast_app_messagecount(context, vmbox, vmfolder);
/* Set the count in the channel variable */
if (varname) {
snprintf(tmp, sizeof(tmp), "%d", vmcount);
@@ -177,7 +177,7 @@
args.folder = "INBOX";
}
- snprintf(buf, len, "%d", ast_app_messagecount2(context, args.vmbox, args.folder));
+ snprintf(buf, len, "%d", ast_app_messagecount(context, args.vmbox, args.folder));
LOCAL_USER_REMOVE(u);
Modified: team/oej/cdr_radius/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/apps/app_voicemail.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/apps/app_voicemail.c (original)
+++ team/oej/cdr_radius/apps/app_voicemail.c Fri May 19 18:09:41 2006
@@ -2012,7 +2012,7 @@
}
#ifdef USE_ODBC_STORAGE
-static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
+static int inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
{
int x = -1;
int res;
@@ -2127,7 +2127,7 @@
return x;
}
-static int messagecount2(const char *context, const char *mailbox, const char *folder)
+static int messagecount(const char *context, const char *mailbox, const char *folder)
{
struct odbc_obj *obj = NULL;
int nummsgs = 0;
@@ -2193,7 +2193,7 @@
else
context = "default";
- if (messagecount2(context, tmp, folder))
+ if (messagecount(context, tmp, folder))
return 1;
else
return 0;
@@ -2201,42 +2201,20 @@
#else
-static int __has_voicemail(const char *mailbox, const char *folder, int shortcircuit)
+static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit)
{
DIR *dir;
struct dirent *de;
char fn[256];
- char tmp[256]="";
- char *mb, *cur;
- char *context;
int ret = 0;
if (!folder)
folder = "INBOX";
/* If no mailbox, return immediately */
if (ast_strlen_zero(mailbox))
return 0;
- if (strchr(mailbox, ',')) {
- ast_copy_string(tmp, mailbox, sizeof(tmp));
- mb = tmp;
- ret = 0;
- while((cur = strsep(&mb, ","))) {
- if (!ast_strlen_zero(cur)) {
- if ((ret += __has_voicemail(cur, folder, shortcircuit))) {
- if (shortcircuit)
- return 1;
- }
- }
- }
- return ret;
- }
- ast_copy_string(tmp, mailbox, sizeof(tmp));
- context = strchr(tmp, '@');
- if (context) {
- *context = '\0';
- context++;
- } else
+ if (!context)
context = "default";
- snprintf(fn, sizeof(fn), "%s%s/%s/%s", VM_SPOOL_DIR, context, tmp, folder);
+ snprintf(fn, sizeof(fn), "%s%s/%s/%s", VM_SPOOL_DIR, context, mailbox, folder);
dir = opendir(fn);
if (!dir)
return 0;
@@ -2255,21 +2233,26 @@
static int has_voicemail(const char *mailbox, const char *folder)
{
- return __has_voicemail(mailbox, folder, 1);
-}
-
-static int messagecount2(const char *context, const char *mailbox, const char *folder)
-{
- char tmp[256];
- snprintf(tmp, sizeof(tmp), "%s@%s", mailbox, context);
- return __has_voicemail(tmp, folder, 0);
-}
-
-static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
-{
- DIR *dir;
- struct dirent *de;
- char fn[256];
+ char tmp[256], *tmp2 = tmp, *mbox, *context;
+ ast_copy_string(tmp, mailbox, sizeof(tmp));
+ while ((mbox = strsep(&tmp2, ","))) {
+ if ((context = strchr(mbox, '@')))
+ *context++ = '\0';
+ else
+ context = "default";
+ if (__has_voicemail(context, mbox, folder, 1))
+ return 1;
+ }
+ return 0;
+}
+
+static int messagecount(const char *context, const char *mailbox, const char *folder)
+{
+ return __has_voicemail(context, mailbox, folder, 0);
+}
+
+static int inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
+{
char tmp[256];
char *context;
@@ -2288,7 +2271,7 @@
mb = tmp;
while((cur = strsep(&mb, ", "))) {
if (!ast_strlen_zero(cur)) {
- if (messagecount(cur, newmsgs ? &tmpnew : NULL, oldmsgs ? &tmpold : NULL))
+ if (inboxcount(cur, newmsgs ? &tmpnew : NULL, oldmsgs ? &tmpold : NULL))
return -1;
else {
if (newmsgs)
@@ -2307,32 +2290,10 @@
context++;
} else
context = "default";
- if (newmsgs) {
- snprintf(fn, sizeof(fn), "%s%s/%s/INBOX", VM_SPOOL_DIR, context, tmp);
- dir = opendir(fn);
- if (dir) {
- while ((de = readdir(dir))) {
- if ((strlen(de->d_name) > 3) && !strncasecmp(de->d_name, "msg", 3) &&
- !strcasecmp(de->d_name + strlen(de->d_name) - 3, "txt"))
- (*newmsgs)++;
-
- }
- closedir(dir);
- }
- }
- if (oldmsgs) {
- snprintf(fn, sizeof(fn), "%s%s/%s/Old", VM_SPOOL_DIR, context, tmp);
- dir = opendir(fn);
- if (dir) {
- while ((de = readdir(dir))) {
- if ((strlen(de->d_name) > 3) && !strncasecmp(de->d_name, "msg", 3) &&
- !strcasecmp(de->d_name + strlen(de->d_name) - 3, "txt"))
- (*oldmsgs)++;
-
- }
- closedir(dir);
- }
- }
+ if (newmsgs)
+ *newmsgs = __has_voicemail(context, tmp, "INBOX", 0);
+ if (oldmsgs)
+ *oldmsgs = __has_voicemail(context, tmp, "Old", 0);
return 0;
}
@@ -2410,7 +2371,7 @@
#else
if (!ast_strlen_zero(externnotify)) {
#endif
- if (messagecount(ext_context, &newvoicemails, &oldvoicemails)) {
+ if (inboxcount(ext_context, &newvoicemails, &oldvoicemails)) {
ast_log(LOG_ERROR, "Problem in calculating number of voicemail messages available for extension %s\n", extension);
} else {
snprintf(arguments, sizeof(arguments), "%s %s %s %d&", externnotify, context, extension, newvoicemails);
@@ -3417,7 +3378,7 @@
/* Leave voicemail for someone */
if (ast_app_has_voicemail(ext_context, NULL)) {
- ast_app_messagecount(ext_context, &newmsgs, &oldmsgs);
+ ast_app_inboxcount(ext_context, &newmsgs, &oldmsgs);
}
manager_event(EVENT_FLAG_CALL, "MessageWaiting", "Mailbox: %s@%s\r\nWaiting: %d\r\nNew: %d\r\nOld: %d\r\n", vmu->mailbox, vmu->context, ast_app_has_voicemail(ext_context, NULL), newmsgs, oldmsgs);
run_externnotify(vmu->context, vmu->mailbox);
@@ -6654,7 +6615,7 @@
/* compute the location of the voicemail spool directory */
snprintf(VM_SPOOL_DIR, sizeof(VM_SPOOL_DIR), "%s/voicemail/", ast_config_AST_SPOOL_DIR);
- ast_install_vm_functions(has_voicemail, messagecount, messagecount2);
+ ast_install_vm_functions(has_voicemail, inboxcount, messagecount);
#if defined(USE_ODBC_STORAGE) && !defined(EXTENDED_ODBC_STORAGE)
ast_log(LOG_WARNING, "The current ODBC storage table format will be changed soon."
Modified: team/oej/cdr_radius/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/asterisk.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/asterisk.c (original)
+++ team/oej/cdr_radius/asterisk.c Fri May 19 18:09:41 2006
@@ -2027,13 +2027,17 @@
if (ast_opt_exec && data) { /* hack to print output then exit if asterisk -rx is used */
char tempchar;
+#ifdef __Darwin__
struct pollfd fds[0];
fds[0].fd = ast_consock;
fds[0].events = POLLIN;
fds[0].revents = 0;
- while(poll(fds, 1, 100) > 0) {
+ while (poll(fds, 1, 100) > 0) {
ast_el_read_char(el, &tempchar);
}
+#else
+ while (!ast_el_read_char(el, &tempchar));
+#endif
return;
}
for (;;) {
Modified: team/oej/cdr_radius/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/channels/chan_iax2.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/channels/chan_iax2.c (original)
+++ team/oej/cdr_radius/channels/chan_iax2.c Fri May 19 18:09:41 2006
@@ -5677,7 +5677,7 @@
iax_ie_append_addr(&ied, IAX_IE_APPARENT_ADDR, &p->addr);
if (!ast_strlen_zero(p->mailbox)) {
int new, old;
- ast_app_messagecount(p->mailbox, &new, &old);
+ ast_app_inboxcount(p->mailbox, &new, &old);
if (new > 255)
new = 255;
if (old > 255)
Modified: team/oej/cdr_radius/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/channels/chan_sip.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/channels/chan_sip.c (original)
+++ team/oej/cdr_radius/channels/chan_sip.c Fri May 19 18:09:41 2006
@@ -11702,14 +11702,19 @@
return 0;
}
- /* Initialize the context if it hasn't been already */
+ /* Get destination right away */
+ gotdest = get_destination(p, NULL);
+
+ /* Initialize the context if it hasn't been already;
+ note this is done _after_ handling any domain lookups,
+ because the context specified there is for calls, not
+ subscriptions
+ */
if (!ast_strlen_zero(p->subscribecontext))
ast_string_field_set(p, context, p->subscribecontext);
else if (ast_strlen_zero(p->context))
ast_string_field_set(p, context, default_context);
- /* Get destination right away */
- gotdest = get_destination(p, NULL);
build_contact(p);
if (gotdest) {
transmit_response(p, "404 Not Found", req);
@@ -12193,7 +12198,7 @@
int newmsgs, oldmsgs;
/* Check for messages */
- ast_app_messagecount(peer->mailbox, &newmsgs, &oldmsgs);
+ ast_app_inboxcount(peer->mailbox, &newmsgs, &oldmsgs);
time(&peer->lastmsgcheck);
Modified: team/oej/cdr_radius/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/channels/chan_skinny.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/channels/chan_skinny.c (original)
+++ team/oej/cdr_radius/channels/chan_skinny.c Fri May 19 18:09:41 2006
@@ -1311,7 +1311,7 @@
if (skinnydebug) {
ast_verbose("Checking for voicemail Skinny %s@%s\n", sub->parent->name, sub->parent->parent->name);
}
- ast_app_messagecount(sub->parent->mailbox, &new, &old);
+ ast_app_inboxcount(sub->parent->mailbox, &new, &old);
if (skinnydebug) {
ast_verbose("Skinny %s@%s has voicemail!\n", sub->parent->name, sub->parent->parent->name);
}
Modified: team/oej/cdr_radius/channels/h323/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/channels/h323/Makefile?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/channels/h323/Makefile (original)
+++ team/oej/cdr_radius/channels/h323/Makefile Fri May 19 18:09:41 2006
@@ -8,7 +8,6 @@
STDCCFLAGS += -DNDEBUG
STDCCFLAGS += $(shell grep ^DEBUG_THREADS ../../Makefile | sed -e "s/^DEBUG_THREADS[ ]*=//" -e "s/\([^\#]*\)\#.*/\1/")
STDCCFLAGS += -I../../include -include autoconfig.h
-STDCCFLAGS += -Wmissing-prototypes
STDCCFLAGS += -fPIC
#OPTCCFLAGS +=
CFLAGS += -pipe
@@ -38,4 +37,7 @@
@echo H323LDLIBS = $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) >>$@.tmp
@if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi
+clean::
+ rm -f ast_h323.cxx libchanh323.a Makefile.ast *.dep
+
FORCE:
Modified: team/oej/cdr_radius/cli.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/cli.c?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/cli.c (original)
+++ team/oej/cdr_radius/cli.c Fri May 19 18:09:41 2006
@@ -1313,7 +1313,7 @@
int matchnum=0;
char *ret = NULL;
char matchstr[80] = "";
- int tws;
+ int tws = 0;
char *dup = parse_args(text, &x, argv, sizeof(argv) / sizeof(argv[0]), &tws);
if (!dup) /* error */
@@ -1321,9 +1321,12 @@
argindex = (!ast_strlen_zero(word) && x>0) ? x-1 : x;
/* rebuild the command, ignore tws */
ast_join(matchstr, sizeof(matchstr)-1, argv);
- if (tws)
+ matchlen = strlen(matchstr);
+ if (tws) {
strcat(matchstr, " "); /* XXX */
- matchlen = strlen(matchstr);
+ if (matchlen)
+ matchlen++;
+ }
if (lock)
AST_LIST_LOCK(&helpers);
while( !ret && (e = cli_next(&i)) ) {
Modified: team/oej/cdr_radius/configure
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/configure?rev=28864&r1=28863&r2=28864&view=diff
==============================================================================
--- team/oej/cdr_radius/configure (original)
+++ team/oej/cdr_radius/configure Fri May 19 18:09:41 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 26823 .
+# From configure.ac Revision: 28435 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -276,7 +276,6 @@
ac_unique_file="asterisk"
ac_unique_file="asterisk.c"
-ac_default_prefix=
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1469,7 +1468,26 @@
-
+case "${host}" in
+ *freebsd*)
+ ac_default_prefix=/usr/local
+ ;;
+ *)
+ ac_default_prefix=/usr
+ ;;
+esac
+
+if test ${sysconfdir} = '${prefix}/etc'; then
+ sysconfdir=/etc
+fi
+
+if test ${localstatedir} = '${prefix}/var'; then
+ localstatedir=/var
+fi
+
+if test ${mandir} = '${prefix}/man'; then
+ mandir=/usr/share/man
+fi
### ** Platform.
@@ -4890,9 +4908,9 @@
PBX_LIBALSA=0
if test "${USE_ALSA}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${ALSA_DIR}" != "x"; then
- libdir="-L${ALSA_DIR}/lib"
+ pbxlibdir="-L${asound_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for snd_spcm_init in -lasound" >&5
echo $ECHO_N "checking for snd_spcm_init in -lasound... $ECHO_C" >&6
@@ -4900,7 +4918,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lasound ${libdir} -lm -ldl $LIBS"
+LIBS="-lasound ${pbxlibdir} -lm -ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4968,7 +4986,7 @@
ALSA_LIB="-lasound -lm -ldl"
ALSA_HEADER_FOUND="1"
if test "x${ALSA_DIR}" != "x"; then
- ALSA_LIB="${libdir} ${ALSA_LIB}"
+ ALSA_LIB="${pbxlibdir} ${ALSA_LIB}"
ALSA_INCLUDE="-I${ALSA_DIR}/include"
if test "xalsa/asoundlib.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${ALSA_DIR}/include/alsa/asoundlib.h" | $as_tr_sh`
@@ -5320,9 +5338,9 @@
PBX_LIBCURSES=0
if test "${USE_CURSES}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${CURSES_DIR}" != "x"; then
- libdir="-L${CURSES_DIR}/lib"
+ pbxlibdir="-L${curses_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
@@ -5330,7 +5348,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses ${libdir} $LIBS"
+LIBS="-lcurses ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5398,7 +5416,7 @@
CURSES_LIB="-lcurses "
CURSES_HEADER_FOUND="1"
if test "x${CURSES_DIR}" != "x"; then
- CURSES_LIB="${libdir} ${CURSES_LIB}"
+ CURSES_LIB="${pbxlibdir} ${CURSES_LIB}"
CURSES_INCLUDE="-I${CURSES_DIR}/include"
if test "xcurses.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${CURSES_DIR}/include/curses.h" | $as_tr_sh`
@@ -5750,9 +5768,9 @@
PBX_LIBNBS=0
if test "${USE_NBS}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${NBS_DIR}" != "x"; then
- libdir="-L${NBS_DIR}/lib"
+ pbxlibdir="-L${nbs_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for nbs_connect in -lnbs" >&5
echo $ECHO_N "checking for nbs_connect in -lnbs... $ECHO_C" >&6
@@ -5760,7 +5778,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnbs ${libdir} $LIBS"
+LIBS="-lnbs ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5828,7 +5846,7 @@
NBS_LIB="-lnbs "
NBS_HEADER_FOUND="1"
if test "x${NBS_DIR}" != "x"; then
- NBS_LIB="${libdir} ${NBS_LIB}"
+ NBS_LIB="${pbxlibdir} ${NBS_LIB}"
NBS_INCLUDE="-I${NBS_DIR}/include"
if test "xnbs.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${NBS_DIR}/include/nbs.h" | $as_tr_sh`
@@ -6180,9 +6198,9 @@
PBX_LIBNCURSES=0
if test "${USE_NCURSES}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${NCURSES_DIR}" != "x"; then
- libdir="-L${NCURSES_DIR}/lib"
+ pbxlibdir="-L${ncurses_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
@@ -6190,7 +6208,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses ${libdir} $LIBS"
+LIBS="-lncurses ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6258,7 +6276,7 @@
NCURSES_LIB="-lncurses "
NCURSES_HEADER_FOUND="1"
if test "x${NCURSES_DIR}" != "x"; then
- NCURSES_LIB="${libdir} ${NCURSES_LIB}"
+ NCURSES_LIB="${pbxlibdir} ${NCURSES_LIB}"
NCURSES_INCLUDE="-I${NCURSES_DIR}/include"
if test "xcurses.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${NCURSES_DIR}/include/curses.h" | $as_tr_sh`
@@ -6610,9 +6628,9 @@
PBX_LIBNEWT=0
if test "${USE_NEWT}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${NEWT_DIR}" != "x"; then
- libdir="-L${NEWT_DIR}/lib"
+ pbxlibdir="-L${newt_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for newtBell in -lnewt" >&5
echo $ECHO_N "checking for newtBell in -lnewt... $ECHO_C" >&6
@@ -6620,7 +6638,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnewt ${libdir} $LIBS"
+LIBS="-lnewt ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6688,7 +6706,7 @@
NEWT_LIB="-lnewt "
NEWT_HEADER_FOUND="1"
if test "x${NEWT_DIR}" != "x"; then
- NEWT_LIB="${libdir} ${NEWT_LIB}"
+ NEWT_LIB="${pbxlibdir} ${NEWT_LIB}"
NEWT_INCLUDE="-I${NEWT_DIR}/include"
if test "xnewt.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${NEWT_DIR}/include/newt.h" | $as_tr_sh`
@@ -7040,9 +7058,9 @@
PBX_LIBUNIXODBC=0
if test "${USE_UNIXODBC}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${UNIXODBC_DIR}" != "x"; then
- libdir="-L${UNIXODBC_DIR}/lib"
+ pbxlibdir="-L${odbc_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for SQLConnect in -lodbc" >&5
echo $ECHO_N "checking for SQLConnect in -lodbc... $ECHO_C" >&6
@@ -7050,7 +7068,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lodbc ${libdir} $LIBS"
+LIBS="-lodbc ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7118,7 +7136,7 @@
UNIXODBC_LIB="-lodbc "
UNIXODBC_HEADER_FOUND="1"
if test "x${UNIXODBC_DIR}" != "x"; then
- UNIXODBC_LIB="${libdir} ${UNIXODBC_LIB}"
+ UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
UNIXODBC_INCLUDE="-I${UNIXODBC_DIR}/include"
if test "xsql.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${UNIXODBC_DIR}/include/sql.h" | $as_tr_sh`
@@ -7470,9 +7488,9 @@
PBX_LIBOGG=0
if test "${USE_OGG}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${OGG_DIR}" != "x"; then
- libdir="-L${OGG_DIR}/lib"
+ pbxlibdir="-L${ogg_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for ogg_sync_init in -logg" >&5
echo $ECHO_N "checking for ogg_sync_init in -logg... $ECHO_C" >&6
@@ -7480,7 +7498,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-logg ${libdir} $LIBS"
+LIBS="-logg ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7548,7 +7566,7 @@
OGG_LIB="-logg "
OGG_HEADER_FOUND="1"
if test "x${OGG_DIR}" != "x"; then
- OGG_LIB="${libdir} ${OGG_LIB}"
+ OGG_LIB="${pbxlibdir} ${OGG_LIB}"
OGG_INCLUDE="-I${OGG_DIR}/include"
if test "x" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${OGG_DIR}/include/" | $as_tr_sh`
@@ -7900,9 +7918,9 @@
PBX_LIBOSPTK=0
if test "${USE_OSPTK}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${OSPTK_DIR}" != "x"; then
- libdir="-L${OSPTK_DIR}/lib"
+ pbxlibdir="-L${osptk_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for OSPPCryptoDecrypt in -losptk" >&5
echo $ECHO_N "checking for OSPPCryptoDecrypt in -losptk... $ECHO_C" >&6
@@ -7910,7 +7928,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-losptk ${libdir} -lcrypto -lssl $LIBS"
+LIBS="-losptk ${pbxlibdir} -lcrypto -lssl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7978,7 +7996,7 @@
OSPTK_LIB="-losptk -lcrypto -lssl"
OSPTK_HEADER_FOUND="1"
if test "x${OSPTK_DIR}" != "x"; then
- OSPTK_LIB="${libdir} ${OSPTK_LIB}"
+ OSPTK_LIB="${pbxlibdir} ${OSPTK_LIB}"
OSPTK_INCLUDE="-I${OSPTK_DIR}/include"
if test "xosp/osp.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${OSPTK_DIR}/include/osp/osp.h" | $as_tr_sh`
@@ -8330,9 +8348,9 @@
PBX_LIBPOPT=0
if test "${USE_POPT}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${POPT_DIR}" != "x"; then
- libdir="-L${POPT_DIR}/lib"
+ pbxlibdir="-L${popt_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for poptStrerror in -lpopt" >&5
echo $ECHO_N "checking for poptStrerror in -lpopt... $ECHO_C" >&6
@@ -8340,7 +8358,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpopt ${libdir} $LIBS"
+LIBS="-lpopt ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8408,7 +8426,7 @@
POPT_LIB="-lpopt "
POPT_HEADER_FOUND="1"
if test "x${POPT_DIR}" != "x"; then
- POPT_LIB="${libdir} ${POPT_LIB}"
+ POPT_LIB="${pbxlibdir} ${POPT_LIB}"
POPT_INCLUDE="-I${POPT_DIR}/include"
if test "xpopt.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${POPT_DIR}/include/popt.h" | $as_tr_sh`
@@ -8760,9 +8778,9 @@
PBX_LIBLIBPRI=0
if test "${USE_LIBPRI}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${LIBPRI_DIR}" != "x"; then
- libdir="-L${LIBPRI_DIR}/lib"
+ pbxlibdir="-L${pri_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for pri_call in -lpri" >&5
echo $ECHO_N "checking for pri_call in -lpri... $ECHO_C" >&6
@@ -8770,7 +8788,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpri ${libdir} $LIBS"
+LIBS="-lpri ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8838,7 +8856,7 @@
LIBPRI_LIB="-lpri "
LIBPRI_HEADER_FOUND="1"
if test "x${LIBPRI_DIR}" != "x"; then
- LIBPRI_LIB="${libdir} ${LIBPRI_LIB}"
+ LIBPRI_LIB="${pbxlibdir} ${LIBPRI_LIB}"
LIBPRI_INCLUDE="-I${LIBPRI_DIR}/include"
if test "xlibpri.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${LIBPRI_DIR}/include/libpri.h" | $as_tr_sh`
@@ -9190,9 +9208,9 @@
PBX_LIBRADIUSCLIENT=0
if test "${USE_RADIUSCLIENT}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${RADIUSCLIENT_DIR}" != "x"; then
- libdir="-L${RADIUSCLIENT_DIR}/lib"
+ pbxlibdir="-L${radiusclient-ng_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5
echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6
@@ -9200,7 +9218,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lradiusclient-ng ${libdir} $LIBS"
+LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9268,7 +9286,7 @@
RADIUSCLIENT_LIB="-lradiusclient-ng "
RADIUSCLIENT_HEADER_FOUND="1"
if test "x${RADIUSCLIENT_DIR}" != "x"; then
- RADIUSCLIENT_LIB="${libdir} ${RADIUSCLIENT_LIB}"
+ RADIUSCLIENT_LIB="${pbxlibdir} ${RADIUSCLIENT_LIB}"
RADIUSCLIENT_INCLUDE="-I${RADIUSCLIENT_DIR}/include"
if test "xradiusclient-ng.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${RADIUSCLIENT_DIR}/include/radiusclient-ng.h" | $as_tr_sh`
@@ -9620,9 +9638,9 @@
PBX_LIBSPEEX=0
if test "${USE_SPEEX}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${SPEEX_DIR}" != "x"; then
- libdir="-L${SPEEX_DIR}/lib"
+ pbxlibdir="-L${speex_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for speex_encode in -lspeex" >&5
echo $ECHO_N "checking for speex_encode in -lspeex... $ECHO_C" >&6
@@ -9630,7 +9648,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lspeex ${libdir} -lm $LIBS"
+LIBS="-lspeex ${pbxlibdir} -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9698,7 +9716,7 @@
SPEEX_LIB="-lspeex -lm"
SPEEX_HEADER_FOUND="1"
if test "x${SPEEX_DIR}" != "x"; then
- SPEEX_LIB="${libdir} ${SPEEX_LIB}"
+ SPEEX_LIB="${pbxlibdir} ${SPEEX_LIB}"
SPEEX_INCLUDE="-I${SPEEX_DIR}/include"
if test "xspeex/speex.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${SPEEX_DIR}/include/speex/speex.h" | $as_tr_sh`
@@ -10050,9 +10068,9 @@
PBX_LIBSQLITE=0
if test "${USE_SQLITE}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${SQLITE_DIR}" != "x"; then
- libdir="-L${SQLITE_DIR}/lib"
+ pbxlibdir="-L${sqlite_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for sqlite_exec in -lsqlite" >&5
echo $ECHO_N "checking for sqlite_exec in -lsqlite... $ECHO_C" >&6
@@ -10060,7 +10078,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsqlite ${libdir} $LIBS"
+LIBS="-lsqlite ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10128,7 +10146,7 @@
SQLITE_LIB="-lsqlite "
SQLITE_HEADER_FOUND="1"
if test "x${SQLITE_DIR}" != "x"; then
- SQLITE_LIB="${libdir} ${SQLITE_LIB}"
+ SQLITE_LIB="${pbxlibdir} ${SQLITE_LIB}"
SQLITE_INCLUDE="-I${SQLITE_DIR}/include"
if test "xsqlite.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${SQLITE_DIR}/include/sqlite.h" | $as_tr_sh`
@@ -10480,9 +10498,9 @@
PBX_LIBOPENSSL=0
if test "${USE_OPENSSL}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${OPENSSL_DIR}" != "x"; then
- libdir="-L${OPENSSL_DIR}/lib"
+ pbxlibdir="-L${ssl_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for ssl2_connect in -lssl" >&5
echo $ECHO_N "checking for ssl2_connect in -lssl... $ECHO_C" >&6
@@ -10490,7 +10508,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl ${libdir} -lcrypto $LIBS"
+LIBS="-lssl ${pbxlibdir} -lcrypto $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10558,7 +10576,7 @@
OPENSSL_LIB="-lssl -lcrypto"
OPENSSL_HEADER_FOUND="1"
if test "x${OPENSSL_DIR}" != "x"; then
- OPENSSL_LIB="${libdir} ${OPENSSL_LIB}"
+ OPENSSL_LIB="${pbxlibdir} ${OPENSSL_LIB}"
OPENSSL_INCLUDE="-I${OPENSSL_DIR}/include"
if test "xopenssl/ssl.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${OPENSSL_DIR}/include/openssl/ssl.h" | $as_tr_sh`
@@ -10910,9 +10928,9 @@
PBX_LIBFREETDS=0
if test "${USE_FREETDS}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${FREETDS_DIR}" != "x"; then
- libdir="-L${FREETDS_DIR}/lib"
+ pbxlibdir="-L${tds_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tds_version in -ltds" >&5
echo $ECHO_N "checking for tds_version in -ltds... $ECHO_C" >&6
@@ -10920,7 +10938,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltds ${libdir} $LIBS"
+LIBS="-ltds ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10988,7 +11006,7 @@
FREETDS_LIB="-ltds "
FREETDS_HEADER_FOUND="1"
if test "x${FREETDS_DIR}" != "x"; then
- FREETDS_LIB="${libdir} ${FREETDS_LIB}"
+ FREETDS_LIB="${pbxlibdir} ${FREETDS_LIB}"
FREETDS_INCLUDE="-I${FREETDS_DIR}/include"
if test "xtds.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${FREETDS_DIR}/include/tds.h" | $as_tr_sh`
@@ -11340,9 +11358,9 @@
PBX_LIBTERMCAP=0
if test "${USE_TERMCAP}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${TERMCAP_DIR}" != "x"; then
- libdir="-L${TERMCAP_DIR}/lib"
+ pbxlibdir="-L${termcap_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
@@ -11350,7 +11368,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltermcap ${libdir} $LIBS"
+LIBS="-ltermcap ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11418,7 +11436,7 @@
TERMCAP_LIB="-ltermcap "
TERMCAP_HEADER_FOUND="1"
if test "x${TERMCAP_DIR}" != "x"; then
- TERMCAP_LIB="${libdir} ${TERMCAP_LIB}"
+ TERMCAP_LIB="${pbxlibdir} ${TERMCAP_LIB}"
TERMCAP_INCLUDE="-I${TERMCAP_DIR}/include"
if test "x" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${TERMCAP_DIR}/include/" | $as_tr_sh`
@@ -11770,9 +11788,9 @@
PBX_LIBTINFO=0
if test "${USE_TINFO}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${TINFO_DIR}" != "x"; then
- libdir="-L${TINFO_DIR}/lib"
+ pbxlibdir="-L${tinfo_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tgetent in -ltinfo" >&5
echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6
@@ -11780,7 +11798,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltinfo ${libdir} $LIBS"
+LIBS="-ltinfo ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11848,7 +11866,7 @@
TINFO_LIB="-ltinfo "
TINFO_HEADER_FOUND="1"
if test "x${TINFO_DIR}" != "x"; then
- TINFO_LIB="${libdir} ${TINFO_LIB}"
+ TINFO_LIB="${pbxlibdir} ${TINFO_LIB}"
TINFO_INCLUDE="-I${TINFO_DIR}/include"
if test "x" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${TINFO_DIR}/include/" | $as_tr_sh`
[... 505 lines stripped ...]
More information about the asterisk-commits
mailing list