February 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4282 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Feb '07

15 Feb '07

Author: mikej Date: Wed Feb 14 23:37:57 2007 New Revision: 4282 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: don't pass NUTAG_URL a display name. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Feb 14 23:37:57 2007 @@ -1029,12 +1029,14 @@ } if (!tech_pvt->nh) { + char *url = get_url_from_contact(tech_pvt->dest, 1); tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, - NUTAG_URL(tech_pvt->dest), + NUTAG_URL(url), SIPTAG_TO_STR(tech_pvt->dest_to), SIPTAG_FROM_STR(tech_pvt->from_str), SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); + switch_safe_free(url); if (!(tech_pvt->sofia_private = malloc(sizeof(*tech_pvt->sofia_private)))) { abort(); @@ -3181,8 +3183,6 @@ display = "\"user\""; } } - } else { - display = "\"user\""; } if (!port) {

1 0

[commit] r4281 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: nua sresolv
by Freeswitch SVN 15 Feb '07

15 Feb '07

Author: mikej Date: Wed Feb 14 21:53:37 2007 New Revision: 4281 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Log: revert some useless differences from the official sofia-sip tree Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Feb 14 21:53:37 2007 @@ -2043,20 +2043,8 @@ } assert(ss); -#if 1 assert(ss->ss_state != nua_callstate_calling); assert(ss->ss_state != nua_callstate_proceeding); -#else -// assert(ss->ss_state != nua_callstate_calling); -// assert(ss->ss_state != nua_callstate_proceeding); - if(ss->ss_state == nua_callstate_calling || ss->ss_state != nua_callstate_proceeding) { - /* somthing is badly wrong here. Lets kill it gracefully for now */ - sr_status(sr, SIP_500_INTERNAL_SERVER_ERROR); - signal_call_state_change(nh, NULL, status, phrase, - nua_callstate_terminated); - return retval; - } -#endif /* Update session state */ if (status < 300 || application != 0) @@ -2214,7 +2202,7 @@ ss && (ss == nua_session_usage_get(nh->nh_ds))) { nua_stack_event(nh->nh_nua, nh, cancel, nua_i_cancel, SIP_200_OK, NULL); - SR_STATUS1(sr, SIP_487_REQUEST_TERMINATED); + SR_STATUS1(sr, SIP_487_REQUEST_TERMINATED); nua_server_respond(sr, NULL); nua_server_report(sr); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Wed Feb 14 21:53:37 2007 @@ -930,10 +930,8 @@ SU_DEBUG_9(("sres_query(%p, %p, %s, \"%s\") called\n", (void *)res, (void *)context, sres_record_type(type, b), domain)); - if (res == NULL || domain == NULL) { - su_seterrno(EFAULT); - return NULL; - } + if (res == NULL || domain == NULL) + return su_seterrno(EFAULT), (void *)NULL; dlen = strlen(domain); if (dlen > SRES_MAXDNAME || @@ -945,10 +943,8 @@ /* Reread resolv.conf if needed */ sres_resolver_update(res, 0); - if (res->res_n_servers == 0) { - su_seterrno(ENETDOWN); - return NULL; - } + if (res->res_n_servers == 0) + return (void)su_seterrno(ENETDOWN), (sres_query_t *)NULL; query = sres_query_alloc(res, callback, context, type, domain);

1 0

[commit] r4280 - freeswitch/trunk/libs/js
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 18:17:48 2007 New Revision: 4280 Modified: freeswitch/trunk/libs/js/configure freeswitch/trunk/libs/js/configure.ac Log: fix configure test failure if -Werror is in CFLAGS Modified: freeswitch/trunk/libs/js/configure ============================================================================== --- freeswitch/trunk/libs/js/configure (original) +++ freeswitch/trunk/libs/js/configure Wed Feb 14 18:17:48 2007 @@ -3580,6 +3580,8 @@ fi +OLD_CFLAGS="$CFLAGS" +CFLAGS="" echo "$as_me:$LINENO: checking for gethostname in -lnsl" >&5 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 @@ -3878,6 +3880,7 @@ fi +CFLAGS="$OLD_CFLAGS" echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5 echo $ECHO_N "checking for struct stat.st_birthtime... $ECHO_C" >&6 @@ -6560,7 +6563,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6563 "configure"' > conftest.$ac_ext + echo '#line 6566 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7577,7 +7580,7 @@ # Provide some information about the compiler. -echo "$as_me:7580:" \ +echo "$as_me:7583:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -8644,11 +8647,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8647: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8650: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8651: \$? = $ac_status" >&5 + echo "$as_me:8654: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8912,11 +8915,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8918: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8919: \$? = $ac_status" >&5 + echo "$as_me:8922: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9016,11 +9019,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9019: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9022: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9023: \$? = $ac_status" >&5 + echo "$as_me:9026: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11361,7 +11364,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 11364 "configure" +#line 11367 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11461,7 +11464,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 11464 "configure" +#line 11467 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13805,11 +13808,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13808: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13811: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13812: \$? = $ac_status" >&5 + echo "$as_me:13815: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13909,11 +13912,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13915: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13916: \$? = $ac_status" >&5 + echo "$as_me:13919: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15479,11 +15482,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15482: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15485: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15486: \$? = $ac_status" >&5 + echo "$as_me:15489: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15583,11 +15586,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15586: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15589: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15590: \$? = $ac_status" >&5 + echo "$as_me:15593: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17790,11 +17793,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17793: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17796: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17797: \$? = $ac_status" >&5 + echo "$as_me:17800: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18058,11 +18061,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18064: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18065: \$? = $ac_status" >&5 + echo "$as_me:18068: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18162,11 +18165,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18165: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18168: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18169: \$? = $ac_status" >&5 + echo "$as_me:18172: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Wed Feb 14 18:17:48 2007 @@ -41,12 +41,15 @@ AC_CHECK_DEBUGGING AC_CHECK_VA_COPY +OLD_CFLAGS="$CFLAGS" +CFLAGS="" AC_CHECK_LIB(nsl, gethostname) if test ".`echo $LIBS | grep nsl`" = .; then AC_CHECK_LIB(nsl, gethostbyname) fi AC_CHECK_LIB(socket, accept) AC_CHECK_LIB(m, floor) +CFLAGS="$OLD_CFLAGS" AC_CHECK_MEMBERS([struct stat.st_birthtime, struct stat.st_birthtimensec],,, [#include <sys/stat.h>])

