[svn-commits] oej: branch oej/astum r59034 - in /team/oej/astum: ./
apps/ build_tools/ cdr/...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sun Mar 18 02:40:39 MST 2007
Author: oej
Date: Sun Mar 18 04:40:37 2007
New Revision: 59034
URL: http://svn.digium.com/view/asterisk?view=rev&rev=59034
Log:
Reset automerge on this branch
Added:
team/oej/astum/cdr/cdr_sqlite3_custom.c
- copied unchanged from r58995, trunk/cdr/cdr_sqlite3_custom.c
team/oej/astum/configs/cdr_sqlite3_custom.conf
- copied unchanged from r58995, trunk/configs/cdr_sqlite3_custom.conf
team/oej/astum/configs/res_config_sqlite.conf
- copied unchanged from r58995, trunk/configs/res_config_sqlite.conf
team/oej/astum/doc/ael.tex
- copied unchanged from r58995, trunk/doc/ael.tex
team/oej/astum/doc/ajam.tex
- copied unchanged from r58995, trunk/doc/ajam.tex
team/oej/astum/doc/app-sms.tex
- copied unchanged from r58995, trunk/doc/app-sms.tex
team/oej/astum/doc/ast_appdocs.tex
- copied unchanged from r58995, trunk/doc/ast_appdocs.tex
team/oej/astum/doc/asterisk-conf.tex
- copied unchanged from r58995, trunk/doc/asterisk-conf.tex
team/oej/astum/doc/asterisk.tex
- copied unchanged from r58995, trunk/doc/asterisk.tex
team/oej/astum/doc/billing.tex
- copied unchanged from r58995, trunk/doc/billing.tex
team/oej/astum/doc/cdrdriver.tex
- copied unchanged from r58995, trunk/doc/cdrdriver.tex
team/oej/astum/doc/chaniax.tex
- copied unchanged from r58995, trunk/doc/chaniax.tex
team/oej/astum/doc/channelvariables.tex
- copied unchanged from r58995, trunk/doc/channelvariables.tex
team/oej/astum/doc/cliprompt.tex
- copied unchanged from r58995, trunk/doc/cliprompt.tex
team/oej/astum/doc/configuration.tex
- copied unchanged from r58995, trunk/doc/configuration.tex
team/oej/astum/doc/dundi.tex
- copied unchanged from r58995, trunk/doc/dundi.tex
team/oej/astum/doc/enum.tex
- copied unchanged from r58995, trunk/doc/enum.tex
team/oej/astum/doc/extensions.tex
- copied unchanged from r58995, trunk/doc/extensions.tex
team/oej/astum/doc/freetds.tex
- copied unchanged from r58995, trunk/doc/freetds.tex
team/oej/astum/doc/hardware.tex
- copied unchanged from r58995, trunk/doc/hardware.tex
team/oej/astum/doc/ices.tex
- copied unchanged from r58995, trunk/doc/ices.tex
team/oej/astum/doc/imapstorage.tex
- copied unchanged from r58995, trunk/doc/imapstorage.tex
team/oej/astum/doc/ip-tos.tex
- copied unchanged from r58995, trunk/doc/ip-tos.tex
team/oej/astum/doc/jitterbuffer.tex
- copied unchanged from r58995, trunk/doc/jitterbuffer.tex
team/oej/astum/doc/localchannel.tex
- copied unchanged from r58995, trunk/doc/localchannel.tex
team/oej/astum/doc/manager.tex
- copied unchanged from r58995, trunk/doc/manager.tex
team/oej/astum/doc/misdn.tex
- copied unchanged from r58995, trunk/doc/misdn.tex
team/oej/astum/doc/mp3.tex
- copied unchanged from r58995, trunk/doc/mp3.tex
team/oej/astum/doc/odbcstorage.tex
- copied unchanged from r58995, trunk/doc/odbcstorage.tex
team/oej/astum/doc/privacy.tex
- copied unchanged from r58995, trunk/doc/privacy.tex
team/oej/astum/doc/queuelog.tex
- copied unchanged from r58995, trunk/doc/queuelog.tex
team/oej/astum/doc/queues-with-callback-members.tex
- copied unchanged from r58995, trunk/doc/queues-with-callback-members.tex
team/oej/astum/doc/realtime.tex
- copied unchanged from r58995, trunk/doc/realtime.tex
team/oej/astum/doc/res_config_sqlite.txt
- copied unchanged from r58995, trunk/doc/res_config_sqlite.txt
team/oej/astum/doc/security.tex
- copied unchanged from r58995, trunk/doc/security.tex
team/oej/astum/res/res_config_sqlite.c
- copied unchanged from r58995, trunk/res/res_config_sqlite.c
Removed:
team/oej/astum/doc/00README.1st
team/oej/astum/doc/ael.txt
team/oej/astum/doc/ajam.txt
team/oej/astum/doc/app-sms.txt
team/oej/astum/doc/apps.txt
team/oej/astum/doc/asterisk-conf.txt
team/oej/astum/doc/billing.txt
team/oej/astum/doc/callingpres.txt
team/oej/astum/doc/cdrdriver.txt
team/oej/astum/doc/chaniax.txt
team/oej/astum/doc/channels.txt
team/oej/astum/doc/channelvariables.txt
team/oej/astum/doc/cliprompt.txt
team/oej/astum/doc/configuration.txt
team/oej/astum/doc/cygwin.txt
team/oej/astum/doc/dundi.txt
team/oej/astum/doc/enum.txt
team/oej/astum/doc/extconfig.txt
team/oej/astum/doc/extensions.txt
team/oej/astum/doc/freetds.txt
team/oej/astum/doc/h323.txt
team/oej/astum/doc/hardware.txt
team/oej/astum/doc/iax.txt
team/oej/astum/doc/ices.txt
team/oej/astum/doc/imapstorage.txt
team/oej/astum/doc/ip-tos.txt
team/oej/astum/doc/jitterbuffer.txt
team/oej/astum/doc/localchannel.txt
team/oej/astum/doc/manager.txt
team/oej/astum/doc/math.txt
team/oej/astum/doc/misdn.txt
team/oej/astum/doc/model.txt
team/oej/astum/doc/mp3.txt
team/oej/astum/doc/musiconhold-fpm.txt
team/oej/astum/doc/mysql.txt
team/oej/astum/doc/odbcstorage.txt
team/oej/astum/doc/privacy.txt
team/oej/astum/doc/queuelog.txt
team/oej/astum/doc/queues-with-callback-members.txt
team/oej/astum/doc/radius.txt
team/oej/astum/doc/realtime.txt
team/oej/astum/doc/security.txt
team/oej/astum/doc/sla.pdf
Modified:
team/oej/astum/ (props changed)
team/oej/astum/CHANGES
team/oej/astum/Makefile
team/oej/astum/UPGRADE.txt
team/oej/astum/apps/app_meetme.c
team/oej/astum/apps/app_page.c
team/oej/astum/apps/app_voicemail.c
team/oej/astum/build_tools/make_buildopts_h
team/oej/astum/build_tools/menuselect-deps.in
team/oej/astum/build_tools/prep_tarball
team/oej/astum/cdr/cdr_radius.c
team/oej/astum/cdr/cdr_sqlite.c
team/oej/astum/channels/chan_h323.c
team/oej/astum/channels/chan_iax2.c
team/oej/astum/channels/chan_sip.c
team/oej/astum/configs/extconfig.conf.sample
team/oej/astum/configs/sla.conf.sample
team/oej/astum/configure
team/oej/astum/configure.ac
team/oej/astum/doc/PEERING
team/oej/astum/doc/sla.tex
team/oej/astum/funcs/func_realtime.c
team/oej/astum/funcs/func_strings.c
team/oej/astum/include/asterisk/autoconfig.h.in
team/oej/astum/main/pbx.c
team/oej/astum/makeopts.in
Propchange: team/oej/astum/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/astum/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/oej/astum/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/astum/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 18 04:40:37 2007
@@ -1,1 +1,1 @@
-/trunk:1-58805
+/trunk:1-59033
Modified: team/oej/astum/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/astum/CHANGES?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/CHANGES (original)
+++ team/oej/astum/CHANGES Sun Mar 18 04:40:37 2007
@@ -66,6 +66,8 @@
* Added the parkedcallreparking option to features.conf
* SMDI is now enabled in voicemail using the smdienable option.
* Added zap show version CLI command to chan_zap.
+ * Added a new CDR module, cdr_sqlite3_custom.
+ * Added a new realtime configuration module, res_config_sqlite
AMI - The manager (TCP/TLS/HTTP)
--------------------------------
Modified: team/oej/astum/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/astum/Makefile?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/Makefile (original)
+++ team/oej/astum/Makefile Sun Mar 18 04:40:37 2007
@@ -46,6 +46,7 @@
export ASTCONFPATH
export NOISY_BUILD
export MENUSELECT_CFLAGS
+export AST_DEVMODE
export CC
export CXX
export AR
@@ -673,14 +674,42 @@
menuconfig: menuselect
+gmenuconfig: gmenuselect
+
menuselect: menuselect/menuselect menuselect-tree
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+gmenuselect: menuselect/gmenuselect menuselect-tree
+ - at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
+menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
+ @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
+asterisk.pdf: doc/asterisk.pdf
+
+doc/asterisk.pdf: $(wildcard doc/*.tex)
+ifeq ($(findstring rubber,$(RUBBER)),)
+ @echo "**********************************************"
+ @echo "** You must install the \"rubber\" tool ***"
+ @echo "** to generate the Asterisk reference PDF. ***"
+ @echo "**********************************************"
+else
+ @echo "**********************************************"
+ @echo "** The Asterisk reference PDF will now be ***"
+ @echo "** generated. When complete, it will be ***"
+ @echo "** located at doc/asterisk.pdf. ***"
+ @echo "**********************************************"
+ @cp doc/asterisk.tex doc/asterisk.tex.orig
+ @sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
+ @cd doc && $(RUBBER) --pdf asterisk.tex
+ @mv doc/asterisk.tex.orig doc/asterisk.tex
+endif
+
.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/oej/astum/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/astum/UPGRADE.txt?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/UPGRADE.txt (original)
+++ team/oej/astum/UPGRADE.txt Sun Mar 18 04:40:37 2007
@@ -36,3 +36,9 @@
performs mostly a 'ChanExists' sort of function.
* SetCallerPres() has been replaced with the CALLERPRES() dialplan function
and is now deprecated.
+
+CDR:
+
+* The cdr_sqlite module has been marked as deprecated in favor of
+ cdr_sqlite3_custom. It will potentially be removed from the tree
+ after Asterisk 1.6 is released.
Modified: team/oej/astum/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/apps/app_meetme.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/apps/app_meetme.c (original)
+++ team/oej/astum/apps/app_meetme.c Sun Mar 18 04:40:37 2007
@@ -496,7 +496,7 @@
/*!
* \brief A structure for data used by the sla thread
*/
-static struct sla {
+static struct {
/*! The SLA thread ID */
pthread_t thread;
ast_cond_t cond;
@@ -506,6 +506,9 @@
AST_LIST_HEAD_NOLOCK(, sla_failed_station) failed_stations;
AST_LIST_HEAD_NOLOCK(, sla_event) event_q;
unsigned int stop:1;
+ /*! Attempt to handle CallerID, even though it is known not to work
+ * properly in some situations. */
+ unsigned int attempt_callerid:1;
} sla = {
.thread = AST_PTHREADT_NULL,
};
@@ -3496,7 +3499,8 @@
return -1;
}
- if (ast_dial_run(dial, ringing_trunk->trunk->chan, 1) != AST_DIAL_RESULT_TRYING) {
+ if (ast_dial_run(dial, sla.attempt_callerid ? ringing_trunk->trunk->chan : NULL, 1)
+ != AST_DIAL_RESULT_TRYING) {
struct sla_failed_station *failed_station;
ast_dial_destroy(dial);
if (!(failed_station = ast_calloc(1, sizeof(*failed_station))))
@@ -3956,7 +3960,7 @@
return NULL;
}
- dial_res = ast_dial_run(dial, trunk_ref->chan, 1);
+ dial_res = ast_dial_run(dial, sla.attempt_callerid ? trunk_ref->chan : NULL, 1);
if (dial_res != AST_DIAL_RESULT_TRYING) {
ast_mutex_lock(args->cond_lock);
ast_cond_signal(args->cond);
@@ -4249,8 +4253,11 @@
AST_LIST_TRAVERSE_SAFE_END
ast_mutex_unlock(&sla.lock);
if (ringing_trunk) {
+ sla_change_trunk_state(ringing_trunk->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL);
free(ringing_trunk);
pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "UNANSWERED");
+ /* Queue reprocessing of ringing trunks to make stations stop ringing
+ * that shouldn't be ringing after this trunk stopped. */
sla_queue_event(SLA_EVENT_RINGING_TRUNK);
}
@@ -4635,6 +4642,7 @@
struct ast_config *cfg;
const char *cat = NULL;
int res = 0;
+ const char *val;
ast_mutex_init(&sla.lock);
ast_cond_init(&sla.cond, NULL);
@@ -4642,9 +4650,11 @@
if (!(cfg = ast_config_load(SLA_CONFIG_FILE)))
return 0; /* Treat no config as normal */
+ if ((val = ast_variable_retrieve(cfg, "general", "attemptcallerid")))
+ sla.attempt_callerid = ast_true(val);
+
while ((cat = ast_category_browse(cfg, cat)) && !res) {
const char *type;
- /* Reserve "general" for ... general stuff! */
if (!strcasecmp(cat, "general"))
continue;
if (!(type = ast_variable_retrieve(cfg, cat, "type"))) {
Modified: team/oej/astum/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/apps/app_page.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/apps/app_page.c (original)
+++ team/oej/astum/apps/app_page.c Sun Mar 18 04:40:37 2007
@@ -177,9 +177,8 @@
for (i = 0; i < pos; i++) {
struct ast_dial *dial = dials[i];
- /* If the dial is already answered, then they will/should get kicked out by Meetme */
- if (ast_dial_state(dial) != AST_DIAL_RESULT_ANSWERED)
- ast_dial_join(dial);
+ /* We have to wait for the async thread to exit as it's possible Meetme won't throw them out immediately */
+ ast_dial_join(dial);
/* Hangup all channels */
ast_dial_hangup(dial);
Modified: team/oej/astum/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/apps/app_voicemail.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/apps/app_voicemail.c (original)
+++ team/oej/astum/apps/app_voicemail.c Sun Mar 18 04:40:37 2007
@@ -1956,7 +1956,7 @@
fprintf(p, "Subject: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox);
else
fprintf(p, "Subject: [PBX]: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox);
- fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum, (unsigned int)ast_random(), mailbox, getpid(), host);
+ fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum + 1, (unsigned int)ast_random(), mailbox, getpid(), host);
if(imap) {
/* additional information needed for IMAP searching */
fprintf(p, "X-Asterisk-VM-Message-Num: %d" ENDL, msgnum + 1);
Modified: team/oej/astum/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/oej/astum/build_tools/make_buildopts_h?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/build_tools/make_buildopts_h (original)
+++ team/oej/astum/build_tools/make_buildopts_h Sun Mar 18 04:40:37 2007
@@ -9,5 +9,9 @@
END
TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
- echo "#define ${x} 1"
+ echo "#define ${x} 1"
done
+if grep AST_DEVMODE makeopts | grep -q yes
+then
+ echo "#define AST_DEVMODE 1"
+fi
Modified: team/oej/astum/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/oej/astum/build_tools/menuselect-deps.in?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/build_tools/menuselect-deps.in (original)
+++ team/oej/astum/build_tools/menuselect-deps.in Sun Mar 18 04:40:37 2007
@@ -3,6 +3,7 @@
FREETDS=@PBX_FREETDS@
GSM=@PBX_GSM@
GTK=@PBX_GTK@
+GTK2=@PBX_GTK2@
H323=@PBX_H323@
OPENH323=@PBX_OPENH323@
IKSEMEL=@PBX_IKSEMEL@
@@ -23,6 +24,7 @@
RADIUS=@PBX_RADIUS@
SPEEX=@PBX_SPEEX@
SQLITE=@PBX_SQLITE@
+SQLITE3=@PBX_SQLITE3@
SSL=@PBX_OPENSSL@
TONEZONE=@PBX_TONEZONE@
UNIXODBC=@PBX_UNIXODBC@
Modified: team/oej/astum/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/team/oej/astum/build_tools/prep_tarball?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/build_tools/prep_tarball (original)
+++ team/oej/astum/build_tools/prep_tarball Sun Mar 18 04:40:37 2007
@@ -6,3 +6,5 @@
# It will be executed from the top-level directory of the project.
make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
+
+cd doc && rubber --pdf asterisk.tex
Modified: team/oej/astum/cdr/cdr_radius.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/cdr/cdr_radius.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/cdr/cdr_radius.c (original)
+++ team/oej/astum/cdr/cdr_radius.c Sun Mar 18 04:40:37 2007
@@ -20,7 +20,7 @@
*
* \brief RADIUS CDR Support
* \author Philippe Sultan
- * \extref FreeRadius http://www.freeradius.org/
+ * \extref The Radius Client Library - http://developer.berlios.de/projects/radiusclient-ng/
*
* \arg See also \ref AstCDR
* \ingroup cdr_drivers
Modified: team/oej/astum/cdr/cdr_sqlite.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/cdr/cdr_sqlite.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/cdr/cdr_sqlite.c (original)
+++ team/oej/astum/cdr/cdr_sqlite.c Sun Mar 18 04:40:37 2007
@@ -30,6 +30,8 @@
*
* Creates the database and table on-the-fly
* \ingroup cdr_drivers
+ *
+ * \note This module has been marked deprecated in favor for cdr_sqlite3_custom
*/
/*** MODULEINFO
@@ -180,6 +182,9 @@
char fn[PATH_MAX];
int res;
+ ast_log(LOG_WARNING, "This module has been marked deprecated in favor of "
+ "using cdr_sqlite3_custom. (May be removed after Asterisk 1.6)\n");
+
/* is the database there? */
snprintf(fn, sizeof(fn), "%s/cdr.db", ast_config_AST_LOG_DIR);
db = sqlite_open(fn, AST_FILE_MODE, &zErr);
Modified: team/oej/astum/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/channels/chan_h323.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/channels/chan_h323.c (original)
+++ team/oej/astum/channels/chan_h323.c Sun Mar 18 04:40:37 2007
@@ -29,7 +29,7 @@
*
* \par See also
* \arg Config_h323
- * \extref OpenH323 http://www.openh323.org/
+ * \extref OpenH323 http://www.voxgratia.org/
*
* \ingroup channel_drivers
*/
Modified: team/oej/astum/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/channels/chan_iax2.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/channels/chan_iax2.c (original)
+++ team/oej/astum/channels/chan_iax2.c Sun Mar 18 04:40:37 2007
@@ -6500,7 +6500,7 @@
duped_fr = iaxfrdup2(fr);
if (duped_fr)
schedule_delivery(duped_fr, 1, 1, &fr->ts);
- if (iaxs[fr->callno]->last < fr->ts)
+ if (iaxs[fr->callno] && iaxs[fr->callno]->last < fr->ts)
iaxs[fr->callno]->last = fr->ts;
}
} else {
Modified: team/oej/astum/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/astum/channels/chan_sip.c?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/channels/chan_sip.c (original)
+++ team/oej/astum/channels/chan_sip.c Sun Mar 18 04:40:37 2007
@@ -7838,7 +7838,17 @@
/* Fromdomain is what we are registering to, regardless of actual
host name from SRV */
- snprintf(addr, sizeof(addr), "sip:%s", S_OR(p->fromdomain, r->hostname));
+ if (!ast_strlen_zero(p->fromdomain)) {
+ if (r->portno && r->portno != STANDARD_SIP_PORT)
+ snprintf(addr, sizeof(addr), "sip:%s:%d", p->fromdomain, r->portno);
+ else
+ snprintf(addr, sizeof(addr), "sip:%s", p->fromdomain);
+ } else {
+ if (r->portno && r->portno != STANDARD_SIP_PORT)
+ snprintf(addr, sizeof(addr), "sip:%s:%d", r->hostname, r->portno);
+ else
+ snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
+ }
ast_string_field_set(p, uri, addr);
p->branch ^= ast_random();
@@ -9858,6 +9868,10 @@
}
{
char *tmp = ast_strdupa(of);
+ /* We need to be able to handle auth-headers looking like
+ <sip:8164444422;phone-context=+1 at 1.2.3.4:5060;user=phone;tag=SDadkoa01-gK0c3bdb43>
+ */
+ tmp = strsep(&tmp, ";");
if (ast_is_shrinkable_phonenumber(tmp))
ast_shrink_phone_number(tmp);
ast_string_field_set(p, cid_num, tmp);
@@ -12887,9 +12901,10 @@
break;
case 200: /* 200 OK */
p->authtries = 0; /* Reset authentication counter */
- if (sipmethod == SIP_MESSAGE) {
- /* We successfully transmitted a message */
- ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
+ if (sipmethod == SIP_MESSAGE || sipmethod == SIP_INFO) {
+ /* We successfully transmitted a message
+ or a video update request in INFO */
+ /* Nothing happens here - the message is inside a dialog */
} else if (sipmethod == SIP_INVITE) {
handle_response_invite(p, resp, rest, req, seqno);
} else if (sipmethod == SIP_NOTIFY) {
@@ -13022,7 +13037,8 @@
if ((option_verbose > 2) && (resp != 487))
ast_verbose(VERBOSE_PREFIX_3 "Got SIP response %d \"%s\" back from %s\n", resp, rest, ast_inet_ntoa(p->sa.sin_addr));
- stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
+ if (sipmethod == SIP_INVITE)
+ stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
/* XXX Locking issues?? XXX */
switch(resp) {
@@ -13066,14 +13082,15 @@
break;
default:
/* Send hangup */
- if (owner)
+ if (owner && sipmethod != SIP_MESSAGE && sipmethod != SIP_INFO)
ast_queue_hangup(p->owner);
break;
}
/* ACK on invite */
if (sipmethod == SIP_INVITE)
transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
- sip_alreadygone(p);
+ if (sipmethod != SIP_MESSAGE && sipmethod != SIP_INFO)
+ sip_alreadygone(p);
if (!p->owner)
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
} else if ((resp >= 100) && (resp < 200)) {
@@ -13129,10 +13146,10 @@
}
} else if (sipmethod == SIP_BYE)
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
- else if (sipmethod == SIP_MESSAGE)
- /* We successfully transmitted a message */
- /* XXX Why destroy this pvt after message transfer? Bad */
- ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
+ else if (sipmethod == SIP_MESSAGE || sipmethod == SIP_INFO)
+ /* We successfully transmitted a message or
+ a video update request in INFO */
+ ;
else if (sipmethod == SIP_BYE)
/* Ok, we're ready to go */
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
@@ -17014,7 +17031,7 @@
compactheaders = ast_true(v->value);
} else if (!strcasecmp(v->name, "notifymimetype")) {
ast_copy_string(default_notifymime, v->value, sizeof(default_notifymime));
- } else if (!strcasecmp(v->name, "limitonpeers")) {
+ } else if (!strncasecmp(v->name, "limitonpeer", 11)) {
global_limitonpeers = ast_true(v->value);
} else if (!strcasecmp(v->name, "directrtpsetup")) {
global_directrtpsetup = ast_true(v->value);
Modified: team/oej/astum/configs/extconfig.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/astum/configs/extconfig.conf.sample?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/configs/extconfig.conf.sample (original)
+++ team/oej/astum/configs/extconfig.conf.sample Sun Mar 18 04:40:37 2007
@@ -18,6 +18,7 @@
;uncomment to load queues.conf via the odbc engine.
;
;queues.conf => odbc,asterisk,ast_config
+;extensions.conf => sqlite,asterisk,ast_config
;
; The following files CANNOT be loaded from Realtime storage:
; asterisk.conf
@@ -42,8 +43,12 @@
;example => odbc,asterisk,alttable
;example2 => ldap,"dc=oxymium,dc=net",example2
;
-;aumusers => mysql,asterisk
-;aumgroups => mysql,asterisk
+; "odbc" is shown in the examples below, but is not the only valid realtime
+; engine. There is:
+; odbc ... res_config_odbc
+; sqlite ... res_config_sqlite
+; pgsql ... res_config_pgsql
+;
;iaxusers => odbc,asterisk
;iaxpeers => odbc,asterisk
;sipusers => odbc,asterisk
@@ -53,4 +58,6 @@
;extensions => odbc,asterisk
;queues => odbc,asterisk
;queue_members => odbc,asterisk
+;aumusers => mysql,asterisk
+;aumgroups => mysql,asterisk
Modified: team/oej/astum/configs/sla.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/astum/configs/sla.conf.sample?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/configs/sla.conf.sample (original)
+++ team/oej/astum/configs/sla.conf.sample Sun Mar 18 04:40:37 2007
@@ -1,13 +1,17 @@
;
; Configuration for Shared Line Appearances (SLA).
;
-; See doc/sla.txt for more information.
+; See doc/asterisk.pdf for more information.
;
; ---- General Options ----------------
[general]
-; There are none!
+;attemptcallerid=no ; Attempt CallerID handling. The default value for this
+ ; is "no" because CallerID handling with an SLA setup is
+ ; known to not work properly in some situations. However,
+ ; feel free to enable it if you would like. If you do, and
+ ; you find problems, please do not report them.
; -------------------------------------
@@ -21,7 +25,7 @@
; NOTE: You can not just put any type of channel here.
; Zap channels can be directly used. IP trunks
; require some indirect configuration which is
- ; described in doc/sla.txt.
+ ; described in doc/asterisk.pdf.
;autocontext=line1 ; This supports automatic generation of the dialplan entries
; if the autocontext option is used. Each trunk should have
@@ -57,7 +61,7 @@
;type=trunk
;device=Local/disa at line4_outbound ; A Local channel in combination with the Disa
; application can be used to support IP trunks.
- ; See doc/sla.txt on more information on how
+ ; See doc/asterisk.pdf on more information on how
; IP trunks work.
;autocontext=line4
; --------------------------------------
Modified: team/oej/astum/configure
URL: http://svn.digium.com/view/asterisk/team/oej/astum/configure?view=diff&rev=59034&r1=59033&r2=59034
==============================================================================
--- team/oej/astum/configure (original)
+++ team/oej/astum/configure Sun Mar 18 04:40:37 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 57557 .
+# From configure.ac Revision: 58932 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -692,6 +692,7 @@
DOT
STRIP
WGET
+RUBBER
FETCH
DOWNLOAD
acx_pthread_config
@@ -819,6 +820,10 @@
SQLITE_INCLUDE
SQLITE_DIR
PBX_SQLITE
+SQLITE3_LIB
+SQLITE3_INCLUDE
+SQLITE3_DIR
+PBX_SQLITE3
SUPPSERV_LIB
SUPPSERV_INCLUDE
SUPPSERV_DIR
@@ -895,6 +900,10 @@
PBX_GTK
GTK_INCLUDE
GTK_LIB
+PKGCONFIG
+PBX_GTK2
+GTK2_INCLUDE
+GTK2_LIB
CURL_CONFIG
LTLIBOBJS'
ac_subst_files=''
@@ -1520,6 +1529,7 @@
--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-sqlite3=PATH use SQLite files in PATH
--with-suppserv=PATH use mISDN Supplemental Services files in PATH
--with-ssl=PATH use OpenSSL files in PATH
--with-tds=PATH use FreeTDS files in PATH
@@ -7427,6 +7437,47 @@
fi
+# Extract the first word of "rubber", so it can be a program name with args.
+set dummy rubber; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_RUBBER+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $RUBBER in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_RUBBER="$RUBBER" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_RUBBER="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_RUBBER" && ac_cv_path_RUBBER=":"
+ ;;
+esac
+fi
+RUBBER=$ac_cv_path_RUBBER
+if test -n "$RUBBER"; then
+ { echo "$as_me:$LINENO: result: $RUBBER" >&5
+echo "${ECHO_T}$RUBBER" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET}
else
@@ -8814,6 +8865,34 @@
fi
PBX_SQLITE=0
+
+
+
+
+
+
+SQLITE3_DESCRIP="SQLite"
+SQLITE3_OPTION="sqlite3"
+
+# Check whether --with-sqlite3 was given.
+if test "${with_sqlite3+set}" = set; then
+ withval=$with_sqlite3;
+case ${withval} in
+ n|no)
+ USE_SQLITE3=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} SQLITE3"
+ ;;
+ *)
+ SQLITE3_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} SQLITE3"
+ ;;
+esac
+
+fi
+
+PBX_SQLITE3=0
@@ -32007,6 +32086,461 @@
+if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then
+ pbxlibdir=""
+ if test "x${SQLITE3_DIR}" != "x"; then
+ if test -d ${SQLITE3_DIR}/lib; then
+ pbxlibdir="-L${SQLITE3_DIR}/lib"
+ else
+ pbxlibdir="-L${SQLITE3_DIR}"
+ fi
+ fi
+ pbxfuncname="sqlite3_open"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_SQLITE3_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsqlite3" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lsqlite3... $ECHO_C" >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3 ${pbxlibdir} $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ${pbxfuncname} ();
+int
+main ()
+{
+return ${pbxfuncname} ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ AST_SQLITE3_FOUND=yes
+else
+ AST_SQLITE3_FOUND=no
+fi
+
+ fi
+
+ if test "${AST_SQLITE3_FOUND}" = "yes"; then
+ SQLITE3_LIB="-lsqlite3 "
+ SQLITE3_HEADER_FOUND="1"
+ if test "x${SQLITE3_DIR}" != "x"; then
+ SQLITE3_LIB="${pbxlibdir} ${SQLITE3_LIB}"
+ SQLITE3_INCLUDE="-I${SQLITE3_DIR}/include"
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${SQLITE3_DIR}/include"
+ if test "xsqlite3.h" != "x" ; then
+ as_ac_Header=`echo "ac_cv_header_${SQLITE3_DIR}/include/sqlite3.h" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for ${SQLITE3_DIR}/include/sqlite3.h" >&5
+echo $ECHO_N "checking for ${SQLITE3_DIR}/include/sqlite3.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking ${SQLITE3_DIR}/include/sqlite3.h usability" >&5
+echo $ECHO_N "checking ${SQLITE3_DIR}/include/sqlite3.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${SQLITE3_DIR}/include/sqlite3.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking ${SQLITE3_DIR}/include/sqlite3.h presence" >&5
+echo $ECHO_N "checking ${SQLITE3_DIR}/include/sqlite3.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <${SQLITE3_DIR}/include/sqlite3.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE3_DIR}/include/sqlite3.h: proceeding with the preprocessor's result" >&5
[... 815 lines stripped ...]
More information about the svn-commits
mailing list