update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4004 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/iksemel/include/Makefile.in b/libs/iksemel/include/Makefile.in
index 38fa90956572235e4539a5c8ed931d999c2ee422..d69aa65ba6a4cb864ce4cc73e728da9c2c1fa5b8 100644 (file)
--- a/libs/iksemel/include/Makefile.in
+++ b/libs/iksemel/include/Makefile.in
@@ -100,7 +100,7 @@ DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -173,7 +173,7 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 

diff --git a/libs/iksemel/src/Makefile.in b/libs/iksemel/src/Makefile.in
index e45b1ba57fae4dc6292464221bb52eea759e2b58..a8be024c43cbdcbb67bcb7ebed38ce8129f1dc72 100644 (file)
--- a/libs/iksemel/src/Makefile.in
+++ b/libs/iksemel/src/Makefile.in
@@ -92,9 +92,21 @@ INCLUDES = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libiksemel.la
 
-@DO_POSIX_TRUE@posix_c = io-posix.c
-
-libiksemel_la_SOURCES =        ikstack.c       utility.c       iks.c   sax.c   dom.c   $(posix_c)      stream.c        sha.c   jabber.c        filter.c        md5.c   base64.c
+@DO_POSIX_TRUE@posix_c = @DO_POSIX_TRUE@io-posix.c
+
+libiksemel_la_SOURCES = \
+       ikstack.c \
+       utility.c \
+       iks.c \
+       sax.c \
+       dom.c \
+       $(posix_c) \
+       stream.c \
+       sha.c \
+       jabber.c \
+       filter.c \
+       md5.c \
+       base64.c
 
 
 libiksemel_la_LDFLAGS = -version-info 3:0:0 -no-undefined
@@ -127,7 +139,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libiksemel_la_SOURCES)
 OBJECTS = $(libiksemel_la_OBJECTS)
@@ -233,7 +245,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 

diff --git a/libs/iksemel/test/Makefile.in b/libs/iksemel/test/Makefile.in
index f729f30e566f789e2e3032730a95a248d8cb4213..263f8f8212c18c3d77ec529d95549af1d0454e56 100644 (file)
--- a/libs/iksemel/test/Makefile.in
+++ b/libs/iksemel/test/Makefile.in
@@ -164,7 +164,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(tst_ikstack_SOURCES) $(tst_iks_SOURCES) $(tst_sax_SOURCES) $(tst_dom_SOURCES) $(tst_sha_SOURCES) $(tst_md5_SOURCES) $(tst_filter_SOURCES) $(tst_jid_SOURCES)
 OBJECTS = $(tst_ikstack_OBJECTS) $(tst_iks_OBJECTS) $(tst_sax_OBJECTS) $(tst_dom_OBJECTS) $(tst_sha_OBJECTS) $(tst_md5_OBJECTS) $(tst_filter_OBJECTS) $(tst_jid_OBJECTS)
@@ -283,7 +283,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 

diff --git a/scripts/js_modules/SpeechTools.jm b/scripts/js_modules/SpeechTools.jm
index b498e1ff4948a184491d069d462419362b4b1766..89995a5616c7d95dfe2a65c18ed2f9f226013bab 100644 (file)
--- a/scripts/js_modules/SpeechTools.jm
+++ b/scripts/js_modules/SpeechTools.jm
@@ -311,7 +311,7 @@ function SpeechObtainer(asr, req, wait_time) {
                        if (!files[x] || files[x] == "noop") {
                                continue;
                        }
-                       rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , "", this.asr.onInput, this.asr);
+                       rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , this.asr.onInput, this.asr);
                        if (rv) {
                                break;
                        }

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index c3a935e8995de89857d7689c46592c40d1ab72fc..62452977858f2114e04dc1877369124d8121633d 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -402,11 +402,36 @@ JSClass event_class = {
 
 static void js_error(JSContext *cx, const char *message, JSErrorReport *report)
 {
-       if (message) {
-               switch_log_printf(SWITCH_CHANNEL_ID_LOG, report->filename ? (char *)report->filename : "mod_spidermonkey.c", modname, report->lineno, SWITCH_LOG_ERROR,
-                                                 "%s %s%s\n", message, report->linebuf ? "near " : "", report->linebuf ? report->linebuf : "");
+    const char *filename = __FILE__;
+    int line = __LINE__;
+    const char *text = "";
+    char *ex = "";
+    
+       if (message && report) {
+        if (report->filename) {
+            filename = report->filename;
+        }
+        line = report->lineno;
+        if (report->linebuf) {
+            text = report->linebuf;
+            ex = "near ";
+        }
        }
-       
+    
+    if (!message) {
+        message = "(N/A)";
+    }
+    
+    switch_log_printf(SWITCH_CHANNEL_ID_LOG, 
+                      filename,
+                      modname,
+                      line,
+                      SWITCH_LOG_ERROR,
+                      "%s %s%s\n",
+                      ex,
+                      message,
+                      text);
+
 }