1 0

[commit] r4279 - freeswitch/trunk/src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 18:08:10 2007 New Revision: 4279 Modified: freeswitch/trunk/src/switch_core.c Log: update Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Feb 14 18:08:10 2007 @@ -1895,6 +1895,7 @@ if (session->private_event_queue) { if (switch_queue_trypush(session->private_event_queue, *event) == SWITCH_STATUS_SUCCESS) { *event = NULL; + switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); status = SWITCH_STATUS_SUCCESS; } }

1 0

[commit] r4278 - in freeswitch/trunk/libs/sofia-sip: . m4
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 17:48:54 2007 New Revision: 4278 Modified: freeswitch/trunk/libs/sofia-sip/configure freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Log: detect __func__ properly even if CFLAGS has -Werror in it Modified: freeswitch/trunk/libs/sofia-sip/configure ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure (original) +++ freeswitch/trunk/libs/sofia-sip/configure Wed Feb 14 17:48:54 2007 @@ -20453,7 +20453,7 @@ int main () { -char *s = __func__; +const char *s = __func__; ; return 0; @@ -26933,7 +26933,7 @@ int main () { -char *s = __func__; +const char *s = __func__; ; return 0; Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Wed Feb 14 17:48:54 2007 @@ -276,7 +276,7 @@ AC_DEFUN([AC_C_VAR_FUNC], [AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK(whether $CC recognizes __func__, ac_cv_c_var_func, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[char *s = __func__; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const char *s = __func__; ]])],[ac_cv_c_var_func=yes],[ac_cv_c_var_func=no])) if test $ac_cv_c_var_func = "yes"; then AC_DEFINE([HAVE_FUNC], 1, [Define to 1 if the C compiler supports __func__])

1 0

[commit] r4277 - freeswitch/trunk/src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 17:41:03 2007 New Revision: 4277 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: add resets to a few places Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Feb 14 17:41:03 2007 @@ -2177,10 +2177,13 @@ SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session) { + switch_channel_t *channel; + char buf[256]; + switch_size_t has; + /* sweep theese under the rug, they wont be leaked they will be reclaimed when the session ends. */ - session->read_resampler = NULL; session->write_resampler = NULL; @@ -2190,6 +2193,15 @@ /* wipe theese, they will be recreated if need be */ switch_buffer_destroy(&session->raw_read_buffer); switch_buffer_destroy(&session->raw_write_buffer); + + /* reset state handlers and flush dtmf */ + channel = switch_core_session_get_channel(session); + switch_channel_clear_state_handler(channel, NULL); + + if ((has = switch_channel_has_dtmf(channel))) { + switch_channel_dequeue_dtmf(channel, buf, has); + } + } SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_session_t *session, switch_frame_t *frame, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Feb 14 17:41:03 2007 @@ -2076,6 +2076,7 @@ switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); + switch_core_session_reset(session_a); switch_channel_clear_flag(chan_a, CF_BRIDGED); switch_mutex_lock(data->mutex); @@ -3642,6 +3643,8 @@ assert(session != NULL); assert(extension != NULL); + switch_core_session_reset(session); + channel = switch_core_session_get_channel(session); assert(channel != NULL);

1 0

[commit] r4276 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 17:14:32 2007 New Revision: 4276 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix codec neg Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Feb 14 17:14:32 2007 @@ -802,7 +802,9 @@ codec_string = abs; } else { if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { - codec_string = tech_pvt->profile->codec_string; + if (tech_pvt->profile->codec_string) { + codec_string = switch_core_session_strdup(tech_pvt->session, tech_pvt->profile->codec_string); + } } if ((ocodec = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { @@ -2373,7 +2375,7 @@ if (!strcasecmp(map->rm_encoding, "telephone-event")) { tech_pvt->te = (switch_payload_t)map->rm_pt; } - + for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Compare [%s:%d]/[%s:%d]\n",

1 0

[commit] r4275 - in freeswitch/trunk/libs/js: . src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 16:57:13 2007 New Revision: 4275 Modified: freeswitch/trunk/libs/js/.update freeswitch/trunk/libs/js/src/jsapi.c Log: fix js file object for good this time Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 16:57:13 2007 @@ -1 +1 @@ -Wed Feb 14 15:47:43 EST 2007 +Wed Feb 14 17:04:43 EST 2007 Modified: freeswitch/trunk/libs/js/src/jsapi.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsapi.c (original) +++ freeswitch/trunk/libs/js/src/jsapi.c Wed Feb 14 16:57:13 2007 @@ -1215,10 +1215,10 @@ #if JS_HAS_XML_SUPPORT js_InitXMLClasses(cx, obj) && #endif -#ifndef OSSP #if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */ js_InitFileClass(cx, obj) && #endif +#ifndef OSSP #if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0) js_InitDSOClass(cx, obj) && #endif @@ -1262,7 +1262,7 @@ {js_InitNamespaceClass, ATOM_OFFSET(Namespace)}, {js_InitQNameClass, ATOM_OFFSET(QName)}, #endif -#if JS_HAS_FILE_OBJECT +#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */ {js_InitFileClass, ATOM_OFFSET(File)}, #endif #if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)

1 0

[commit] r4274 - freeswitch/trunk/libs/js
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 15:48:15 2007 New Revision: 4274 Modified: freeswitch/trunk/libs/js/.update freeswitch/trunk/libs/js/configure freeswitch/trunk/libs/js/configure.ac Log: yet another attempt to properly build with the file object again Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 15:48:15 2007 @@ -1 +1 @@ -Wed Feb 14 15:20:38 EST 2007 +Wed Feb 14 15:47:43 EST 2007 Modified: freeswitch/trunk/libs/js/configure ============================================================================== --- freeswitch/trunk/libs/js/configure (original) +++ freeswitch/trunk/libs/js/configure Wed Feb 14 15:48:15 2007 @@ -4645,7 +4645,7 @@ echo "$as_me:$LINENO: result: $ac_cv_with_file" >&5 echo "${ECHO_T}$ac_cv_with_file" >&6 if test ".$ac_cv_with_file" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi @@ -5482,7 +5482,7 @@ fi done - CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1" CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic" fi @@ -5504,7 +5504,7 @@ echo "$as_me:$LINENO: result: $ac_cv_with_utf8" >&5 echo "${ECHO_T}$ac_cv_with_utf8" >&6 if test ".$ac_cv_with_utf8" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8" + CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1" fi @@ -5532,7 +5532,7 @@ - CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE -Insprpub/dist/include/nspr" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" fi Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Wed Feb 14 15:48:15 2007 @@ -135,7 +135,7 @@ [ac_cv_with_file=$withval], [ac_cv_with_file=yes]) AC_CACHE_CHECK([whether to build with the File object], [ac_cv_with_file], [ac_cv_with_file=yes]) if test ".$ac_cv_with_file" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi dnl # configure option --with-dso @@ -147,7 +147,7 @@ AC_CHECK_LIB(dl, dlopen) AC_CHECK_HEADER(dlfcn.h, , AC_ERROR([dlopen(3) header <dlfcn.h> required])) AC_CHECK_FUNCS(dlopen dlclose dlerror, , AC_ERROR([dlopen(3) API functions dlopen/dlclose/dlerror required])) - CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1" CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic" fi @@ -157,7 +157,7 @@ [ac_cv_with_utf8=$withval], [ac_cv_with_utf8=no]) AC_CACHE_CHECK([whether to build with exclusive UTF-8 C string], [ac_cv_with_utf8], [ac_cv_with_utf8=no]) if test ".$ac_cv_with_utf8" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8" + CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1" fi AC_ARG_WITH(nspr, @@ -166,7 +166,7 @@ AC_CACHE_CHECK([whether to build with NSPR], [ac_cv_with_nspr], [ac_cv_with_nspr=no]) if test ".$ac_cv_with_nspr" = ".yes"; then sinclude(nsprpub/config/nspr.m4) - CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE -Insprpub/dist/include/nspr" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" fi

1 0

[commit] r4273 - freeswitch/trunk/libs/js
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 15:21:12 2007 New Revision: 4273 Added: freeswitch/trunk/libs/js/.update Log: .update Added: freeswitch/trunk/libs/js/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 15:21:12 2007 @@ -0,0 +1 @@ +Wed Feb 14 15:20:38 EST 2007

1 0