Freeswitch-branches

Download

freeswitch-branches@lists.freeswitch.org

1655 discussions

[commit] r3816 - in freeswitch/branches/knhor/trunk: . src src/include src/mod/applications/mod_conference src/mod/applications/mod_dptools src/mod/applications/mod_ivrtest src/mod/applications/mod_playback src/mod/languages/mod_perl src/mod/languages/mod_php src/mod/languages/mod_python src/mod/languages/mod_ruby src/mod/languages/mod_spidermonkey src/mod/say/mod_say_en
by Freeswitch SVN 23 Dec '06

23 Dec '06

Author: knhor Date: Sat Dec 23 13:26:46 2006 New Revision: 3816 Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/src/include/switch_ivr.h freeswitch/branches/knhor/trunk/src/include/switch_types.h freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/switch_swig_wrap.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/knhor/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/branches/knhor/trunk/src/switch_ivr.c freeswitch/branches/knhor/trunk/src/switch_swig.c Log: Merged revisions 3814-3815 via svnmerge from trunk Modified: freeswitch/branches/knhor/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_ivr.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_ivr.h Sat Dec 23 13:26:46 2006 @@ -43,8 +43,6 @@ SWITCH_BEGIN_EXTERN_C - - /** * @defgroup switch_ivr IVR Library * @ingroup core1 @@ -74,9 +72,7 @@ \return SWITCH_STATUS_SUCCESS to keep the collection moving. */ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_session_t *session, - switch_input_callback_function_t dtmf_callback, - void *buf, - uint32_t buflen, + switch_input_args_t *args, uint32_t timeout); /*! @@ -175,7 +171,6 @@ \param session the session to play the file too \param fh file handle to use (NULL for builtin one) \param file the path to the file - \param timer_name the name of a timer to use input will be absorbed (NULL to time off the session input). \param dtmf_callback code to execute if any dtmf is dialed during the playback \param buf an object to maintain across calls \param buflen the size of buf @@ -183,15 +178,11 @@ \note passing a NULL dtmf_callback nad a not NULL buf indicates to copy any dtmf to buf and stop playback. */ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *session, - switch_file_handle_t *fh, - char *file, - char *timer_name, - switch_input_callback_function_t dtmf_callback, - void *buf, - uint32_t buflen); + switch_file_handle_t *fh, + char *file, + switch_input_args_t *args); - /*! \brief record a file from the session to a file \param session the session to record from @@ -207,9 +198,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *session, switch_file_handle_t *fh, char *file, - switch_input_callback_function_t dtmf_callback, - void *buf, - uint32_t buflen, + switch_input_args_t *args, uint32_t limit); /*! @@ -252,17 +241,14 @@ switch_speech_handle_t *sh, switch_codec_t *codec, switch_timer_t *timer, - switch_input_callback_function_t dtmf_callback, char *text, - void *buf, - uint32_t buflen); + switch_input_args_t *args); /*! \brief Speak given text with given tts engine \param session the session to speak on \param tts_name the desired tts module \param voice_name the desired voice - \param timer_name optional timer to use for async behaviour \param rate the sample rate \param dtmf_callback code to execute if any dtmf is dialed during the audio \param text the text to speak @@ -273,12 +259,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, char *tts_name, char *voice_name, - char *timer_name, uint32_t rate, - switch_input_callback_function_t dtmf_callback, char *text, - void *buf, - uint32_t buflen); + switch_input_args_t *args); /*! \brief Make an outgoing call @@ -532,7 +515,6 @@ *\param tts_voice Text To Speech engine voice name *\param timeout A number of milliseconds to pause before looping. *\param max_failures Maximum number of failures to withstand before hangingup This resets everytime you enter the menu. - *\param timer_name A pointer to a timer name *\param pool memory pool (NULL to create one) *\return SWITCH_STATUS_SUCCESS if the menu was created */ @@ -547,7 +529,6 @@ char *tts_voice, int timeout, int max_failures, - char *timer_name, switch_memory_pool_t *pool); /*! @@ -600,14 +581,12 @@ *\param menu_stack The menu stack object that will be created for you *\param xml_menus The xml Menus source *\param xml_menu The xml Menu source of the menu to be created - *\param timer_name The name of a timer that should be used - in almost all cases this should be NULL *\return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, - switch_ivr_menu_t **menu_stack, - switch_xml_t xml_menus, - switch_xml_t xml_menu, - char *timer_name); + switch_ivr_menu_t **menu_stack, + switch_xml_t xml_menus, + switch_xml_t xml_menu); /*! *\param xml_menu_ctx The XML menu parser context previously created by switch_ivr_menu_stack_xml_init @@ -630,9 +609,7 @@ char *macro_name, char *data, char *lang, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen); + switch_input_args_t *args); /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_types.h Sat Dec 23 13:26:46 2006 @@ -917,13 +917,16 @@ void *buf, unsigned int buflen); typedef struct switch_say_interface switch_say_interface_t; +typedef struct { + switch_input_callback_function_t input_callback; + void *buf; + uint32_t buflen; +} switch_input_args_t; typedef switch_status_t (*switch_say_callback_t)(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen); + switch_input_args_t *args); typedef int (*switch_core_db_callback_func_t)(void *pArg, int argc, char **argv, char **columnNames); typedef switch_status_t (*switch_module_load_t) (switch_loadable_module_interface_t **, char *); typedef switch_status_t (*switch_module_reload_t) (void); @@ -939,7 +942,6 @@ char *key_name, char *key_value, char *params); - /* things we don't deserve to know about */ /*! \brief A channel */ Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Dec 23 13:26:46 2006 @@ -3328,7 +3328,7 @@ /* if all is well, really play the file */ if (status == SWITCH_STATUS_SUCCESS) { - status = switch_ivr_play_file(session, NULL, path, NULL, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, path, NULL); } return status; @@ -3702,7 +3702,7 @@ } if (switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) { - switch_ivr_play_file(session, NULL, conference->kicked_sound, NULL, NULL, NULL, 0); + switch_ivr_play_file(session, NULL, conference->kicked_sound, NULL); } switch_core_session_reset(session); Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sat Dec 23 13:26:46 2006 @@ -123,7 +123,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, mdata, lang); - switch_ivr_phrase_macro(session, macro, mdata, lang, NULL, NULL, 0); + switch_ivr_phrase_macro(session, macro, mdata, lang, NULL); } } @@ -372,7 +372,7 @@ #ifdef _TEST_CALLBACK_ && switch_ivr_menu_stack_xml_add_custom(xml_ctx, "custom", &menu_handler) == SWITCH_STATUS_SUCCESS #endif - && switch_ivr_menu_stack_xml_build(xml_ctx,&menu_stack,xml_menus,xml_menu,NULL) == SWITCH_STATUS_SUCCESS) + && switch_ivr_menu_stack_xml_build(xml_ctx,&menu_stack,xml_menus,xml_menu) == SWITCH_STATUS_SUCCESS) { switch_channel_answer(channel); switch_ivr_menu_execute(session,menu_stack,params,NULL); Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Sat Dec 23 13:26:46 2006 @@ -138,7 +138,7 @@ } - switch_ivr_play_file(session, NULL,"/ram/goodbye.wav",NULL,NULL,NULL,0); + switch_ivr_play_file(session, NULL,"/ram/goodbye.wav",NULL); } } @@ -201,6 +201,7 @@ char buf[10] = ""; char *argv[3]; int argc; + switch_input_args_t args = {0}; if(!(mydata = switch_core_session_strdup(session, (char *) data))) { return; @@ -223,8 +224,10 @@ switch_channel_answer(channel); codec = switch_core_session_get_read_codec(session); - - switch_ivr_speak_text(session, tts_name, voice_name, NULL, codec->implementation->samples_per_second, show_dtmf, text, buf, sizeof(buf)); + args.input_callback = show_dtmf; + args.buf = buf; + args.buflen = sizeof(buf); + switch_ivr_speak_text(session, tts_name, voice_name, codec->implementation->samples_per_second, text, &args); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Done\n"); } @@ -366,10 +369,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enter up to 10 digits, press # to terminate, * to hangup\n"); if (data) { + switch_input_args_t args = {0}; /* you could have passed NULL instead of on_dtmf to get this exact behaviour (copy the digits to buf and stop playing) but you may want to pass the function if you have something cooler to do... */ - status = switch_ivr_play_file(session, NULL, data, NULL, on_dtmf, buf, sizeof(buf)); + args.input_callback = on_dtmf; + args.buf = buf; + args.buflen = sizeof(buf); + status = switch_ivr_play_file(session, NULL, data, &args); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); @@ -387,7 +394,7 @@ } snprintf(say, sizeof(say), "You Dialed [%s]\n", buf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, say); - switch_ivr_speak_text(session, "cepstral", "david", NULL, codec->implementation->samples_per_second, NULL, say, NULL, 0); + switch_ivr_speak_text(session, "cepstral", "david", codec->implementation->samples_per_second, say, NULL); } } Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c Sat Dec 23 13:26:46 2006 @@ -72,6 +72,7 @@ char *timer_name = NULL; char *mydata = NULL; switch_codec_t *codec; + switch_input_args_t args = {0}; codec = switch_core_session_get_read_codec(session); assert(codec != NULL); @@ -85,7 +86,6 @@ engine = argv[0]; voice = argv[1]; text = argv[2]; - timer_name = argv[3]; if (!(engine && voice && text)) { if (!engine) { @@ -102,28 +102,29 @@ } switch_channel_pre_answer(channel); - switch_ivr_speak_text(session, engine, voice, timer_name, codec->implementation->samples_per_second, on_dtmf, text, buf, sizeof(buf)); + + args.input_callback = on_dtmf; + args.buf = buf; + args.buflen = sizeof(buf); + switch_ivr_speak_text(session, engine, voice, codec->implementation->samples_per_second, text, &args); } static void playback_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; - char *timer_name = NULL; char *file_name = NULL; + switch_input_args_t args = {0}; file_name = switch_core_session_strdup(session, data); - if ((timer_name = strchr(file_name, ' ')) != 0) { - *timer_name++ = '\0'; - } - channel = switch_core_session_get_channel(session); assert(channel != NULL); switch_channel_pre_answer(channel); - switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0); + args.input_callback = on_dtmf; + switch_ivr_play_file(session, NULL, file_name, &args); } @@ -135,6 +136,7 @@ uint32_t limit = 0; char *path; char *p; + switch_input_args_t args = {0}; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -145,7 +147,8 @@ limit = atoi(p); } - status = switch_ivr_record_file(session, NULL, path, on_dtmf, NULL, 0, limit); + args.input_callback = on_dtmf; + status = switch_ivr_record_file(session, NULL, path, &args, limit); if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c Sat Dec 23 13:26:46 2006 @@ -791,8 +791,6 @@ SWIGEXPORT(void) SWIG_init (CV *cv, CPerlObj *); #endif -#include <switch.h> - extern void fs_core_set_globals(void); extern int fs_core_init(char *); extern int fs_core_destroy(void); @@ -808,7 +806,7 @@ extern void fs_channel_set_variable(switch_core_session_t *,char *,char *); extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); -extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_ivr_play_file(switch_core_session_t *,char *); extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); @@ -816,10 +814,11 @@ extern int fs_switch_ivr_collect_digits_count(switch_core_session_t *,char *,unsigned int,unsigned int,char const *,char *,unsigned int); extern int fs_switch_ivr_originate(switch_core_session_t *,switch_core_session_t **,char *,uint32_t); extern int fs_switch_ivr_session_transfer(switch_core_session_t *,char *,char *,char *); -extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,char *,uint32_t,switch_input_callback_function_t,char *,void *,unsigned int); +extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,uint32_t,char *); extern char *fs_switch_channel_get_variable(switch_channel_t *,char *); extern int fs_switch_channel_set_variable(switch_channel_t *,char *,char *); +#include "switch.h" #ifdef PERL_OBJECT #define MAGIC_CLASS _wrap_fs_perl_var:: @@ -1210,16 +1209,12 @@ { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 ; - char *arg3 ; - switch_input_callback_function_t arg4 ; - void *arg5 = (void *) 0 ; - unsigned int arg6 ; int result; int argvi = 0; dXSARGS; - if ((items < 6) || (items > 6)) { - SWIG_croak("Usage: fs_ivr_play_file(session,file,timer_name,dtmf_callback,buf,buflen);"); + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: fs_ivr_play_file(session,file);"); } { if (SWIG_ConvertPtr(ST(0), (void **) &arg1, SWIGTYPE_p_switch_core_session_t,0) < 0) { @@ -1228,22 +1223,7 @@ } if (!SvOK((SV*) ST(1))) arg2 = 0; else arg2 = (char *) SvPV(ST(1), PL_na); - if (!SvOK((SV*) ST(2))) arg3 = 0; - else arg3 = (char *) SvPV(ST(2), PL_na); - { - switch_input_callback_function_t * argp; - if (SWIG_ConvertPtr(ST(3),(void **) &argp, SWIGTYPE_p_switch_input_callback_function_t,0) < 0) { - SWIG_croak("Type error in argument 4 of fs_ivr_play_file. Expected _p_switch_input_callback_function_t"); - } - arg4 = *argp; - } - { - if (SWIG_ConvertPtr(ST(4), (void **) &arg5, 0,0) < 0) { - SWIG_croak("Type error in argument 5 of fs_ivr_play_file. Expected _p_void"); - } - } - arg6 = (unsigned int) SvUV(ST(5)); - result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); + result = (int)fs_ivr_play_file(arg1,arg2); ST(argvi) = sv_newmortal(); sv_setiv(ST(argvi++), (IV) result); @@ -1546,18 +1526,14 @@ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 ; char *arg3 ; - char *arg4 ; - uint32_t arg5 ; - switch_input_callback_function_t arg6 ; - char *arg7 ; - void *arg8 = (void *) 0 ; - unsigned int arg9 ; + uint32_t arg4 ; + char *arg5 ; int result; int argvi = 0; dXSARGS; - if ((items < 9) || (items > 9)) { - SWIG_croak("Usage: fs_switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen);"); + if ((items < 5) || (items > 5)) { + SWIG_croak("Usage: fs_switch_ivr_speak_text(session,tts_name,voice_name,rate,text);"); } { if (SWIG_ConvertPtr(ST(0), (void **) &arg1, SWIGTYPE_p_switch_core_session_t,0) < 0) { @@ -1568,31 +1544,16 @@ else arg2 = (char *) SvPV(ST(1), PL_na); if (!SvOK((SV*) ST(2))) arg3 = 0; else arg3 = (char *) SvPV(ST(2), PL_na); - if (!SvOK((SV*) ST(3))) arg4 = 0; - else arg4 = (char *) SvPV(ST(3), PL_na); { uint32_t * argp; - if (SWIG_ConvertPtr(ST(4),(void **) &argp, SWIGTYPE_p_uint32_t,0) < 0) { - SWIG_croak("Type error in argument 5 of fs_switch_ivr_speak_text. Expected _p_uint32_t"); + if (SWIG_ConvertPtr(ST(3),(void **) &argp, SWIGTYPE_p_uint32_t,0) < 0) { + SWIG_croak("Type error in argument 4 of fs_switch_ivr_speak_text. Expected _p_uint32_t"); } - arg5 = *argp; + arg4 = *argp; } - { - switch_input_callback_function_t * argp; - if (SWIG_ConvertPtr(ST(5),(void **) &argp, SWIGTYPE_p_switch_input_callback_function_t,0) < 0) { - SWIG_croak("Type error in argument 6 of fs_switch_ivr_speak_text. Expected _p_switch_input_callback_function_t"); - } - arg6 = *argp; - } - if (!SvOK((SV*) ST(6))) arg7 = 0; - else arg7 = (char *) SvPV(ST(6), PL_na); - { - if (SWIG_ConvertPtr(ST(7), (void **) &arg8, 0,0) < 0) { - SWIG_croak("Type error in argument 8 of fs_switch_ivr_speak_text. Expected _p_void"); - } - } - arg9 = (unsigned int) SvUV(ST(8)); - result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); + if (!SvOK((SV*) ST(4))) arg5 = 0; + else arg5 = (char *) SvPV(ST(4), PL_na); + result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5); ST(argvi) = sv_newmortal(); sv_setiv(ST(argvi++), (IV) result); Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/switch_swig_wrap.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/switch_swig_wrap.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/switch_swig_wrap.c Sat Dec 23 13:26:46 2006 @@ -576,7 +576,7 @@ extern void fs_channel_set_variable(switch_core_session_t *,char *,char *); extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); -extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_ivr_play_file(switch_core_session_t *,char *); extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); @@ -584,7 +584,7 @@ extern int fs_switch_ivr_collect_digits_count(switch_core_session_t *,char *,unsigned int,unsigned int,char const *,char *,unsigned int); extern int fs_switch_ivr_originate(switch_core_session_t *,switch_core_session_t **,char *,uint32_t); extern int fs_switch_ivr_session_transfer(switch_core_session_t *,char *,char *,char *); -extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,char *,uint32_t,switch_input_callback_function_t,char *,void *,unsigned int); +extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,uint32_t,char *); extern char *fs_switch_channel_get_variable(switch_channel_t *,char *); extern int fs_switch_channel_set_variable(switch_channel_t *,char *,char *); @@ -1081,19 +1081,15 @@ ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file) { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 ; - char *arg3 ; - switch_input_callback_function_t arg4 ; - void *arg5 = (void *) 0 ; - unsigned int arg6 ; int result; - zval **args[7]; + zval **args[3]; int argbase=0 ; if (this_ptr && this_ptr->type==IS_OBJECT) { /* fake this_ptr as first arg (till we can work out how to do it better */ argbase++; } - if(((ZEND_NUM_ARGS() + argbase )!= 6) || (zend_get_parameters_array_ex(6-argbase, args)!= SUCCESS)) { + if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { WRONG_PARAM_COUNT; } @@ -1106,31 +1102,9 @@ convert_to_string_ex(args[1-argbase]); arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); + result = (int)fs_ivr_play_file(arg1,arg2); - convert_to_string_ex(args[2-argbase]); - arg3 = (char *) Z_STRVAL_PP(args[2-argbase]); - { - switch_input_callback_function_t * argp; - if(SWIG_ConvertPtr(*args[3-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 4-argbase, SWIGTYPE_p_switch_input_callback_function_t->name); - } - arg4 = *argp; - } - - if(SWIG_ConvertPtr(*args[4-argbase], (void **) &arg5, 0) < 0) { - /* Allow NULL from php for void* */ - if ((*args[4-argbase])->type==IS_NULL) arg5=0; - else zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 5-argbase, SWIGTYPE_p_void->name); - } - - - convert_to_long_ex(args[5-argbase]); - arg6 = (unsigned int) Z_LVAL_PP(args[5-argbase]); - - result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); - - ZVAL_LONG(return_value,result); } @@ -1469,21 +1443,17 @@ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 ; char *arg3 ; - char *arg4 ; - uint32_t arg5 ; - switch_input_callback_function_t arg6 ; - char *arg7 ; - void *arg8 = (void *) 0 ; - unsigned int arg9 ; + uint32_t arg4 ; + char *arg5 ; int result; - zval **args[10]; + zval **args[6]; int argbase=0 ; if (this_ptr && this_ptr->type==IS_OBJECT) { /* fake this_ptr as first arg (till we can work out how to do it better */ argbase++; } - if(((ZEND_NUM_ARGS() + argbase )!= 9) || (zend_get_parameters_array_ex(9-argbase, args)!= SUCCESS)) { + if(((ZEND_NUM_ARGS() + argbase )!= 5) || (zend_get_parameters_array_ex(5-argbase, args)!= SUCCESS)) { WRONG_PARAM_COUNT; } @@ -1500,40 +1470,18 @@ convert_to_string_ex(args[2-argbase]); arg3 = (char *) Z_STRVAL_PP(args[2-argbase]); - - convert_to_string_ex(args[3-argbase]); - arg4 = (char *) Z_STRVAL_PP(args[3-argbase]); - { uint32_t * argp; - if(SWIG_ConvertPtr(*args[4-argbase], (void **) &argp, SWIGTYPE_p_uint32_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 5-argbase, SWIGTYPE_p_uint32_t->name); + if(SWIG_ConvertPtr(*args[3-argbase], (void **) &argp, SWIGTYPE_p_uint32_t) < 0) { + zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 4-argbase, SWIGTYPE_p_uint32_t->name); } - arg5 = *argp; + arg4 = *argp; } - { - switch_input_callback_function_t * argp; - if(SWIG_ConvertPtr(*args[5-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 6-argbase, SWIGTYPE_p_switch_input_callback_function_t->name); - } - arg6 = *argp; - } - convert_to_string_ex(args[6-argbase]); - arg7 = (char *) Z_STRVAL_PP(args[6-argbase]); + convert_to_string_ex(args[4-argbase]); + arg5 = (char *) Z_STRVAL_PP(args[4-argbase]); - - if(SWIG_ConvertPtr(*args[7-argbase], (void **) &arg8, 0) < 0) { - /* Allow NULL from php for void* */ - if ((*args[7-argbase])->type==IS_NULL) arg8=0; - else zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 8-argbase, SWIGTYPE_p_void->name); - } - - - convert_to_long_ex(args[8-argbase]); - arg9 = (unsigned int) Z_LVAL_PP(args[8-argbase]); - - result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); + result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5); ZVAL_LONG(return_value,result); Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py Sat Dec 23 13:26:46 2006 @@ -1,10 +1,10 @@ -# This file was created automatically by SWIG 1.3.27. +# This file was created automatically by SWIG. # Don't modify this file, modify the SWIG interface instead. +# This file is compatible with both classic and new-style classes. import _freeswitch -# This file is compatible with both classic and new-style classes. -def _swig_setattr_nondynamic(self,class_type,name,value,static=1): +def _swig_setattr(self,class_type,name,value): if (name == "this"): if isinstance(value, class_type): self.__dict__[name] = value.this @@ -13,14 +13,8 @@ return method = class_type.__swig_setmethods__.get(name,None) if method: return method(self,value) - if (not static) or hasattr(self,name) or (name == "thisown"): - self.__dict__[name] = value - else: - raise AttributeError("You cannot add attributes to %s" % self) + self.__dict__[name] = value -def _swig_setattr(self,class_type,name,value): - return _swig_setattr_nondynamic(self,class_type,name,value,0) - def _swig_getattr(self,class_type,name): method = class_type.__swig_getmethods__.get(name,None) if method: return method(self) @@ -44,7 +38,7 @@ __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, SessionContainer, name) def __repr__(self): - return "<%s.%s; proxy of C++ SessionContainer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + return "<C SessionContainer instance at %s>" % (self.this,) def __init__(self, *args): _swig_setattr(self, SessionContainer, 'this', _freeswitch.new_SessionContainer(*args)) _swig_setattr(self, SessionContainer, 'thisown', 1) @@ -52,7 +46,6 @@ try: if self.thisown: destroy(self) except: pass - def console_log(*args): return _freeswitch.SessionContainer_console_log(*args) def console_clean_log(*args): return _freeswitch.SessionContainer_console_clean_log(*args) def answer(*args): return _freeswitch.SessionContainer_answer(*args) @@ -73,9 +66,8 @@ def __init__(self, this): _swig_setattr(self, SessionContainer, 'this', this) if not hasattr(self,"thisown"): _swig_setattr(self, SessionContainer, 'thisown', 0) - self.__class__ = SessionContainer + _swig_setattr(self, SessionContainer,self.__class__,SessionContainer) _freeswitch.SessionContainer_swigregister(SessionContainerPtr) cvar = _freeswitch.cvar - Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Sat Dec 23 13:26:46 2006 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.27 + * Version 1.3.21 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -23,119 +23,77 @@ T *operator&() { return tt; } private: SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs); -}; +}; #endif -/*********************************************************************** + +#include "Python.h" + +/*************************************************************** -*- c -*- + * python/precommon.swg * - * This section contains generic SWIG labels for method/variable - * declarations/attributes, and other compiler dependent labels. + * Rename all exported symbols from common.swg, to avoid symbol + * clashes if multiple interpreters are included * ************************************************************************/ -/* template workaround for compilers that cannot correctly implement the C++ standard */ -#ifndef SWIGTEMPLATEDISAMBIGUATOR -# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) -# define SWIGTEMPLATEDISAMBIGUATOR template -# else -# define SWIGTEMPLATEDISAMBIGUATOR -# endif -#endif +#define SWIG_TypeRegister SWIG_Python_TypeRegister +#define SWIG_TypeCheck SWIG_Python_TypeCheck +#define SWIG_TypeCast SWIG_Python_TypeCast +#define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast +#define SWIG_TypeName SWIG_Python_TypeName +#define SWIG_TypeQuery SWIG_Python_TypeQuery +#define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData -/* inline attribute */ -#ifndef SWIGINLINE -# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) -# define SWIGINLINE inline -# else -# define SWIGINLINE -# endif -#endif -/* attribute recognised by some compilers to avoid 'unused' warnings */ -#ifndef SWIGUNUSED -# if defined(__GNUC__) || defined(__ICC) -# define SWIGUNUSED __attribute__ ((unused)) -# else -# define SWIGUNUSED -# endif -#endif - -/* internal SWIG method */ -#ifndef SWIGINTERN -# define SWIGINTERN static SWIGUNUSED -#endif - -/* internal inline SWIG method */ -#ifndef SWIGINTERNINLINE -# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE -#endif - -/* exporting methods for Windows DLLs */ -#ifndef SWIGEXPORT -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(STATIC_LINKED) -# define SWIGEXPORT -# else -# define SWIGEXPORT __declspec(dllexport) -# endif -# else -# define SWIGEXPORT -# endif -#endif - -/* calling conventions for Windows */ -#ifndef SWIGSTDCALL -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# define SWIGSTDCALL __stdcall -# else -# define SWIGSTDCALL -# endif -#endif - - - -#include <Python.h> - /*********************************************************************** - * swigrun.swg + * common.swg * - * This file contains generic CAPI SWIG runtime support for pointer - * type checking. + * This file contains generic SWIG runtime support for pointer + * type checking as well as a few commonly used macros to control + * external linkage. * + * Author : David Beazley (beazley(a)cs.uchicago.edu) + * + * Copyright (c) 1999-2000, The University of Chicago + * + * This file may be freely redistributed without license or fee provided + * this copyright message remains intact. ************************************************************************/ -/* This should only be incremented when either the layout of swig_type_info changes, - or for whatever reason, the runtime changes incompatibly */ -#define SWIG_RUNTIME_VERSION "2" +#include <string.h> -/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ -#ifdef SWIG_TYPE_TABLE -# define SWIG_QUOTE_STRING(x) #x -# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) -# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIG_TYPE_TABLE_NAME +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif -/* - You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for - creating a static or dynamic library from the swig runtime code. - In 99.9% of the cases, swig just needs to declare them as 'static'. - - But only do this if is strictly necessary, ie, if you have problems - with your compiler or so. -*/ - -#ifndef SWIGRUNTIME -# define SWIGRUNTIME SWIGINTERN +#ifdef SWIG_GLOBAL +# define SWIGRUNTIME(a) SWIGEXPORT(a) +#else +# define SWIGRUNTIME(a) static a #endif -#ifndef SWIGRUNTIMEINLINE -# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE -#endif - -#include <string.h> - #ifdef __cplusplus extern "C" { #endif @@ -143,141 +101,106 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); -/* Structure to store inforomation on one type */ typedef struct swig_type_info { - const char *name; /* mangled name of this type */ - const char *str; /* human readable name of this type */ - swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ - struct swig_cast_info *cast; /* linked list of types that can cast into this type */ - void *clientdata; /* language specific type data */ + const char *name; + swig_converter_func converter; + const char *str; + void *clientdata; + swig_dycast_func dcast; + struct swig_type_info *next; + struct swig_type_info *prev; } swig_type_info; -/* Structure to store a type and conversion function used for casting */ -typedef struct swig_cast_info { - swig_type_info *type; /* pointer to type that is equivalent to this type */ - swig_converter_func converter; /* function to cast the void pointers */ - struct swig_cast_info *next; /* pointer to next cast in linked list */ - struct swig_cast_info *prev; /* pointer to the previous cast */ -} swig_cast_info; +#ifdef SWIG_NOINCLUDE -/* Structure used to store module information - * Each module generates one structure like this, and the runtime collects - * all of these structures and stores them in a circularly linked list.*/ -typedef struct swig_module_info { - swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ - size_t size; /* Number of types in this module */ - struct swig_module_info *next; /* Pointer to next element in circularly linked list */ - swig_type_info **type_initial; /* Array of initially generated type structures */ - swig_cast_info **cast_initial; /* Array of initially generated casting structures */ - void *clientdata; /* Language specific module data */ -} swig_module_info; +SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *); +SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); +SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); +SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); +SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); +SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); +SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); +#else -/* - Compare two type names skipping the space characters, therefore - "char*" == "char *" and "Class<int>" == "Class<int >", etc. +static swig_type_info *swig_type_list = 0; - Return 0 when the two name types are equivalent, as in - strncmp, but skipping ' '. -*/ -SWIGRUNTIME int -SWIG_TypeNameComp(const char *f1, const char *l1, - const char *f2, const char *l2) { - for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { - while ((*f1 == ' ') && (f1 != l1)) ++f1; - while ((*f2 == ' ') && (f2 != l2)) ++f2; - if (*f1 != *f2) return (int)(*f1 - *f2); +/* Register a type mapping with the type-checking */ +SWIGRUNTIME(swig_type_info *) +SWIG_TypeRegister(swig_type_info *ti) { + swig_type_info *tc, *head, *ret, *next; + /* Check to see if this type has already been registered */ + tc = swig_type_list; + while (tc) { + if (strcmp(tc->name, ti->name) == 0) { + /* Already exists in the table. Just add additional types to the list */ + if (tc->clientdata) ti->clientdata = tc->clientdata; + head = tc; + next = tc->next; + goto l1; + } + tc = tc->prev; } - return (l1 - f1) - (l2 - f2); -} + head = ti; + next = 0; -/* - Check type equivalence in a name list like <name1>|<name2>|... - Return 0 if not equal, 1 if equal -*/ -SWIGRUNTIME int -SWIG_TypeEquiv(const char *nb, const char *tb) { - int equiv = 0; - const char* te = tb + strlen(tb); - const char* ne = nb; - while (!equiv && *ne) { - for (nb = ne; *ne; ++ne) { - if (*ne == '|') break; - } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; - if (*ne) ++ne; + /* Place in list */ + ti->prev = swig_type_list; + swig_type_list = ti; + + /* Build linked lists */ + l1: + ret = head; + tc = ti + 1; + /* Patch up the rest of the links */ + while (tc->name) { + head->next = tc; + tc->prev = head; + head = tc; + tc++; } - return equiv; + if (next) next->prev = head; + head->next = next; + return ret; } -/* - Check type equivalence in a name list like <name1>|<name2>|... - Return 0 if equal, -1 if nb < tb, 1 if nb > tb -*/ -SWIGRUNTIME int -SWIG_TypeCompare(const char *nb, const char *tb) { - int equiv = 0; - const char* te = tb + strlen(tb); - const char* ne = nb; - while (!equiv && *ne) { - for (nb = ne; *ne; ++ne) { - if (*ne == '|') break; +/* Check the typename */ +SWIGRUNTIME(swig_type_info *) +SWIG_TypeCheck(char *c, swig_type_info *ty) { + swig_type_info *s; + if (!ty) return 0; /* Void pointer */ + s = ty->next; /* First element always just a name */ + do { + if (strcmp(s->name,c) == 0) { + if (s == ty->next) return s; + /* Move s to the top of the linked list */ + s->prev->next = s->next; + if (s->next) { + s->next->prev = s->prev; + } + /* Insert s as second element in the list */ + s->next = ty->next; + if (ty->next) ty->next->prev = s; + ty->next = s; + s->prev = ty; + return s; } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; - if (*ne) ++ne; - } - return equiv; + s = s->next; + } while (s && (s != ty->next)); + return 0; } - -/* think of this as a c++ template<> or a scheme macro */ -#define SWIG_TypeCheck_Template(comparison, ty) \ - if (ty) { \ - swig_cast_info *iter = ty->cast; \ - while (iter) { \ - if (comparison) { \ - if (iter == ty->cast) return iter; \ - /* Move iter to the top of the linked list */ \ - iter->prev->next = iter->next; \ - if (iter->next) \ - iter->next->prev = iter->prev; \ - iter->next = ty->cast; \ - iter->prev = 0; \ - if (ty->cast) ty->cast->prev = iter; \ - ty->cast = iter; \ - return iter; \ - } \ - iter = iter->next; \ - } \ - } \ - return 0 - -/* - Check the typename -*/ -SWIGRUNTIME swig_cast_info * -SWIG_TypeCheck(const char *c, swig_type_info *ty) { - SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); +/* Cast a pointer up an inheritance hierarchy */ +SWIGRUNTIME(void *) +SWIG_TypeCast(swig_type_info *ty, void *ptr) { + if ((!ty) || (!ty->converter)) return ptr; + return (*ty->converter)(ptr); } -/* Same as previous function, except strcmp is replaced with a pointer comparison */ -SWIGRUNTIME swig_cast_info * -SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { - SWIG_TypeCheck_Template(iter->type == from, into); -} - -/* - Cast a pointer up an inheritance hierarchy -*/ -SWIGRUNTIMEINLINE void * -SWIG_TypeCast(swig_cast_info *ty, void *ptr) { - return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); -} - -/* - Dynamic pointer casting. Down an inheritance hierarchy -*/ -SWIGRUNTIME swig_type_info * +/* Dynamic pointer casting. Down an inheritance hierarchy */ +SWIGRUNTIME(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { swig_type_info *lastty = ty; if (!ty || !ty->dcast) return ty; @@ -288,285 +211,118 @@ return lastty; } -/* - Return the name associated with this type -*/ -SWIGRUNTIMEINLINE const char * +/* Return the name associated with this type */ +SWIGRUNTIME(const char *) SWIG_TypeName(const swig_type_info *ty) { return ty->name; } -/* - Return the pretty name associated with this type, - that is an unmangled type name in a form presentable to the user. -*/ -SWIGRUNTIME const char * -SWIG_TypePrettyName(const swig_type_info *type) { - /* The "str" field contains the equivalent pretty names of the - type, separated by vertical-bar characters. We choose - to print the last name, as it is often (?) the most - specific. */ - if (type->str != NULL) { - const char *last_name = type->str; - const char *s; - for (s = type->str; *s; s++) - if (*s == '|') last_name = s+1; - return last_name; +/* Search for a swig_type_info structure */ +SWIGRUNTIME(swig_type_info *) +SWIG_TypeQuery(const char *name) { + swig_type_info *ty = swig_type_list; + while (ty) { + if (ty->str && (strcmp(name,ty->str) == 0)) return ty; + if (ty->name && (strcmp(name,ty->name) == 0)) return ty; + ty = ty->prev; } - else - return type->name; + return 0; } -/* - Set the clientdata field for a type -*/ -SWIGRUNTIME void +/* Set the clientdata field for a type */ +SWIGRUNTIME(void) SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { - swig_cast_info *cast = ti->cast; - /* if (ti->clientdata == clientdata) return; */ + swig_type_info *tc, *equiv; + if (ti->clientdata == clientdata) return; ti->clientdata = clientdata; - - while (cast) { - if (!cast->converter) { - swig_type_info *tc = cast->type; - if (!tc->clientdata) { - SWIG_TypeClientData(tc, clientdata); + equiv = ti->next; + while (equiv) { + if (!equiv->converter) { + tc = swig_type_list; + while (tc) { + if ((strcmp(tc->name, equiv->name) == 0)) + SWIG_TypeClientData(tc,clientdata); + tc = tc->prev; } - } - cast = cast->next; - } -} - -/* - Search for a swig_type_info structure only by mangled name - Search is a O(log #types) - - We start searching at module start, and finish searching when start == end. - Note: if start == end at the beginning of the function, we go all the way around - the circular list. -*/ -SWIGRUNTIME swig_type_info * -SWIG_MangledTypeQueryModule(swig_module_info *start, - swig_module_info *end, - const char *name) { - swig_module_info *iter = start; - do { - if (iter->size) { - register size_t l = 0; - register size_t r = iter->size - 1; - do { - /* since l+r >= 0, we can (>> 1) instead (/ 2) */ - register size_t i = (l + r) >> 1; - const char *iname = iter->types[i]->name; - if (iname) { - register int compare = strcmp(name, iname); - if (compare == 0) { - return iter->types[i]; - } else if (compare < 0) { - if (i) { - r = i - 1; - } else { - break; - } - } else if (compare > 0) { - l = i + 1; - } - } else { - break; /* should never happen */ - } - } while (l <= r); } - iter = iter->next; - } while (iter != end); - return 0; -} - -/* - Search for a swig_type_info structure for either a mangled name or a human readable name. - It first searches the mangled names of the types, which is a O(log #types) - If a type is not found it then searches the human readable names, which is O(#types). - - We start searching at module start, and finish searching when start == end. - Note: if start == end at the beginning of the function, we go all the way around - the circular list. -*/ -SWIGRUNTIME swig_type_info * -SWIG_TypeQueryModule(swig_module_info *start, - swig_module_info *end, - const char *name) { - /* STEP 1: Search the name field using binary search */ - swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); - if (ret) { - return ret; - } else { - /* STEP 2: If the type hasn't been found, do a complete search - of the str field (the human readable name) */ - swig_module_info *iter = start; - do { - register size_t i = 0; - for (; i < iter->size; ++i) { - if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) - return iter->types[i]; - } - iter = iter->next; - } while (iter != end); + equiv = equiv->next; } - - /* neither found a match */ - return 0; } - -/* - Pack binary data into a string -*/ -SWIGRUNTIME char * -SWIG_PackData(char *c, void *ptr, size_t sz) { - static const char hex[17] = "0123456789abcdef"; - register const unsigned char *u = (unsigned char *) ptr; - register const unsigned char *eu = u + sz; - for (; u != eu; ++u) { - register unsigned char uu = *u; +/* Pack binary data into a string */ +SWIGRUNTIME(char *) +SWIG_PackData(char *c, void *ptr, int sz) { + static char hex[17] = "0123456789abcdef"; + int i; + unsigned char *u = (unsigned char *) ptr; + register unsigned char uu; + for (i = 0; i < sz; i++,u++) { + uu = *u; *(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[uu & 0xf]; } return c; } -/* - Unpack binary data from a string -*/ -SWIGRUNTIME const char * -SWIG_UnpackData(const char *c, void *ptr, size_t sz) { - register unsigned char *u = (unsigned char *) ptr; - register const unsigned char *eu = u + sz; - for (; u != eu; ++u) { - register char d = *(c++); - register unsigned char uu = 0; +/* Unpack binary data from a string */ +SWIGRUNTIME(char *) +SWIG_UnpackData(char *c, void *ptr, int sz) { + register unsigned char uu = 0; + register int d; + unsigned char *u = (unsigned char *) ptr; + int i; + for (i = 0; i < sz; i++, u++) { + d = *(c++); if ((d >= '0') && (d <= '9')) uu = ((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) uu = ((d - ('a'-10)) << 4); - else - return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) uu |= (d - '0'); else if ((d >= 'a') && (d <= 'f')) uu |= (d - ('a'-10)); - else - return (char *) 0; *u = uu; } return c; } -/* - Pack 'void *' into a string buffer. -*/ -SWIGRUNTIME char * -SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { - char *r = buff; - if ((2*sizeof(void *) + 2) > bsz) return 0; - *(r++) = '_'; - r = SWIG_PackData(r,&ptr,sizeof(void *)); - if (strlen(name) + 1 > (bsz - (r - buff))) return 0; - strcpy(r,name); - return buff; -} +#endif -SWIGRUNTIME const char * -SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { - if (*c != '_') { - if (strcmp(c,"NULL") == 0) { - *ptr = (void *) 0; - return name; - } else { - return 0; - } - } - return SWIG_UnpackData(++c,ptr,sizeof(void *)); -} - -SWIGRUNTIME char * -SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { - char *r = buff; - size_t lname = (name ? strlen(name) : 0); - if ((2*sz + 2 + lname) > bsz) return 0; - *(r++) = '_'; - r = SWIG_PackData(r,ptr,sz); - if (lname) { - strncpy(r,name,lname+1); - } else { - *r = 0; - } - return buff; -} - -SWIGRUNTIME const char * -SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { - if (*c != '_') { - if (strcmp(c,"NULL") == 0) { - memset(ptr,0,sz); - return name; - } else { - return 0; - } - } - return SWIG_UnpackData(++c,ptr,sz); -} - #ifdef __cplusplus } #endif -/* ----------------------------------------------------------------------------- - * SWIG API. Portion that goes into the runtime - * ----------------------------------------------------------------------------- */ +/*********************************************************************** + * python.swg + * + * This file contains the runtime support for Python modules + * and includes code for managing global variables and pointer + * type checking. + * + * Author : David Beazley (beazley(a)cs.uchicago.edu) + ************************************************************************/ +#include "Python.h" + #ifdef __cplusplus extern "C" { #endif -/* ----------------------------------------------------------------------------- - * for internal method declarations - * ----------------------------------------------------------------------------- */ - -#ifndef SWIGINTERN -# define SWIGINTERN static SWIGUNUSED -#endif - -#ifndef SWIGINTERNINLINE -# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE -#endif - -/* - Exception handling in wrappers -*/ -#define SWIG_fail goto fail -#define SWIG_arg_fail(arg) SWIG_Python_ArgFail(arg) -#define SWIG_append_errmsg(msg) SWIG_Python_AddErrMesg(msg,0) -#define SWIG_preppend_errmsg(msg) SWIG_Python_AddErrMesg(msg,1) -#define SWIG_type_error(type,obj) SWIG_Python_TypeError(type,obj) -#define SWIG_null_ref(type) SWIG_Python_NullRef(type) - -/* - Contract support -*/ -#define SWIG_contract_assert(expr, msg) \ - if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else - -/* ----------------------------------------------------------------------------- - * Constant declarations - * ----------------------------------------------------------------------------- */ - -/* Constant Types */ #define SWIG_PY_INT 1 #define SWIG_PY_FLOAT 2 #define SWIG_PY_STRING 3 #define SWIG_PY_POINTER 4 #define SWIG_PY_BINARY 5 +/* Flags for pointer conversion */ + +#define SWIG_POINTER_EXCEPTION 0x1 +#define SWIG_POINTER_DISOWN 0x2 + +/* Exception handling in wrappers */ +#define SWIG_fail goto fail + /* Constant information structure */ typedef struct swig_const_info { int type; @@ -577,618 +333,175 @@ swig_type_info **ptype; } swig_const_info; - -/* ----------------------------------------------------------------------------- - * Alloc. memory flags - * ----------------------------------------------------------------------------- */ -#define SWIG_OLDOBJ 1 -#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 -#define SWIG_PYSTR SWIG_NEWOBJ + 1 - -#ifdef __cplusplus -} -#endif - - -/*********************************************************************** - * pyrun.swg - * - * This file contains the runtime support for Python modules - * and includes code for managing global variables and pointer - * type checking. - * - * Author : David Beazley (beazley(a)cs.uchicago.edu) - ************************************************************************/ - /* Common SWIG API */ -#define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) -#define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) -#define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - +#define SWIG_ConvertPtr(obj, pp, type, flags) \ + SWIG_Python_ConvertPtr(obj, pp, type, flags) +#define SWIG_NewPointerObj(p, type, flags) \ + SWIG_Python_NewPointerObj(p, type, flags) +#define SWIG_MustGetPtr(p, type, argnum, flags) \ + SWIG_Python_MustGetPtr(p, type, argnum, flags) /* Python-specific SWIG API */ -#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type) +#define SWIG_newvarlink() \ + SWIG_Python_newvarlink() +#define SWIG_addvarlink(p, name, get_attr, set_attr) \ + SWIG_Python_addvarlink(p, name, get_attr, set_attr) +#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ + SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) +#define SWIG_NewPackedObj(ptr, sz, type) \ + SWIG_Python_NewPackedObj(ptr, sz, type) +#define SWIG_InstallConstants(d, constants) \ + SWIG_Python_InstallConstants(d, constants) -/* Runtime API */ -#define SWIG_GetModule(clientdata) SWIG_Python_GetModule() -#define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer) +#ifdef SWIG_NOINCLUDE -/* ----------------------------------------------------------------------------- - * Pointer declarations - * ----------------------------------------------------------------------------- */ -/* - Use SWIG_NO_COBJECT_TYPES to force the use of strings to represent - C/C++ pointers in the python side. Very useful for debugging, but - not always safe. -*/ -#if !defined(SWIG_NO_COBJECT_TYPES) && !defined(SWIG_COBJECT_TYPES) -# define SWIG_COBJECT_TYPES -#endif +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -/* Flags for pointer conversion */ -#define SWIG_POINTER_EXCEPTION 0x1 -#define SWIG_POINTER_DISOWN 0x2 +#else - -/* Add PyOS_snprintf for old Pythons */ -#if PY_VERSION_HEX < 0x02020000 -#define PyOS_snprintf snprintf -#endif - -#ifdef __cplusplus -extern "C" { -#endif - /* ----------------------------------------------------------------------------- - * Create a new pointer string + * global variable support code. * ----------------------------------------------------------------------------- */ -#ifndef SWIG_BUFFER_SIZE -#define SWIG_BUFFER_SIZE 1024 -#endif -/* A crude PyString_FromFormat implementation for old Pythons */ -#if PY_VERSION_HEX < 0x02020000 -static PyObject * -PyString_FromFormat(const char *fmt, ...) { - va_list ap; - char buf[SWIG_BUFFER_SIZE * 2]; - int res; - va_start(ap, fmt); - res = vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); - return (res < 0 || res >= sizeof(buf)) ? 0 : PyString_FromString(buf); -} -#endif +typedef struct swig_globalvar { + char *name; /* Name of global variable */ + PyObject *(*get_attr)(void); /* Return the current value */ + int (*set_attr)(PyObject *); /* Set the value */ + struct swig_globalvar *next; +} swig_globalvar; -#if PY_VERSION_HEX < 0x01060000 -#define PyObject_Del(op) PyMem_DEL((op)) -#endif - -#if defined(SWIG_COBJECT_TYPES) -#if !defined(SWIG_COBJECT_PYTHON) -/* ----------------------------------------------------------------------------- - * Implements a simple Swig Object type, and use it instead of PyCObject - * ----------------------------------------------------------------------------- */ - -typedef struct { +typedef struct swig_varlinkobject { PyObject_HEAD - void *ptr; - const char *desc; -} PySwigObject; + swig_globalvar *vars; +} swig_varlinkobject; -/* Declarations for objects of type PySwigObject */ +static PyObject * +swig_varlink_repr(swig_varlinkobject *v) { + v = v; + return PyString_FromString("<Global variables>"); +} -SWIGRUNTIME int -PySwigObject_print(PySwigObject *v, FILE *fp, int flags) -{ - char result[SWIG_BUFFER_SIZE]; +static int +swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) { + swig_globalvar *var; flags = flags; - if (SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result))) { - fputs("<Swig Object at ", fp); fputs(result, fp); fputs(">", fp); - return 0; - } else { - return 1; + fprintf(fp,"Global variables { "); + for (var = v->vars; var; var=var->next) { + fprintf(fp,"%s", var->name); + if (var->next) fprintf(fp,", "); } + fprintf(fp," }\n"); + return 0; } - -SWIGRUNTIME PyObject * -PySwigObject_repr(PySwigObject *v) -{ - char result[SWIG_BUFFER_SIZE]; - return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ? - PyString_FromFormat("<Swig Object at %s>", result) : 0; -} -SWIGRUNTIME PyObject * -PySwigObject_str(PySwigObject *v) -{ - char result[SWIG_BUFFER_SIZE]; - return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ? - PyString_FromString(result) : 0; -} - -SWIGRUNTIME PyObject * -PySwigObject_long(PySwigObject *v) -{ - return PyLong_FromVoidPtr(v->ptr); -} - -SWIGRUNTIME PyObject * -PySwigObject_format(const char* fmt, PySwigObject *v) -{ - PyObject *res = NULL; - PyObject *args = PyTuple_New(1); - if (args && (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0)) { - PyObject *ofmt = PyString_FromString(fmt); - if (ofmt) { - res = PyString_Format(ofmt,args); - Py_DECREF(ofmt); +static PyObject * +swig_varlink_getattr(swig_varlinkobject *v, char *n) { + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + return (*var->get_attr)(); } - Py_DECREF(args); - } - return res; -} - -SWIGRUNTIME PyObject * -PySwigObject_oct(PySwigObject *v) -{ - return PySwigObject_format("%o",v); -} - -SWIGRUNTIME PyObject * -PySwigObject_hex(PySwigObject *v) -{ - return PySwigObject_format("%x",v); -} - -SWIGRUNTIME int -PySwigObject_compare(PySwigObject *v, PySwigObject *w) -{ - int c = strcmp(v->desc, w->desc); - if (c) { - return (c > 0) ? 1 : -1; - } else { - void *i = v->ptr; - void *j = w->ptr; - return (i < j) ? -1 : ((i > j) ? 1 : 0); + var = var->next; } + PyErr_SetString(PyExc_NameError,"Unknown C global variable"); + return NULL; } -SWIGRUNTIME void -PySwigObject_dealloc(PySwigObject *self) -{ - PyObject_Del(self); -} - -SWIGRUNTIME PyTypeObject* -PySwigObject_type(void) { - static char pyswigobject_type__doc__[] = - "Swig object carries a C/C++ instance pointer"; - - static PyNumberMethods PySwigObject_as_number = { - (binaryfunc)0, /*nb_add*/ - (binaryfunc)0, /*nb_subtract*/ - (binaryfunc)0, /*nb_multiply*/ - (binaryfunc)0, /*nb_divide*/ - (binaryfunc)0, /*nb_remainder*/ - (binaryfunc)0, /*nb_divmod*/ - (ternaryfunc)0,/*nb_power*/ - (unaryfunc)0, /*nb_negative*/ - (unaryfunc)0, /*nb_positive*/ - (unaryfunc)0, /*nb_absolute*/ - (inquiry)0, /*nb_nonzero*/ - 0, /*nb_invert*/ - 0, /*nb_lshift*/ - 0, /*nb_rshift*/ - 0, /*nb_and*/ - 0, /*nb_xor*/ - 0, /*nb_or*/ - (coercion)0, /*nb_coerce*/ - (unaryfunc)PySwigObject_long, /*nb_int*/ - (unaryfunc)PySwigObject_long, /*nb_long*/ - (unaryfunc)0, /*nb_float*/ - (unaryfunc)PySwigObject_oct, /*nb_oct*/ - (unaryfunc)PySwigObject_hex, /*nb_hex*/ -#if PY_VERSION_HEX >= 0x02020000 - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ -#elif PY_VERSION_HEX >= 0x02000000 - 0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */ -#endif - }; - - static PyTypeObject pyswigobject_type -#if !defined(__cplusplus) - ; - static int type_init = 0; - if (!type_init) { - PyTypeObject tmp -#endif - = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /*ob_size*/ - (char *)"PySwigObject", /*tp_name*/ - sizeof(PySwigObject), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - /* methods */ - (destructor)PySwigObject_dealloc, /*tp_dealloc*/ - (printfunc)PySwigObject_print, /*tp_print*/ - (getattrfunc)0, /*tp_getattr*/ - (setattrfunc)0, /*tp_setattr*/ - (cmpfunc)PySwigObject_compare, /*tp_compare*/ - (reprfunc)PySwigObject_repr, /*tp_repr*/ - &PySwigObject_as_number, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - (hashfunc)0, /*tp_hash*/ - (ternaryfunc)0, /*tp_call*/ - (reprfunc)PySwigObject_str, /*tp_str*/ - /* Space for future expansion */ - 0,0,0,0, - pyswigobject_type__doc__, /* Documentation string */ -#if PY_VERSION_HEX >= 0x02000000 - 0, /* tp_traverse */ - 0, /* tp_clear */ -#endif -#if PY_VERSION_HEX >= 0x02010000 - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ -#endif -#if PY_VERSION_HEX >= 0x02020000 - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ -#endif -#if PY_VERSION_HEX >= 0x02030000 - 0, /* tp_del */ -#endif -#ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ -#endif - }; -#if !defined(__cplusplus) - pyswigobject_type = tmp; - type_init = 1; - } -#endif - return &pyswigobject_type; -} - -SWIGRUNTIME PyObject * -PySwigObject_FromVoidPtrAndDesc(void *ptr, const char *desc) -{ - PySwigObject *self = PyObject_NEW(PySwigObject, PySwigObject_type()); - if (self) { - self->ptr = ptr; - self->desc = desc; - } - return (PyObject *)self; -} - -SWIGRUNTIMEINLINE void * -PySwigObject_AsVoidPtr(PyObject *self) -{ - return ((PySwigObject *)self)->ptr; -} - -SWIGRUNTIMEINLINE const char * -PySwigObject_GetDesc(PyObject *self) -{ - return ((PySwigObject *)self)->desc; -} - -SWIGRUNTIMEINLINE int -PySwigObject_Check(PyObject *op) { - return ((op)->ob_type == PySwigObject_type()) - || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0); -} - -/* ----------------------------------------------------------------------------- - * Implements a simple Swig Packed type, and use it instead of string - * ----------------------------------------------------------------------------- */ - -typedef struct { - PyObject_HEAD - void *pack; - const char *desc; - size_t size; -} PySwigPacked; - -SWIGRUNTIME int -PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) -{ - char result[SWIG_BUFFER_SIZE]; - flags = flags; - fputs("<Swig Packed ", fp); - if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) { - fputs("at ", fp); - fputs(result, fp); - } - fputs(v->desc,fp); - fputs(">", fp); - return 0; -} - -SWIGRUNTIME PyObject * -PySwigPacked_repr(PySwigPacked *v) -{ - char result[SWIG_BUFFER_SIZE]; - if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) { - return PyString_FromFormat("<Swig Packed at %s%s>", result, v->desc); - } else { - return PyString_FromFormat("<Swig Packed %s>", v->desc); - } -} - -SWIGRUNTIME PyObject * -PySwigPacked_str(PySwigPacked *v) -{ - char result[SWIG_BUFFER_SIZE]; - if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){ - return PyString_FromFormat("%s%s", result, v->desc); - } else { - return PyString_FromString(v->desc); - } -} - -SWIGRUNTIME int -PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w) -{ - int c = strcmp(v->desc, w->desc); - if (c) { - return (c > 0) ? 1 : -1; - } else { - size_t i = v->size; - size_t j = w->size; - int s = (i < j) ? -1 : ((i > j) ? 1 : 0); - return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size); - } -} - -SWIGRUNTIME void -PySwigPacked_dealloc(PySwigPacked *self) -{ - free(self->pack); - PyObject_Del(self); -} - -SWIGRUNTIME PyTypeObject* -PySwigPacked_type(void) { - static char pyswigpacked_type__doc__[] = - "Swig object carries a C/C++ instance pointer"; - static PyTypeObject pyswigpacked_type -#if !defined(__cplusplus) - ; - static int type_init = 0; - if (!type_init) { - PyTypeObject tmp -#endif - = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /*ob_size*/ - (char *)"PySwigPacked", /*tp_name*/ - sizeof(PySwigPacked), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - /* methods */ - (destructor)PySwigPacked_dealloc, /*tp_dealloc*/ - (printfunc)PySwigPacked_print, /*tp_print*/ - (getattrfunc)0, /*tp_getattr*/ - (setattrfunc)0, /*tp_setattr*/ - (cmpfunc)PySwigPacked_compare, /*tp_compare*/ - (reprfunc)PySwigPacked_repr, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - (hashfunc)0, /*tp_hash*/ - (ternaryfunc)0, /*tp_call*/ - (reprfunc)PySwigPacked_str, /*tp_str*/ - /* Space for future expansion */ - 0,0,0,0, - pyswigpacked_type__doc__, /* Documentation string */ -#if PY_VERSION_HEX >= 0x02000000 - 0, /* tp_traverse */ - 0, /* tp_clear */ -#endif -#if PY_VERSION_HEX >= 0x02010000 - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ -#endif -#if PY_VERSION_HEX >= 0x02020000 - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ -#endif -#if PY_VERSION_HEX >= 0x02030000 - 0, /* tp_del */ -#endif -#ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ -#endif - }; -#if !defined(__cplusplus) - pyswigpacked_type = tmp; - type_init = 1; - } -#endif - return &pyswigpacked_type; -} - -SWIGRUNTIME PyObject * -PySwigPacked_FromDataAndDesc(void *ptr, size_t size, const char *desc) -{ - PySwigPacked *self = PyObject_NEW(PySwigPacked, PySwigPacked_type()); - if (self == NULL) { - return NULL; - } else { - void *pack = malloc(size); - if (pack) { - memcpy(pack, ptr, size); - self->pack = pack; - self->desc = desc; - self->size = size; - return (PyObject *) self; +static int +swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + return (*var->set_attr)(p); } - return NULL; + var = var->next; } + PyErr_SetString(PyExc_NameError,"Unknown C global variable"); + return 1; } -SWIGRUNTIMEINLINE const char * -PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size) -{ - PySwigPacked *self = (PySwigPacked *)obj; - if (self->size != size) return 0; - memcpy(ptr, self->pack, size); - return self->desc; -} +statichere PyTypeObject varlinktype = { + PyObject_HEAD_INIT(0) + 0, + (char *)"swigvarlink", /* Type name */ + sizeof(swig_varlinkobject), /* Basic size */ + 0, /* Itemsize */ + 0, /* Deallocator */ + (printfunc) swig_varlink_print, /* Print */ + (getattrfunc) swig_varlink_getattr, /* get attr */ + (setattrfunc) swig_varlink_setattr, /* Set attr */ + 0, /* tp_compare */ + (reprfunc) swig_varlink_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_mapping*/ + 0, /* tp_hash */ +}; -SWIGRUNTIMEINLINE const char * -PySwigPacked_GetDesc(PyObject *self) -{ - return ((PySwigPacked *)self)->desc; +/* Create a variable linking object for use later */ +SWIGRUNTIME(PyObject *) +SWIG_Python_newvarlink(void) { + swig_varlinkobject *result = 0; + result = PyMem_NEW(swig_varlinkobject,1); + varlinktype.ob_type = &PyType_Type; /* Patch varlinktype into a PyType */ + result->ob_type = &varlinktype; + result->vars = 0; + result->ob_refcnt = 0; + Py_XINCREF((PyObject *) result); + return ((PyObject*) result); } -SWIGRUNTIMEINLINE int -PySwigPacked_Check(PyObject *op) { - return ((op)->ob_type == PySwigPacked_type()) - || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0); +SWIGRUNTIME(void) +SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { + swig_varlinkobject *v; + swig_globalvar *gv; + v= (swig_varlinkobject *) p; + gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); + gv->name = (char *) malloc(strlen(name)+1); + strcpy(gv->name,name); + gv->get_attr = get_attr; + gv->set_attr = set_attr; + gv->next = v->vars; + v->vars = gv; } -#else -/* ----------------------------------------------------------------------------- - * Use the old Python PyCObject instead of PySwigObject - * ----------------------------------------------------------------------------- */ - -#define PySwigObject_GetDesc(obj) PyCObject_GetDesc(obj) -#define PySwigObject_Check(obj) PyCObject_Check(obj) -#define PySwigObject_AsVoidPtr(obj) PyCObject_AsVoidPtr(obj) -#define PySwigObject_FromVoidPtrAndDesc(p, d) PyCObject_FromVoidPtrAndDesc(p, d, NULL) - -#endif - -#endif - -/* ----------------------------------------------------------------------------- - * errors manipulation - * ----------------------------------------------------------------------------- */ - -SWIGRUNTIME void -SWIG_Python_TypeError(const char *type, PyObject *obj) -{ - if (type) { -#if defined(SWIG_COBJECT_TYPES) - if (obj && PySwigObject_Check(obj)) { - const char *otype = (const char *) PySwigObject_GetDesc(obj); - if (otype) { - PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received", - type, otype); - return; - } - } else -#endif - { - const char *otype = (obj ? obj->ob_type->tp_name : 0); - if (otype) { - PyObject *str = PyObject_Str(obj); - const char *cstr = str ? PyString_AsString(str) : 0; - if (cstr) { - PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", - type, otype, cstr); - } else { - PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", - type, otype); - } - Py_XDECREF(str); - return; - } - } - PyErr_Format(PyExc_TypeError, "a '%s' is expected", type); - } else { - PyErr_Format(PyExc_TypeError, "unexpected type is received"); - } -} - -SWIGRUNTIMEINLINE void -SWIG_Python_NullRef(const char *type) -{ - if (type) { - PyErr_Format(PyExc_TypeError, "null reference of type '%s' was received",type); - } else { - PyErr_Format(PyExc_TypeError, "null reference was received"); - } -} - -SWIGRUNTIME int -SWIG_Python_AddErrMesg(const char* mesg, int infront) -{ - if (PyErr_Occurred()) { - PyObject *type = 0; - PyObject *value = 0; - PyObject *traceback = 0; - PyErr_Fetch(&type, &value, &traceback); - if (value) { - PyObject *old_str = PyObject_Str(value); - Py_XINCREF(type); - PyErr_Clear(); - if (infront) { - PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str)); - } else { - PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); - } - Py_DECREF(old_str); - } - return 1; - } else { - return 0; - } -} - -SWIGRUNTIME int -SWIG_Python_ArgFail(int argnum) -{ - if (PyErr_Occurred()) { - /* add information about failing argument */ - char mesg[256]; - PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum); - return SWIG_Python_AddErrMesg(mesg, 1); - } else { - return 0; - } -} - - -/* ----------------------------------------------------------------------------- - * pointers/data manipulation - * ----------------------------------------------------------------------------- */ - /* Convert a pointer value */ -SWIGRUNTIME int +SWIGRUNTIME(int) SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) { - swig_cast_info *tc; - const char *c = 0; + swig_type_info *tc; + char *c = 0; static PyObject *SWIG_this = 0; int newref = 0; PyObject *pyobj = 0; - void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; return 0; } - #ifdef SWIG_COBJECT_TYPES - if (!(PySwigObject_Check(obj))) { + if (!(PyCObject_Check(obj))) { if (!SWIG_this) SWIG_this = PyString_FromString("this"); pyobj = obj; obj = PyObject_GetAttr(obj,SWIG_this); newref = 1; if (!obj) goto type_error; - if (!PySwigObject_Check(obj)) { + if (!PyCObject_Check(obj)) { Py_DECREF(obj); goto type_error; } } - vptr = PySwigObject_AsVoidPtr(obj); - c = (const char *) PySwigObject_GetDesc(obj); - if (newref) { Py_DECREF(obj); } - goto type_check; + *ptr = PyCObject_AsVoidPtr(obj); + c = (char *) PyCObject_GetDesc(obj); + if (newref) Py_DECREF(obj); + goto cobject; #else if (!(PyString_Check(obj))) { if (!SWIG_this) @@ -1204,78 +517,72 @@ } c = PyString_AsString(obj); /* Pointer values must start with leading underscore */ - c = SWIG_UnpackVoidPtr(c, &vptr, ty->name); + if (*c != '_') { + *ptr = (void *) 0; + if (strcmp(c,"NULL") == 0) { + if (newref) { Py_DECREF(obj); } + return 0; + } else { + if (newref) { Py_DECREF(obj); } + goto type_error; + } + } + c++; + c = SWIG_UnpackData(c,ptr,sizeof(void *)); if (newref) { Py_DECREF(obj); } - if (!c) goto type_error; #endif -type_check: +#ifdef SWIG_COBJECT_TYPES +cobject: +#endif + if (ty) { tc = SWIG_TypeCheck(c,ty); if (!tc) goto type_error; - *ptr = SWIG_TypeCast(tc,vptr); - } else { - *ptr = vptr; + *ptr = SWIG_TypeCast(tc,(void*) *ptr); } + if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) { - PyObject_SetAttrString(pyobj,(char*)"thisown",Py_False); + PyObject *zero = PyInt_FromLong(0); + PyObject_SetAttrString(pyobj,(char*)"thisown",zero); + Py_DECREF(zero); } return 0; type_error: - PyErr_Clear(); - if (pyobj && !obj) { - obj = pyobj; - if (PyCFunction_Check(obj)) { - /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); - c = doc ? strstr(doc, "swig_ptr: ") : 0; - if (c) { - c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; - if (!c) goto type_error; - goto type_check; - } - } - } if (flags & SWIG_POINTER_EXCEPTION) { - if (ty) { - SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); + if (ty && c) { + char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); + sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); + PyErr_SetString(PyExc_TypeError, temp); + free((char *) temp); } else { - SWIG_Python_TypeError("C/C++ pointer", obj); + PyErr_SetString(PyExc_TypeError,"Expected a pointer"); } } return -1; } /* Convert a pointer value, signal an exception on a type mismatch */ -SWIGRUNTIME void * +SWIGRUNTIME(void *) SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) { void *result; - if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { - PyErr_Clear(); - if (flags & SWIG_POINTER_EXCEPTION) { - SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); - SWIG_Python_ArgFail(argnum); - } - } + SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION); return result; } /* Convert a packed value value */ -SWIGRUNTIME int -SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty, int flags) { - swig_cast_info *tc; - const char *c = 0; +SWIGRUNTIME(int) +SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, int sz, swig_type_info *ty, int flags) { + swig_type_info *tc; + char *c = 0; -#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON) - c = PySwigPacked_UnpackData(obj, ptr, sz); -#else if ((!obj) || (!PyString_Check(obj))) goto type_error; c = PyString_AsString(obj); /* Pointer values must start with leading underscore */ - c = SWIG_UnpackDataName(c, ptr, sz, ty->name); -#endif - if (!c) goto type_error; + if (*c != '_') goto type_error; + c++; + c = SWIG_UnpackData(c,ptr,sz); if (ty) { tc = SWIG_TypeCheck(c,ty); if (!tc) goto type_error; @@ -1283,38 +590,38 @@ return 0; type_error: - PyErr_Clear(); - if (flags & SWIG_POINTER_EXCEPTION) { - if (ty) { - SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); + + if (flags) { + if (ty && c) { + char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); + sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); + PyErr_SetString(PyExc_TypeError, temp); + free((char *) temp); } else { - SWIG_Python_TypeError("C/C++ packed data", obj); + PyErr_SetString(PyExc_TypeError,"Expected a pointer"); } } return -1; -} +} -/* Create a new array object */ -SWIGRUNTIME PyObject * +/* Create a new pointer object */ +SWIGRUNTIME(PyObject *) SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int own) { - PyObject *robj = 0; - if (!type) { - if (!PyErr_Occurred()) { - PyErr_Format(PyExc_TypeError, "Swig: null type passed to NewPointerObj"); - } - return robj; - } + PyObject *robj; if (!ptr) { Py_INCREF(Py_None); return Py_None; } #ifdef SWIG_COBJECT_TYPES - robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)type->name); + robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) type->name, NULL); #else { - char result[SWIG_BUFFER_SIZE]; - robj = SWIG_PackVoidPtr(result, ptr, type->name, sizeof(result)) ? - PyString_FromString(result) : 0; + char result[1024]; + char *r = result; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + strcpy(r,type->name); + robj = PyString_FromString(result); } #endif if (!robj || (robj == Py_None)) return robj; @@ -1326,7 +633,9 @@ Py_DECREF(args); if (inst) { if (own) { - PyObject_SetAttrString(inst,(char*)"thisown",Py_True); + PyObject *n = PyInt_FromLong(1); + PyObject_SetAttrString(inst,(char*)"thisown",n); + Py_DECREF(n); } robj = inst; } @@ -1334,95 +643,55 @@ return robj; } -SWIGRUNTIME PyObject * -SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { - PyObject *robj = 0; - if (!ptr) { - Py_INCREF(Py_None); - return Py_None; - } -#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON) - robj = PySwigPacked_FromDataAndDesc((void *) ptr, sz, (char *)type->name); -#else - { - char result[SWIG_BUFFER_SIZE]; - robj = SWIG_PackDataName(result, ptr, sz, type->name, sizeof(result)) ? - PyString_FromString(result) : 0; - } -#endif - return robj; +SWIGRUNTIME(PyObject *) +SWIG_Python_NewPackedObj(void *ptr, int sz, swig_type_info *type) { + char result[1024]; + char *r = result; + if ((2*sz + 1 + strlen(type->name)) > 1000) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + strcpy(r,type->name); + return PyString_FromString(result); } -/* -----------------------------------------------------------------------------* - * Get type list - * -----------------------------------------------------------------------------*/ - -#ifdef SWIG_LINK_RUNTIME -void *SWIG_ReturnGlobalTypeList(void *); -#endif - -SWIGRUNTIME swig_module_info * -SWIG_Python_GetModule(void) { - static void *type_pointer = (void *)0; - /* first check if module already created */ - if (!type_pointer) { -#ifdef SWIG_LINK_RUNTIME - type_pointer = SWIG_ReturnGlobalTypeList((void *)0); -#else - type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); - if (PyErr_Occurred()) { - PyErr_Clear(); - type_pointer = (void *)0; +/* Install Constants */ +SWIGRUNTIME(void) +SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { + int i; + PyObject *obj; + for (i = 0; constants[i].type; i++) { + switch(constants[i].type) { + case SWIG_PY_INT: + obj = PyInt_FromLong(constants[i].lvalue); + break; + case SWIG_PY_FLOAT: + obj = PyFloat_FromDouble(constants[i].dvalue); + break; + case SWIG_PY_STRING: + obj = PyString_FromString((char *) constants[i].pvalue); + break; + case SWIG_PY_POINTER: + obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); + break; + case SWIG_PY_BINARY: + obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); + break; + default: + obj = 0; + break; } -#endif + if (obj) { + PyDict_SetItemString(d,constants[i].name,obj); + Py_DECREF(obj); + } } - return (swig_module_info *) type_pointer; } -#if PY_MAJOR_VERSION < 2 -/* PyModule_AddObject function was introduced in Python 2.0. The following function -is copied out of Python/modsupport.c in python version 2.3.4 */ -SWIGINTERN int -PyModule_AddObject(PyObject *m, char *name, PyObject *o) -{ - PyObject *dict; - if (!PyModule_Check(m)) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs module as first arg"); - return -1; - } - if (!o) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs non-NULL value"); - return -1; - } - - dict = PyModule_GetDict(m); - if (dict == NULL) { - /* Internal error -- modules must have a dict! */ - PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__", - PyModule_GetName(m)); - return -1; - } - if (PyDict_SetItemString(dict, name, o)) - return -1; - Py_DECREF(o); - return 0; -} #endif -SWIGRUNTIME void -SWIG_Python_SetModule(swig_module_info *swig_module) { - static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */ +/* Contract support */ - PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - swig_empty_runtime_method_table); - PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, NULL); - if (pointer && module) { - PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); - } -} +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } @@ -1431,20 +700,12 @@ /* -------- TYPES TABLE (BEGIN) -------- */ -#define SWIGTYPE_p_SessionContainer swig_types[0] -#define SWIGTYPE_p_char swig_types[1] -#define SWIGTYPE_p_switch_core_session swig_types[2] -#define SWIGTYPE_p_switch_input_type_t swig_types[3] -#define SWIGTYPE_p_switch_status_t swig_types[4] -#define SWIGTYPE_p_void swig_types[5] -#define SWIGTYPE_ptrdiff_t swig_types[6] -#define SWIGTYPE_size_t swig_types[7] -#define SWIGTYPE_std__ptrdiff_t swig_types[8] -#define SWIGTYPE_std__size_t swig_types[9] -static swig_type_info *swig_types[11]; -static swig_module_info swig_module = {swig_types, 10, 0, 0, 0, 0}; -#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) -#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) +#define SWIGTYPE_p_switch_status_t swig_types[0] +#define SWIGTYPE_p_switch_input_type_t swig_types[1] +#define SWIGTYPE_p_void swig_types[2] +#define SWIGTYPE_p_switch_core_session swig_types[3] +#define SWIGTYPE_p_SessionContainer swig_types[4] +static swig_type_info *swig_types[6]; /* -------- TYPES TABLE (END) -------- */ @@ -1458,292 +719,37 @@ #include "freeswitch_python.h" +extern void *globalDTMFCallbackFunction; +extern switch_status_t PythonDTMFCallback(switch_core_session *,void *,switch_input_type_t,void *,unsigned int); -#include <limits.h> +static PyObject* t_output_helper(PyObject* target, PyObject* o) { + PyObject* o2; + PyObject* o3; + if (!target) { + target = o; + } else if (target == Py_None) { + Py_DECREF(Py_None); + target = o; + } else { + if (!PyTuple_Check(target)) { + o2 = target; + target = PyTuple_New(1); + PyTuple_SetItem(target, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); -SWIGINTERNINLINE int - SWIG_CheckUnsignedLongInRange(unsigned long value, - unsigned long max_value, - const char *errmsg) -{ - if (value > max_value) { - if (errmsg) { - PyErr_Format(PyExc_OverflowError, - "value %lu is greater than '%s' minimum %lu", - value, errmsg, max_value); + o2 = target; + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); } - return 0; - } - return 1; - } - - -SWIGINTERN int - SWIG_AsVal_unsigned_SS_long(PyObject *obj, unsigned long *val) -{ - if (PyLong_Check(obj)) { - unsigned long v = PyLong_AsUnsignedLong(obj); - if (!PyErr_Occurred()) { - if (val) *val = v; - return 1; - } else { - if (!val) PyErr_Clear(); - return 0; - } - } - if (PyInt_Check(obj)) { - long v = PyInt_AsLong(obj); - if (v >= 0) { - if (val) *val = v; - return 1; - } - } - if (val) { - SWIG_type_error("unsigned long", obj); - } - return 0; + return target; } -#if UINT_MAX != ULONG_MAX -SWIGINTERN int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - const char* errmsg = val ? "unsigned int" : (char*)0; - unsigned long v; - if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { - if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { - if (val) *val = static_cast<unsigned int >(v); - return 1; - } - } else { - PyErr_Clear(); - } - if (val) { - SWIG_type_error(errmsg, obj); - } - return 0; -} -#else -SWIGINTERNINLINE unsigned int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); -} -#endif - -SWIGINTERNINLINE unsigned int -SWIG_As_unsigned_SS_int(PyObject* obj) -{ - unsigned int v; - if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { - /* - this is needed to make valgrind/purify happier. - */ - memset((void*)&v, 0, sizeof(unsigned int)); - } - return v; -} - - -SWIGINTERNINLINE int -SWIG_Check_unsigned_SS_int(PyObject* obj) -{ - return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); -} - - -/* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */ -SWIGINTERN int -SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize) -{ - static swig_type_info* pchar_info = 0; - char* vptr = 0; - if (!pchar_info) pchar_info = SWIG_TypeQuery("char *"); - if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_info, 0) != -1) { - if (cptr) *cptr = vptr; - if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0; - return SWIG_OLDOBJ; - } else { - PyErr_Clear(); - if (PyString_Check(obj)) { - if (cptr) { - *cptr = PyString_AS_STRING(obj); - if (psize) { - *psize = PyString_GET_SIZE(obj) + 1; - } - } - return SWIG_PYSTR; - } - } - if (cptr) { - SWIG_type_error("char *", obj); - } - return 0; -} - - -SWIGINTERNINLINE int -SWIG_AsCharPtr(PyObject *obj, char **val) -{ - if (SWIG_AsCharPtrAndSize(obj, val, (size_t*)(0))) { - return 1; - } - if (val) { - PyErr_Clear(); - SWIG_type_error("char *", obj); - } - return 0; -} - - - /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_int PyInt_FromLong -/*@@*/ - - -SWIGINTERN int - SWIG_CheckLongInRange(long value, long min_value, long max_value, - const char *errmsg) -{ - if (value < min_value) { - if (errmsg) { - PyErr_Format(PyExc_OverflowError, - "value %ld is less than '%s' minimum %ld", - value, errmsg, min_value); - } - return 0; - } else if (value > max_value) { - if (errmsg) { - PyErr_Format(PyExc_OverflowError, - "value %ld is greater than '%s' maximum %ld", - value, errmsg, max_value); - } - return 0; - } - return 1; -} - - -SWIGINTERN int - SWIG_AsVal_long(PyObject * obj, long* val) -{ - if (PyLong_Check(obj)) { - long v = PyLong_AsLong(obj); - if (!PyErr_Occurred()) { - if (val) *val = v; - return 1; - } else { - if (!val) PyErr_Clear(); - return 0; - } - } - if (PyInt_Check(obj)) { - if (val) *val = PyInt_AsLong(obj); - return 1; - } - if (val) { - SWIG_type_error("long", obj); - } - return 0; - } - - -#if INT_MAX != LONG_MAX -SWIGINTERN int - SWIG_AsVal_int(PyObject *obj, int *val) -{ - const char* errmsg = val ? "int" : (char*)0; - long v; - if (SWIG_AsVal_long(obj, &v)) { - if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) { - if (val) *val = static_cast<int >(v); - return 1; - } else { - return 0; - } - } else { - PyErr_Clear(); - } - if (val) { - SWIG_type_error(errmsg, obj); - } - return 0; -} -#else -SWIGINTERNINLINE int - SWIG_AsVal_int(PyObject *obj, int *val) -{ - return SWIG_AsVal_long(obj,(long*)val); -} -#endif - - -SWIGINTERNINLINE int -SWIG_As_int(PyObject* obj) -{ - int v; - if (!SWIG_AsVal_int(obj, &v)) { - /* - this is needed to make valgrind/purify happier. - */ - memset((void*)&v, 0, sizeof(int)); - } - return v; -} - - -SWIGINTERNINLINE int -SWIG_Check_int(PyObject* obj) -{ - return SWIG_AsVal_int(obj, (int*)0); -} - - -SWIGINTERN PyObject* -t_output_helper(PyObject* target, PyObject* o) { - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(target); - target = o; - } else { - if (!PyList_Check(target)) { - PyObject *o2 = target; - target = PyList_New(1); - PyList_SetItem(target, 0, o2); - } - PyList_Append(target,o); - Py_DECREF(o); - } - return target; -} - - -SWIGINTERN PyObject * -SWIG_FromCharPtr(const char* cptr) -{ - if (cptr) { - size_t size = strlen(cptr); - if (size > INT_MAX) { - return SWIG_NewPointerObj(const_cast<char* >(cptr), - SWIG_TypeQuery("char *"), 0); - } else { - if (size != 0) { - return PyString_FromStringAndSize(cptr, size); - } else { - return PyString_FromString(cptr); - } - } - } - Py_INCREF(Py_None); - return Py_None; -} - - - switch_status_t PythonDTMFCallback(switch_core_session_t *session, void *input, switch_input_type_t itype, @@ -1772,9 +778,8 @@ static int _wrap_globalDTMFCallbackFunction_set(PyObject *_val) { { void * temp; - if ((SWIG_ConvertPtr(_val, static_cast<void ** >(&temp), 0, - SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) { - SWIG_append_errmsg("C/C++ variable 'globalDTMFCallbackFunction'"); + if ((SWIG_ConvertPtr(_val,(void **) &temp, 0, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) { + PyErr_SetString(PyExc_TypeError, "C variable 'globalDTMFCallbackFunction (void *)'"); return 1; } globalDTMFCallbackFunction = (void *) temp; @@ -1783,22 +788,23 @@ } -static PyObject *_wrap_globalDTMFCallbackFunction_get(void) { - PyObject *pyobj = NULL; +static PyObject *_wrap_globalDTMFCallbackFunction_get() { + PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *)(globalDTMFCallbackFunction), SWIGTYPE_p_void, 0); + pyobj = SWIG_NewPointerObj((void *) globalDTMFCallbackFunction, SWIGTYPE_p_void, 0); return pyobj; } -static PyObject *_wrap_PythonDTMFCallback(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_PythonDTMFCallback(PyObject *self, PyObject *args) { + PyObject *resultobj; switch_core_session *arg1 = (switch_core_session *) 0 ; void *arg2 = (void *) 0 ; switch_input_type_t arg3 ; void *arg4 = (void *) 0 ; unsigned int arg5 ; switch_status_t result; + switch_input_type_t *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -1806,38 +812,19 @@ PyObject * obj4 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOOOO:PythonDTMFCallback",&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - if ((SWIG_ConvertPtr(obj1,reinterpret_cast<void ** >(&arg2),0,SWIG_POINTER_EXCEPTION|0))== -1) { - SWIG_arg_fail(2);SWIG_fail; - } - } - { - switch_input_type_t * argp; - SWIG_Python_ConvertPtr(obj2, (void **)&argp, SWIGTYPE_p_switch_input_type_t, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(3)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("switch_input_type_t"); - } - if (SWIG_arg_fail(3)) SWIG_fail; - arg3 = *argp; - } - { - if ((SWIG_ConvertPtr(obj3,reinterpret_cast<void ** >(&arg4),0,SWIG_POINTER_EXCEPTION|0))== -1) { - SWIG_arg_fail(4);SWIG_fail; - } - } - { - arg5 = static_cast<unsigned int >(SWIG_As_unsigned_SS_int(obj4)); - if (SWIG_arg_fail(5)) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_switch_input_type_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg3 = *argp3; + if ((SWIG_ConvertPtr(obj3,(void **) &arg4, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg5 = (unsigned int) PyInt_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; result = PythonDTMFCallback(arg1,arg2,arg3,arg4,arg5); { switch_status_t * resultptr; - resultptr = new switch_status_t(static_cast<switch_status_t & >(result)); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_switch_status_t, 1); + resultptr = new switch_status_t((switch_status_t &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_switch_status_t, 1); } return resultobj; fail: @@ -1845,33 +832,28 @@ } -static PyObject *_wrap_new_SessionContainer(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - char *arg1 = (char *) 0 ; +static PyObject *_wrap_new_SessionContainer(PyObject *self, PyObject *args) { + PyObject *resultobj; + char *arg1 ; SessionContainer *result; - PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:new_SessionContainer",&obj0)) goto fail; - if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) { - SWIG_arg_fail(1);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"s:new_SessionContainer",&arg1)) goto fail; result = (SessionContainer *)new SessionContainer(arg1); - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_SessionContainer, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_SessionContainer, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_SessionContainer(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_delete_SessionContainer(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:delete_SessionContainer",&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; delete arg1; Py_INCREF(Py_None); resultobj = Py_None; @@ -1881,24 +863,15 @@ } -static PyObject *_wrap_SessionContainer_console_log(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_console_log(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; + char *arg2 ; + char *arg3 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:SessionContainer_console_log",&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { - SWIG_arg_fail(3);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_console_log",&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->console_log(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; @@ -1908,19 +881,14 @@ } -static PyObject *_wrap_SessionContainer_console_clean_log(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_console_clean_log(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; + char *arg2 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:SessionContainer_console_clean_log",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_console_clean_log",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->console_clean_log(arg2); Py_INCREF(Py_None); resultobj = Py_None; @@ -1930,59 +898,48 @@ } -static PyObject *_wrap_SessionContainer_answer(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_answer(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; int result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:SessionContainer_answer",&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int)(arg1)->answer(); - { - resultobj = SWIG_From_int(static_cast<int >(result)); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_SessionContainer_pre_answer(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_pre_answer(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; int result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:SessionContainer_pre_answer",&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int)(arg1)->pre_answer(); - { - resultobj = SWIG_From_int(static_cast<int >(result)); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_SessionContainer_hangup(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_hangup(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; + char *arg2 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:SessionContainer_hangup",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_hangup",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->hangup(arg2); Py_INCREF(Py_None); resultobj = Py_None; @@ -1992,24 +949,15 @@ } -static PyObject *_wrap_SessionContainer_set_variable(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_set_variable(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; + char *arg2 ; + char *arg3 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:SessionContainer_set_variable",&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { - SWIG_arg_fail(3);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_set_variable",&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->set_variable(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; @@ -2019,24 +967,15 @@ } -static PyObject *_wrap_SessionContainer_get_variable(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_get_variable(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; + char *arg2 ; + char *arg3 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:SessionContainer_get_variable",&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { - SWIG_arg_fail(3);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_get_variable",&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->get_variable(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; @@ -2046,19 +985,14 @@ } -static PyObject *_wrap_SessionContainer_set_state(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_set_state(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; + char *arg2 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:SessionContainer_set_state",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_set_state",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->set_state(arg2); Py_INCREF(Py_None); resultobj = Py_None; @@ -2068,46 +1002,34 @@ } -static PyObject *_wrap_SessionContainer_play_file(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_play_file(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; + char *arg2 ; + char *arg3 ; int result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:SessionContainer_play_file",&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { - SWIG_arg_fail(3);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_play_file",&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int)(arg1)->play_file(arg2,arg3); - { - resultobj = SWIG_From_int(static_cast<int >(result)); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_SessionContainer_set_dtmf_callback(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_set_dtmf_callback(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:SessionContainer_set_dtmf_callback",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; (arg1)->set_dtmf_callback(arg2); @@ -2118,49 +1040,33 @@ } -static PyObject *_wrap_SessionContainer_speak_text(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_speak_text(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; + char *arg2 ; int result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:SessionContainer_speak_text",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_speak_text",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int)(arg1)->speak_text(arg2); - { - resultobj = SWIG_From_int(static_cast<int >(result)); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_SessionContainer_set_tts_parms(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_set_tts_parms(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; + char *arg2 ; + char *arg3 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:SessionContainer_set_tts_parms",&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { - SWIG_arg_fail(3);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_set_tts_parms",&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; (arg1)->set_tts_parms(arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; @@ -2170,182 +1076,117 @@ } -static PyObject *_wrap_SessionContainer_get_digits(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_get_digits(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; + char *arg2 ; int arg3 ; - char *arg4 = (char *) 0 ; - char *arg5 = (char *) 0 ; + char *arg4 ; + char *arg5 ; int arg6 ; int result; char temp2[128+1] ; char temp5[8+1] ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOOOO:SessionContainer_get_digits",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOisOi:SessionContainer_get_digits",&obj0,&obj1,&arg3,&arg4,&obj4,&arg6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - char *t = 0; size_t n; - SWIG_AsCharPtrAndSize(obj1, &t, &n); - if (SWIG_arg_fail(2)) SWIG_fail; - if ( n > (size_t)128 ) n = (size_t)128; - memcpy(temp2, t, sizeof(char)*n); - temp2[n] = 0; - arg2 = (char *) temp2; + char *t = PyString_AsString(obj1); + if (PyErr_Occurred()) SWIG_fail; + strncpy(temp2,t,128); + arg2 = (char *) temp2; } { - arg3 = static_cast<int >(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + char *t = PyString_AsString(obj4); + if (PyErr_Occurred()) SWIG_fail; + strncpy(temp5,t,8); + arg5 = (char *) temp5; } - if (!SWIG_AsCharPtr(obj3, (char**)&arg4)) { - SWIG_arg_fail(4);SWIG_fail; - } - { - char *t = 0; size_t n; - SWIG_AsCharPtrAndSize(obj4, &t, &n); - if (SWIG_arg_fail(5)) SWIG_fail; - if ( n > (size_t)8 ) n = (size_t)8; - memcpy(temp5, t, sizeof(char)*n); - temp5[n] = 0; - arg5 = (char *) temp5; - } - { - arg6 = static_cast<int >(SWIG_As_int(obj5)); - if (SWIG_arg_fail(6)) SWIG_fail; - } result = (int)(arg1)->get_digits(arg2,arg3,arg4,arg5,arg6); + resultobj = PyInt_FromLong((long)result); { - resultobj = SWIG_From_int(static_cast<int >(result)); + PyObject *o; + arg2[128] = 0; + o = PyString_FromString(arg2); + resultobj = t_output_helper(resultobj,o); } - arg2[128] = 0; resultobj = t_output_helper(resultobj, SWIG_FromCharPtr(arg2)); - arg5[8] = 0; resultobj = t_output_helper(resultobj, SWIG_FromCharPtr(arg5)); + { + PyObject *o; + arg5[8] = 0; + o = PyString_FromString(arg5); + resultobj = t_output_helper(resultobj,o); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_SessionContainer_transfer(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_transfer(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - char *arg4 = (char *) 0 ; + char *arg2 ; + char *arg3 ; + char *arg4 ; int result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOO:SessionContainer_transfer",&obj0,&obj1,&obj2,&obj3)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { - SWIG_arg_fail(2);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { - SWIG_arg_fail(3);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj3, (char**)&arg4)) { - SWIG_arg_fail(4);SWIG_fail; - } + if(!PyArg_ParseTuple(args,(char *)"Osss:SessionContainer_transfer",&obj0,&arg2,&arg3,&arg4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int)(arg1)->transfer(arg2,arg3,arg4); - { - resultobj = SWIG_From_int(static_cast<int >(result)); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_SessionContainer_play_and_get_digits(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; +static PyObject *_wrap_SessionContainer_play_and_get_digits(PyObject *self, PyObject *args) { + PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; int arg2 ; int arg3 ; int arg4 ; int arg5 ; - char *arg6 = (char *) 0 ; - char *arg7 = (char *) 0 ; - char *arg8 = (char *) 0 ; - char *arg9 = (char *) 0 ; - char *arg10 = (char *) 0 ; + char *arg6 ; + char *arg7 ; + char *arg8 ; + char *arg9 ; + char *arg10 ; int result; char temp9[128+1] ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; - PyObject * obj9 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:SessionContainer_play_and_get_digits",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_SessionContainer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OiiiisssOs:SessionContainer_play_and_get_digits",&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&arg10)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = static_cast<int >(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; + char *t = PyString_AsString(obj8); + if (PyErr_Occurred()) SWIG_fail; + strncpy(temp9,t,128); + arg9 = (char *) temp9; } - { - arg3 = static_cast<int >(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; - } - { - arg4 = static_cast<int >(SWIG_As_int(obj3)); - if (SWIG_arg_fail(4)) SWIG_fail; - } - { - arg5 = static_cast<int >(SWIG_As_int(obj4)); - if (SWIG_arg_fail(5)) SWIG_fail; - } - if (!SWIG_AsCharPtr(obj5, (char**)&arg6)) { - SWIG_arg_fail(6);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj6, (char**)&arg7)) { - SWIG_arg_fail(7);SWIG_fail; - } - if (!SWIG_AsCharPtr(obj7, (char**)&arg8)) { - SWIG_arg_fail(8);SWIG_fail; - } - { - char *t = 0; size_t n; - SWIG_AsCharPtrAndSize(obj8, &t, &n); - if (SWIG_arg_fail(9)) SWIG_fail; - if ( n > (size_t)128 ) n = (size_t)128; - memcpy(temp9, t, sizeof(char)*n); - temp9[n] = 0; - arg9 = (char *) temp9; - } - if (!SWIG_AsCharPtr(obj9, (char**)&arg10)) { - SWIG_arg_fail(10);SWIG_fail; - } result = (int)(arg1)->play_and_get_digits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); + resultobj = PyInt_FromLong((long)result); { - resultobj = SWIG_From_int(static_cast<int >(result)); + PyObject *o; + arg9[128] = 0; + o = PyString_FromString(arg9); + resultobj = t_output_helper(resultobj,o); } - arg9[128] = 0; resultobj = t_output_helper(resultobj, SWIG_FromCharPtr(arg9)); return resultobj; fail: return NULL; } -static PyObject * SessionContainer_swigregister(PyObject *, PyObject *args) { +static PyObject * SessionContainer_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; SWIG_TypeClientData(SWIGTYPE_p_SessionContainer, obj); @@ -2353,511 +1194,74 @@ return Py_BuildValue((char *)""); } static PyMethodDef SwigMethods[] = { - { (char *)"PythonDTMFCallback", _wrap_PythonDTMFCallback, METH_VARARGS, NULL}, - { (char *)"new_SessionContainer", _wrap_new_SessionContainer, METH_VARARGS, NULL}, - { (char *)"delete_SessionContainer", _wrap_delete_SessionContainer, METH_VARARGS, NULL}, - { (char *)"SessionContainer_console_log", _wrap_SessionContainer_console_log, METH_VARARGS, NULL}, - { (char *)"SessionContainer_console_clean_log", _wrap_SessionContainer_console_clean_log, METH_VARARGS, NULL}, - { (char *)"SessionContainer_answer", _wrap_SessionContainer_answer, METH_VARARGS, NULL}, - { (char *)"SessionContainer_pre_answer", _wrap_SessionContainer_pre_answer, METH_VARARGS, NULL}, - { (char *)"SessionContainer_hangup", _wrap_SessionContainer_hangup, METH_VARARGS, NULL}, - { (char *)"SessionContainer_set_variable", _wrap_SessionContainer_set_variable, METH_VARARGS, NULL}, - { (char *)"SessionContainer_get_variable", _wrap_SessionContainer_get_variable, METH_VARARGS, NULL}, - { (char *)"SessionContainer_set_state", _wrap_SessionContainer_set_state, METH_VARARGS, NULL}, - { (char *)"SessionContainer_play_file", _wrap_SessionContainer_play_file, METH_VARARGS, NULL}, - { (char *)"SessionContainer_set_dtmf_callback", _wrap_SessionContainer_set_dtmf_callback, METH_VARARGS, NULL}, - { (char *)"SessionContainer_speak_text", _wrap_SessionContainer_speak_text, METH_VARARGS, NULL}, - { (char *)"SessionContainer_set_tts_parms", _wrap_SessionContainer_set_tts_parms, METH_VARARGS, NULL}, - { (char *)"SessionContainer_get_digits", _wrap_SessionContainer_get_digits, METH_VARARGS, NULL}, - { (char *)"SessionContainer_transfer", _wrap_SessionContainer_transfer, METH_VARARGS, NULL}, - { (char *)"SessionContainer_play_and_get_digits", _wrap_SessionContainer_play_and_get_digits, METH_VARARGS, NULL}, - { (char *)"SessionContainer_swigregister", SessionContainer_swigregister, METH_VARARGS, NULL}, - { NULL, NULL, 0, NULL } + { (char *)"PythonDTMFCallback", _wrap_PythonDTMFCallback, METH_VARARGS }, + { (char *)"new_SessionContainer", _wrap_new_SessionContainer, METH_VARARGS }, + { (char *)"delete_SessionContainer", _wrap_delete_SessionContainer, METH_VARARGS }, + { (char *)"SessionContainer_console_log", _wrap_SessionContainer_console_log, METH_VARARGS }, + { (char *)"SessionContainer_console_clean_log", _wrap_SessionContainer_console_clean_log, METH_VARARGS }, + { (char *)"SessionContainer_answer", _wrap_SessionContainer_answer, METH_VARARGS }, + { (char *)"SessionContainer_pre_answer", _wrap_SessionContainer_pre_answer, METH_VARARGS }, + { (char *)"SessionContainer_hangup", _wrap_SessionContainer_hangup, METH_VARARGS }, + { (char *)"SessionContainer_set_variable", _wrap_SessionContainer_set_variable, METH_VARARGS }, + { (char *)"SessionContainer_get_variable", _wrap_SessionContainer_get_variable, METH_VARARGS }, + { (char *)"SessionContainer_set_state", _wrap_SessionContainer_set_state, METH_VARARGS }, + { (char *)"SessionContainer_play_file", _wrap_SessionContainer_play_file, METH_VARARGS }, + { (char *)"SessionContainer_set_dtmf_callback", _wrap_SessionContainer_set_dtmf_callback, METH_VARARGS }, + { (char *)"SessionContainer_speak_text", _wrap_SessionContainer_speak_text, METH_VARARGS }, + { (char *)"SessionContainer_set_tts_parms", _wrap_SessionContainer_set_tts_parms, METH_VARARGS }, + { (char *)"SessionContainer_get_digits", _wrap_SessionContainer_get_digits, METH_VARARGS }, + { (char *)"SessionContainer_transfer", _wrap_SessionContainer_transfer, METH_VARARGS }, + { (char *)"SessionContainer_play_and_get_digits", _wrap_SessionContainer_play_and_get_digits, METH_VARARGS }, + { (char *)"SessionContainer_swigregister", SessionContainer_swigregister, METH_VARARGS }, + { NULL, NULL } }; /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static swig_type_info _swigt__p_SessionContainer = {"_p_SessionContainer", "SessionContainer *", 0, 0, 0}; -static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, 0}; -static swig_type_info _swigt__p_switch_core_session = {"_p_switch_core_session", "switch_core_session *", 0, 0, 0}; -static swig_type_info _swigt__p_switch_input_type_t = {"_p_switch_input_type_t", "switch_input_type_t *", 0, 0, 0}; -static swig_type_info _swigt__p_switch_status_t = {"_p_switch_status_t", "switch_status_t *", 0, 0, 0}; -static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, 0}; -static swig_type_info _swigt__ptrdiff_t = {"_ptrdiff_t", "ptrdiff_t", 0, 0, 0}; -static swig_type_info _swigt__size_t = {"_size_t", "size_t", 0, 0, 0}; -static swig_type_info _swigt__std__ptrdiff_t = {"_std__ptrdiff_t", "std::ptrdiff_t", 0, 0, 0}; -static swig_type_info _swigt__std__size_t = {"_std__size_t", "std::size_t", 0, 0, 0}; +static swig_type_info _swigt__p_switch_status_t[] = {{"_p_switch_status_t", 0, "switch_status_t *", 0},{"_p_switch_status_t"},{0}}; +static swig_type_info _swigt__p_switch_input_type_t[] = {{"_p_switch_input_type_t", 0, "switch_input_type_t *", 0},{"_p_switch_input_type_t"},{0}}; +static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; +static swig_type_info _swigt__p_switch_core_session[] = {{"_p_switch_core_session", 0, "switch_core_session *", 0},{"_p_switch_core_session"},{0}}; +static swig_type_info _swigt__p_SessionContainer[] = {{"_p_SessionContainer", 0, "SessionContainer *", 0},{"_p_SessionContainer"},{0}}; -static swig_type_info *swig_type_initial[] = { - &_swigt__p_SessionContainer, - &_swigt__p_char, - &_swigt__p_switch_core_session, - &_swigt__p_switch_input_type_t, - &_swigt__p_switch_status_t, - &_swigt__p_void, - &_swigt__ptrdiff_t, - &_swigt__size_t, - &_swigt__std__ptrdiff_t, - &_swigt__std__size_t, +static swig_type_info *swig_types_initial[] = { +_swigt__p_switch_status_t, +_swigt__p_switch_input_type_t, +_swigt__p_void, +_swigt__p_switch_core_session, +_swigt__p_SessionContainer, +0 }; -static swig_cast_info _swigc__p_SessionContainer[] = { {&_swigt__p_SessionContainer, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_switch_core_session[] = { {&_swigt__p_switch_core_session, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_switch_input_type_t[] = { {&_swigt__p_switch_input_type_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_switch_status_t[] = { {&_swigt__p_switch_status_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_void[] = { {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__size_t[] = { {&_swigt__size_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__std__size_t[] = { {&_swigt__std__size_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info *swig_cast_initial[] = { - _swigc__p_SessionContainer, - _swigc__p_char, - _swigc__p_switch_core_session, - _swigc__p_switch_input_type_t, - _swigc__p_switch_status_t, - _swigc__p_void, - _swigc__ptrdiff_t, - _swigc__size_t, - _swigc__std__ptrdiff_t, - _swigc__std__size_t, -}; - - /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{0, 0, 0, 0.0, 0, 0}}; +{0}}; #ifdef __cplusplus } #endif -/************************************************************************* - * Type initialization: - * This problem is tough by the requirement that no dynamic - * memory is used. Also, since swig_type_info structures store pointers to - * swig_cast_info structures and swig_cast_info structures store pointers back - * to swig_type_info structures, we need some lookup code at initialization. - * The idea is that swig generates all the structures that are needed. - * The runtime then collects these partially filled structures. - * The SWIG_InitializeModule function takes these initial arrays out of - * swig_module, and does all the lookup, filling in the swig_module.types - * array with the correct data and linking the correct swig_cast_info - * structures together. - * The generated swig_type_info structures are assigned staticly to an initial - * array. We just loop though that array, and handle each type individually. - * First we lookup if this type has been already loaded, and if so, use the - * loaded structure instead of the generated one. Then we have to fill in the - * cast linked list. The cast data is initially stored in something like a - * two-dimensional array. Each row corresponds to a type (there are the same - * number of rows as there are in the swig_type_initial array). Each entry in - * a column is one of the swig_cast_info structures for that type. - * The cast_initial array is actually an array of arrays, because each row has - * a variable number of columns. So to actually build the cast linked list, - * we find the array of casts associated with the type, and loop through it - * adding the casts to the list. The one last trick we need to do is making - * sure the type pointer in the swig_cast_info struct is correct. - - * First off, we lookup the cast->type name to see if it is already loaded. - * There are three cases to handle: - * 1) If the cast->type has already been loaded AND the type we are adding - * casting info to has not been loaded (it is in this module), THEN we - * replace the cast->type pointer with the type pointer that has already - * been loaded. - * 2) If BOTH types (the one we are adding casting info to, and the - * cast->type) are loaded, THEN the cast info has already been loaded by - * the previous module so we just ignore it. - * 3) Finally, if cast->type has not already been loaded, then we add that - * swig_cast_info to the linked list (because the cast->type) pointer will - * be correct. -**/ - #ifdef __cplusplus -extern "C" { -#endif - - SWIGRUNTIME void - SWIG_InitializeModule(void *clientdata) { - swig_type_info *type, *ret; - swig_cast_info *cast; - size_t i; - swig_module_info *module_head; - static int init_run = 0; - - clientdata = clientdata; - - if (init_run) return; - init_run = 1; - - /* Initialize the swig_module */ - swig_module.type_initial = swig_type_initial; - swig_module.cast_initial = swig_cast_initial; - - /* Try and load any already created modules */ - module_head = SWIG_GetModule(clientdata); - if (module_head) { - swig_module.next = module_head->next; - module_head->next = &swig_module; - } else { - /* This is the first module loaded */ - swig_module.next = &swig_module; - SWIG_SetModule(clientdata, &swig_module); - } - - /* Now work on filling in swig_module.types */ - for (i = 0; i < swig_module.size; ++i) { - type = 0; - - /* if there is another module already loaded */ - if (swig_module.next != &swig_module) { - type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); - } - if (type) { - /* Overwrite clientdata field */ - if (swig_module.type_initial[i]->clientdata) type->clientdata = swig_module.type_initial[i]->clientdata; - } else { - type = swig_module.type_initial[i]; - } - - /* Insert casting types */ - cast = swig_module.cast_initial[i]; - while (cast->type) { - /* Don't need to add information already in the list */ - ret = 0; - if (swig_module.next != &swig_module) { - ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); - } - if (ret && type == swig_module.type_initial[i]) { - cast->type = ret; - ret = 0; - } - - if (!ret) { - if (type->cast) { - type->cast->prev = cast; - cast->next = type->cast; - } - type->cast = cast; - } - - cast++; - } - - /* Set entry in modules->types array equal to the type */ - swig_module.types[i] = type; - } - swig_module.types[i] = 0; - } - - /* This function will propagate the clientdata field of type to - * any new swig_type_info structures that have been added into the list - * of equivalent types. It is like calling - * SWIG_TypeClientData(type, clientdata) a second time. - */ - SWIGRUNTIME void - SWIG_PropagateClientData(void) { - size_t i; - swig_cast_info *equiv; - static int init_run = 0; - - if (init_run) return; - init_run = 1; - - for (i = 0; i < swig_module.size; i++) { - if (swig_module.types[i]->clientdata) { - equiv = swig_module.types[i]->cast; - while (equiv) { - if (!equiv->converter) { - if (equiv->type && !equiv->type->clientdata) - SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); - } - equiv = equiv->next; - } - } - } - } - -#ifdef __cplusplus -} -#endif - - - -#ifdef __cplusplus -extern "C" { -#endif - - /* Python-specific SWIG API */ -#define SWIG_newvarlink() SWIG_Python_newvarlink() -#define SWIG_addvarlink(p, name, get_attr, set_attr) SWIG_Python_addvarlink(p, name, get_attr, set_attr) -#define SWIG_InstallConstants(d, constants) SWIG_Python_InstallConstants(d, constants) - - /* ----------------------------------------------------------------------------- - * global variable support code. - * ----------------------------------------------------------------------------- */ - - typedef struct swig_globalvar { - char *name; /* Name of global variable */ - PyObject *(*get_attr)(void); /* Return the current value */ - int (*set_attr)(PyObject *); /* Set the value */ - struct swig_globalvar *next; - } swig_globalvar; - - typedef struct swig_varlinkobject { - PyObject_HEAD - swig_globalvar *vars; - } swig_varlinkobject; - - SWIGINTERN PyObject * - swig_varlink_repr(swig_varlinkobject *v) { - v = v; - return PyString_FromString("<Swig global variables>"); - } - - SWIGINTERN int - swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) { - swig_globalvar *var; - flags = flags; - fprintf(fp,"Swig global variables { "); - for (var = v->vars; var; var=var->next) { - fprintf(fp,"%s", var->name); - if (var->next) fprintf(fp,", "); - } - fprintf(fp," }\n"); - return 0; - } - - SWIGINTERN PyObject * - swig_varlink_getattr(swig_varlinkobject *v, char *n) { - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - return (*var->get_attr)(); - } - var = var->next; - } - PyErr_SetString(PyExc_NameError,"Unknown C global variable"); - return NULL; - } - - SWIGINTERN int - swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - return (*var->set_attr)(p); - } - var = var->next; - } - PyErr_SetString(PyExc_NameError,"Unknown C global variable"); - return 1; - } - - SWIGINTERN PyTypeObject* - swig_varlink_type(void) { - static char varlink__doc__[] = "Swig var link object"; - static PyTypeObject varlink_type -#if !defined(__cplusplus) - ; - static int type_init = 0; - if (!type_init) { - PyTypeObject tmp -#endif - = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* Number of items in variable part (ob_size) */ - (char *)"swigvarlink", /* Type name (tp_name) */ - sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */ - 0, /* Itemsize (tp_itemsize) */ - 0, /* Deallocator (tp_dealloc) */ - (printfunc) swig_varlink_print, /* Print (tp_print) */ - (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */ - (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */ - 0, /* tp_compare */ - (reprfunc) swig_varlink_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - 0, /* tp_flags */ - varlink__doc__, /* tp_doc */ -#if PY_VERSION_HEX >= 0x02000000 - 0, /* tp_traverse */ - 0, /* tp_clear */ -#endif -#if PY_VERSION_HEX >= 0x02010000 - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ -#endif -#if PY_VERSION_HEX >= 0x02020000 - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ -#endif -#if PY_VERSION_HEX >= 0x02030000 - 0, /* tp_del */ -#endif -#ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ -#endif - }; -#if !defined(__cplusplus) - varlink_type = tmp; - type_init = 1; - } -#endif - return &varlink_type; - } - - /* Create a variable linking object for use later */ - SWIGINTERN PyObject * - SWIG_Python_newvarlink(void) { - swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type()); - if (result) { - result->vars = 0; - } - return ((PyObject*) result); - } - - SWIGINTERN void - SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { - swig_varlinkobject *v = (swig_varlinkobject *) p; - swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); - if (gv) { - size_t size = strlen(name)+1; - gv->name = (char *)malloc(size); - if (gv->name) { - strncpy(gv->name,name,size); - gv->get_attr = get_attr; - gv->set_attr = set_attr; - gv->next = v->vars; - } - } - v->vars = gv; - } - - /* ----------------------------------------------------------------------------- - * constants/methods manipulation - * ----------------------------------------------------------------------------- */ - - /* Install Constants */ - SWIGINTERN void - SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { - PyObject *obj = 0; - size_t i; - for (i = 0; constants[i].type; ++i) { - switch(constants[i].type) { - case SWIG_PY_INT: - obj = PyInt_FromLong(constants[i].lvalue); - break; - case SWIG_PY_FLOAT: - obj = PyFloat_FromDouble(constants[i].dvalue); - break; - case SWIG_PY_STRING: - if (constants[i].pvalue) { - obj = PyString_FromString((char *) constants[i].pvalue); - } else { - Py_INCREF(Py_None); - obj = Py_None; - } - break; - case SWIG_PY_POINTER: - obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); - break; - case SWIG_PY_BINARY: - obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); - break; - default: - obj = 0; - break; - } - if (obj) { - PyDict_SetItemString(d,constants[i].name,obj); - Py_DECREF(obj); - } - } - } - - /* -----------------------------------------------------------------------------*/ - /* Fix SwigMethods to carry the callback ptrs when needed */ - /* -----------------------------------------------------------------------------*/ - - SWIGINTERN void - SWIG_Python_FixMethods(PyMethodDef *methods, - swig_const_info *const_table, - swig_type_info **types, - swig_type_info **types_initial) { - size_t i; - for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; - if (c && (c = strstr(c, "swig_ptr: "))) { - int j; - swig_const_info *ci = 0; - char *name = c + 10; - for (j = 0; const_table[j].type; ++j) { - if (strncmp(const_table[j].name, name, - strlen(const_table[j].name)) == 0) { - ci = &(const_table[j]); - break; - } - } - if (ci) { - size_t shift = (ci->ptype) - types; - swig_type_info *ty = types_initial[shift]; - size_t ldoc = (c - methods[i].ml_doc); - size_t lptr = strlen(ty->name)+2*sizeof(void*)+2; - char *ndoc = (char*)malloc(ldoc + lptr + 10); - if (ndoc) { - char *buff = ndoc; - void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0; - if (ptr) { - strncpy(buff, methods[i].ml_doc, ldoc); - buff += ldoc; - strncpy(buff, "swig_ptr: ", 10); - buff += 10; - SWIG_PackVoidPtr(buff, ptr, ty->name, lptr); - methods[i].ml_doc = ndoc; - } - } - } - } - } - } - - /* -----------------------------------------------------------------------------* - * Initialize type list - * -----------------------------------------------------------------------------*/ - -#ifdef __cplusplus -} -#endif - -/* -----------------------------------------------------------------------------* - * Partial Init method - * -----------------------------------------------------------------------------*/ - -#ifdef __cplusplus extern "C" #endif -SWIGEXPORT void SWIG_init(void) { +SWIGEXPORT(void) SWIG_init(void) { static PyObject *SWIG_globals = 0; + static int typeinit = 0; PyObject *m, *d; + int i; if (!SWIG_globals) SWIG_globals = SWIG_newvarlink(); - - /* Fix SwigMethods to carry the callback ptrs when needed */ - SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial); - m = Py_InitModule((char *) SWIG_name, SwigMethods); d = PyModule_GetDict(m); - SWIG_InitializeModule(0); + if (!typeinit) { + for (i = 0; swig_types_initial[i]; i++) { + swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]); + } + typeinit = 1; + } SWIG_InstallConstants(d,swig_const_table); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c Sat Dec 23 13:26:46 2006 @@ -627,7 +627,7 @@ extern void fs_channel_set_variable(switch_core_session_t *,char *,char *); extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); -extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_ivr_play_file(switch_core_session_t *,char *); extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); @@ -635,7 +635,7 @@ extern int fs_switch_ivr_collect_digits_count(switch_core_session_t *,char *,unsigned int,unsigned int,char const *,char *,unsigned int); extern int fs_switch_ivr_originate(switch_core_session_t *,switch_core_session_t **,char *,uint32_t); extern int fs_switch_ivr_session_transfer(switch_core_session_t *,char *,char *,char *); -extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,char *,uint32_t,switch_input_callback_function_t,char *,void *,unsigned int); +extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,uint32_t,char *); extern char *fs_switch_channel_get_variable(switch_channel_t *,char *); extern int fs_switch_channel_set_variable(switch_channel_t *,char *,char *); @@ -859,26 +859,14 @@ _wrap_fs_ivr_play_file(int argc, VALUE *argv, VALUE self) { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 ; - char *arg3 ; - switch_input_callback_function_t arg4 ; - void *arg5 = (void *) 0 ; - unsigned int arg6 ; int result; VALUE vresult = Qnil; - if ((argc < 6) || (argc > 6)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); + if ((argc < 2) || (argc > 2)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 1); arg2 = StringValuePtr(argv[1]); - arg3 = StringValuePtr(argv[2]); - { - switch_input_callback_function_t * ptr; - SWIG_ConvertPtr(argv[3], (void **) &ptr, SWIGTYPE_p_switch_input_callback_function_t, 1); - if (ptr) arg4 = *ptr; - } - SWIG_ConvertPtr(argv[4], (void **) &arg5, 0, 1); - arg6 = NUM2UINT(argv[5]); - result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); + result = (int)fs_ivr_play_file(arg1,arg2); vresult = INT2NUM(result); return vresult; @@ -1066,35 +1054,23 @@ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 ; char *arg3 ; - char *arg4 ; - uint32_t arg5 ; - switch_input_callback_function_t arg6 ; - char *arg7 ; - void *arg8 = (void *) 0 ; - unsigned int arg9 ; + uint32_t arg4 ; + char *arg5 ; int result; VALUE vresult = Qnil; - if ((argc < 9) || (argc > 9)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 9)",argc); + if ((argc < 5) || (argc > 5)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 1); arg2 = StringValuePtr(argv[1]); arg3 = StringValuePtr(argv[2]); - arg4 = StringValuePtr(argv[3]); { uint32_t * ptr; - SWIG_ConvertPtr(argv[4], (void **) &ptr, SWIGTYPE_p_uint32_t, 1); - if (ptr) arg5 = *ptr; + SWIG_ConvertPtr(argv[3], (void **) &ptr, SWIGTYPE_p_uint32_t, 1); + if (ptr) arg4 = *ptr; } - { - switch_input_callback_function_t * ptr; - SWIG_ConvertPtr(argv[5], (void **) &ptr, SWIGTYPE_p_switch_input_callback_function_t, 1); - if (ptr) arg6 = *ptr; - } - arg7 = StringValuePtr(argv[6]); - SWIG_ConvertPtr(argv[7], (void **) &arg8, 0, 1); - arg9 = NUM2UINT(argv[8]); - result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); + arg5 = StringValuePtr(argv[4]); + result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5); vresult = INT2NUM(result); return vresult; Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Dec 23 13:26:46 2006 @@ -850,6 +850,7 @@ switch_file_handle_t fh = {0}; JSFunction *function; int32 limit = 0; + switch_input_args_t args = {0}; channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); @@ -904,7 +905,10 @@ cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); cb_state.saveDepth = JS_SuspendRequest(cx); - switch_ivr_record_file(jss->session, &fh, file_name, dtmf_func, bp, len, limit); + args.input_callback = dtmf_func; + args.buf = bp; + args.buflen = len; + switch_ivr_record_file(jss->session, &fh, file_name, &args, limit); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -922,6 +926,7 @@ switch_input_callback_function_t dtmf_func = NULL; struct input_callback_state cb_state = {0}; JSFunction *function; + switch_input_args_t args = {0}; channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); @@ -956,7 +961,10 @@ } cb_state.saveDepth = JS_SuspendRequest(cx); - switch_ivr_collect_digits_callback(jss->session, dtmf_func, bp, len, to); + args.input_callback = dtmf_func; + args.buf = bp; + args.buflen = len; + switch_ivr_collect_digits_callback(jss->session, &args, to); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -969,7 +977,6 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; char *file_name = NULL; - char *timer_name = NULL; //char *input_callback = NULL; void *bp = NULL; int len = 0; @@ -977,6 +984,7 @@ struct input_callback_state cb_state = {0}; switch_file_handle_t fh = {0}; JSFunction *function; + switch_input_args_t args = {0}; channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); @@ -994,19 +1002,14 @@ return JS_FALSE; } } + if (argc > 1) { - timer_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - if (switch_strlen_zero(timer_name)) { - timer_name = NULL; - } - } - if (argc > 2) { - if ((function = JS_ValueToFunction(cx, argv[2]))) { + if ((function = JS_ValueToFunction(cx, argv[1]))) { memset(&cb_state, 0, sizeof(cb_state)); cb_state.function = function; - if (argc > 3) { - cb_state.arg = argv[3]; + if (argc > 2) { + cb_state.arg = argv[2]; } cb_state.session_state = jss; @@ -1018,16 +1021,19 @@ } } - if (argc > 4) { + if (argc > 3) { int32 samps; - JS_ValueToInt32(cx, argv[4], &samps); + JS_ValueToInt32(cx, argv[3], &samps); fh.samples = samps; } cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); cb_state.saveDepth = JS_SuspendRequest(cx); - switch_ivr_play_file(jss->session, &fh, file_name, timer_name, dtmf_func, bp, len); + args.input_callback = dtmf_func; + args.buf = bp; + args.buflen = len; + switch_ivr_play_file(jss->session, &fh, file_name, &args); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -1104,13 +1110,13 @@ char *tts_name = NULL; char *voice_name = NULL; char *text = NULL; - char *timer_name = NULL; switch_codec_t *codec; void *bp = NULL; int len = 0; struct input_callback_state cb_state = {0}; switch_input_callback_function_t dtmf_func = NULL; JSFunction *function; + switch_input_args_t args = {0}; channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); @@ -1148,10 +1154,6 @@ } } - if (argc > 5) { - timer_name = JS_GetStringBytes(JS_ValueToString(cx, argv[5])); - } - if (!tts_name && text) { return JS_FALSE; } @@ -1159,15 +1161,15 @@ codec = switch_core_session_get_read_codec(jss->session); cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); cb_state.saveDepth = JS_SuspendRequest(cx); + args.input_callback = dtmf_func; + args.buf = bp; + args.buflen = len; switch_ivr_speak_text(jss->session, tts_name, voice_name && strlen(voice_name) ? voice_name : NULL, - timer_name, codec->implementation->samples_per_second, - dtmf_func, text, - bp, - len); + &args); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; Modified: freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c Sat Dec 23 13:26:46 2006 @@ -39,14 +39,14 @@ char tmp[80];\ switch_status_t status;\ snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = en_say_general_count(session, tmp, SST_ITEMS, SSM_PRONOUNCED, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) {\ + if ((status = en_say_general_count(session, tmp, SST_ITEMS, SSM_PRONOUNCED, args)) != SWITCH_STATUS_SUCCESS) {\ return status;\ }}\ #define say_file(...) {\ char tmp[80];\ snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); \ + switch_ivr_play_file(session, NULL, tmp, args); \ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ }}\ @@ -54,12 +54,10 @@ static switch_status_t en_spell(switch_core_session_t *session, - char *tosay, - switch_say_type_t type, - switch_say_method_t method, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_args_t *args) { char *p; @@ -80,9 +78,7 @@ int c, char *what, switch_core_session_t *session, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_input_args_t *args) { if (a) { @@ -137,9 +133,7 @@ char *tosay, switch_say_type_t type, switch_say_method_t method, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_input_args_t *args) { switch_channel_t *channel; int in; @@ -167,13 +161,13 @@ switch (method) { case SSM_PRONOUNCED: - if ((status = play_group(places[8], places[7], places[6], "digits/million.wav", session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { return status; } - if ((status = play_group(places[5], places[4], places[3], "digits/thousand.wav", session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { return status; } - if ((status = play_group(places[2], places[1], places[0], NULL, session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { return status; } break; @@ -195,9 +189,7 @@ char *tosay, switch_say_type_t type, switch_say_method_t method, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_input_args_t *args) { int32_t t; switch_time_t target = 0; @@ -326,9 +318,7 @@ char *tosay, switch_say_type_t type, switch_say_method_t method, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_input_args_t *args) { switch_say_callback_t say_cb = NULL; @@ -356,7 +346,7 @@ } if (say_cb) { - say_cb(session, tosay, type, method, input_callback, buf, buflen); + say_cb(session, tosay, type, method, args); } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Sat Dec 23 13:26:46 2006 @@ -178,9 +178,7 @@ } SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_session_t *session, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen, + switch_input_args_t *args, uint32_t timeout) { switch_channel_t *channel; @@ -191,7 +189,7 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (!input_callback) { + if (!args->input_callback) { return SWITCH_STATUS_GENERR; } @@ -218,11 +216,11 @@ if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - status = input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, buf, buflen); + status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); } if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { - status = input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, buf, buflen); + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); switch_event_destroy(&event); } @@ -331,9 +329,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *session, switch_file_handle_t *fh, char *file, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen, + switch_input_args_t *args, uint32_t limit) { switch_channel_t *channel; @@ -454,28 +450,28 @@ break; } - if (input_callback || buf || buflen) { + if (args->input_callback || args->buf || args->buflen) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. */ if (switch_channel_has_dtmf(channel)) { - if (!input_callback && !buf) { + if (!args->input_callback && !args->buf) { status = SWITCH_STATUS_BREAK; break; } switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - if (input_callback) { - status = input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, buf, buflen); + if (args->input_callback) { + status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); } else { - switch_copy_string((char *)buf, dtmf, buflen); + switch_copy_string((char *)args->buf, dtmf, args->buflen); status = SWITCH_STATUS_BREAK; } } - if (input_callback) { + if (args->input_callback) { if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { - status = input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, buf, buflen); + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); switch_event_destroy(&event); } } @@ -955,12 +951,9 @@ #define FILE_BUFSIZE 1024 * 64 SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *session, - switch_file_handle_t *fh, - char *file, - char *timer_name, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_file_handle_t *fh, + char *file, + switch_input_args_t *args) { switch_channel_t *channel; int16_t abuf[FILE_STARTSAMPLES]; @@ -983,11 +976,13 @@ uint8_t asis = 0; char *ext; char *prefix; + char *timer_name; channel = switch_core_session_get_channel(session); assert(channel != NULL); prefix = switch_channel_get_variable(channel, "sound_prefix"); + timer_name = switch_channel_get_variable(channel, "timer_name"); if (file) { if (prefix && *file != '/' && *file != '\\' && *(file+1) != ':') { @@ -1167,29 +1162,29 @@ switch_event_destroy(&event); } - if (input_callback || buf || buflen) { + if (args->input_callback || args->buf || args->buflen) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. */ if (switch_channel_has_dtmf(channel)) { - if (!input_callback && !buf) { + if (!args->input_callback && !args->buf) { status = SWITCH_STATUS_BREAK; done = 1; break; } switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - if (input_callback) { - status = input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, buf, buflen); + if (args->input_callback) { + status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); } else { - switch_copy_string((char *)buf, dtmf, buflen); + switch_copy_string((char *)args->buf, dtmf, args->buflen); status = SWITCH_STATUS_BREAK; } } - if (input_callback) { + if (args->input_callback) { if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { - status = input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, buf, buflen); + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); switch_event_destroy(&event); } } @@ -1407,11 +1402,14 @@ //Start pestering the user for input for(;(switch_channel_get_state(channel) == CS_EXECUTE) && max_tries > 0; max_tries--) { + switch_input_args_t args = {0}; //make the buffer so fresh and so clean clean memset(digit_buffer, 0, digit_buffer_length); - + + args.buf = digit_buffer; + args.buflen = digit_buffer_length; //Play the file - status = switch_ivr_play_file(session, NULL, prompt_audio_file, NULL, NULL, digit_buffer, digit_buffer_length); + status = switch_ivr_play_file(session, NULL, prompt_audio_file, &args); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play gave up %s", digit_buffer); //Make sure we made it out alive @@ -1434,7 +1432,7 @@ } else { //See if a bad input prompt was specified, if so, play it if (strlen(bad_input_audio_file) > 0) { - status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL); //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { @@ -1474,7 +1472,7 @@ } else { //See if a bad input prompt was specified, if so, play it if (strlen(bad_input_audio_file) > 0) { - status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL); //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { @@ -1500,10 +1498,8 @@ switch_speech_handle_t *sh, switch_codec_t *codec, switch_timer_t *timer, - switch_input_callback_function_t input_callback, char *text, - void *buf, - uint32_t buflen) + switch_input_args_t *args) { switch_channel_t *channel; short abuf[960]; @@ -1563,33 +1559,33 @@ switch_event_destroy(&event); } - if (input_callback || buf || buflen) { + if (args->input_callback || args->buf || args->buflen) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. */ if (switch_channel_has_dtmf(channel)) { - if (!input_callback && !buf) { + if (!args->input_callback && !args->buf) { status = SWITCH_STATUS_BREAK; done = 1; break; } - if (buf && !strcasecmp(buf, "_break_")) { + if (args->buf && !strcasecmp(args->buf, "_break_")) { status = SWITCH_STATUS_BREAK; } else { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - if (input_callback) { - status = input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, buf, buflen); + if (args->input_callback) { + status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); } else { - switch_copy_string((char *)buf, dtmf, buflen); + switch_copy_string((char *)args->buf, dtmf, args->buflen); status = SWITCH_STATUS_BREAK; } } } - if (input_callback) { + if (args->input_callback) { if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { - status = input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, buf, buflen); + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); switch_event_destroy(&event); } } @@ -1688,12 +1684,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, char *tts_name, char *voice_name, - char *timer_name, uint32_t rate, - switch_input_callback_function_t input_callback, char *text, - void *buf, - uint32_t buflen) + switch_input_args_t *args) { switch_channel_t *channel; int interval = 0; @@ -1710,10 +1703,13 @@ switch_speech_handle_t sh; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; switch_codec_t *read_codec; + char *timer_name; channel = switch_core_session_get_channel(session); assert(channel != NULL); + timer_name = switch_channel_get_variable(channel, "timer_name"); + if (rate == 0) { read_codec = switch_core_session_get_read_codec(session); rate = read_codec->implementation->samples_per_second; @@ -1777,7 +1773,7 @@ } } - switch_ivr_speak_text_handle(session, &sh, &codec, timer_name ? &timer : NULL, input_callback, text, buf, buflen); + switch_ivr_speak_text_handle(session, &sh, &codec, timer_name ? &timer : NULL, text, args); flags = 0; switch_core_speech_close(&sh, &flags); switch_core_codec_destroy(&codec); @@ -2182,8 +2178,10 @@ memset(buf, 0, sizeof(buf)); if (collect->file) { - - switch_ivr_play_file(collect->session, NULL, collect->file, NULL, NULL, buf, sizeof(buf)); + switch_input_args_t args = {0}; + args.buf = buf; + args.buflen = sizeof(buf); + switch_ivr_play_file(collect->session, NULL, collect->file, &args); } else { switch_ivr_collect_digits_count(collect->session, buf, sizeof(buf), 1, "", &term, 0); } @@ -3754,7 +3752,6 @@ char *tts_voice; char *buf; char *ptr; - char *timer_name; int max_failures; int timeout; uint32_t inlen; @@ -3806,7 +3803,6 @@ char *tts_voice, int timeout, int max_failures, - char *timer_name, switch_memory_pool_t *pool) { switch_ivr_menu_t *menu; @@ -3858,10 +3854,6 @@ menu->tts_voice = switch_core_strdup(menu->pool, tts_voice); } - if (!switch_strlen_zero(timer_name)) { - menu->timer_name = switch_core_strdup(menu->pool, timer_name); - } - menu->max_failures = max_failures; menu->timeout = timeout; @@ -3945,7 +3937,7 @@ return status; } -static switch_status_t play_or_say(switch_core_session_t *session, switch_ivr_menu_t *menu, char *sound, uint32_t need, char *timer_name) +static switch_status_t play_or_say(switch_core_session_t *session, switch_ivr_menu_t *menu, char *sound, uint32_t need) { char terminator; uint32_t len; @@ -3965,10 +3957,16 @@ } if (*sound == '/' || *sound == '\\') { - status = switch_ivr_play_file(session, NULL, sound, timer_name, NULL, ptr, need ? 1 : 0); + switch_input_args_t args = {0}; + args.buf = ptr; + args.buflen = need ? 1 : 0; + status = switch_ivr_play_file(session, NULL, sound, &args); } else { if (menu->tts_engine && menu->tts_voice) { - status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, NULL, 0, NULL, sound, ptr, len); + switch_input_args_t args = {0}; + args.buf = ptr; + args.buflen = len; + status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound, &args); } } @@ -4033,13 +4031,13 @@ memset(arg, 0, sizeof(arg)); memset(menu->buf, 0, menu->inlen); - status = play_or_say(session, menu, greeting_sound, menu->inlen, stack->timer_name); + status = play_or_say(session, menu, greeting_sound, menu->inlen); if (!switch_strlen_zero(menu->buf)) { for(ap = menu->actions; ap ; ap = ap->next) { if (!strcmp(menu->buf, ap->bind)) { char *membuf; - + match++; errs = 0; if (ap->function) { @@ -4052,15 +4050,16 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR action on menu '%s' matched '%s' param '%s'\n", menu->name, menu->buf,aptr); } + switch(todo) { case SWITCH_IVR_ACTION_DIE: status = SWITCH_STATUS_FALSE; break; case SWITCH_IVR_ACTION_PLAYSOUND: - status = switch_ivr_play_file(session, NULL, aptr, stack->timer_name, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, aptr, NULL); break; case SWITCH_IVR_ACTION_SAYTEXT: - status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, NULL, 0, NULL, aptr, NULL, 0); + status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, aptr, NULL); break; case SWITCH_IVR_ACTION_TRANSFER: switch_ivr_session_transfer(session, aptr, NULL, NULL); @@ -4124,7 +4123,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); if (menu->invalid_sound) { - play_or_say(session, menu, menu->invalid_sound, 0, stack->timer_name); + play_or_say(session, menu, menu->invalid_sound, 0); } errs++; @@ -4136,7 +4135,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exit-sound '%s'\n",menu->exit_sound); if (!switch_strlen_zero(menu->exit_sound)) { - status = switch_ivr_play_file(session, NULL, menu->exit_sound, stack->timer_name, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, menu->exit_sound, NULL); } switch_safe_free(menu->buf); @@ -4259,10 +4258,10 @@ } SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, - switch_ivr_menu_t **menu_stack, - switch_xml_t xml_menus, - switch_xml_t xml_menu, - char *timer_name) + switch_ivr_menu_t **menu_stack, + switch_xml_t xml_menus, + switch_xml_t xml_menu) + { switch_status_t status = SWITCH_STATUS_FALSE; @@ -4279,7 +4278,6 @@ switch_ivr_menu_t *menu = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "building menu '%s'\n",menu_name); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timer_name '%s'\n",timer_name); status = switch_ivr_menu_init(&menu, *menu_stack, menu_name, @@ -4291,7 +4289,6 @@ tts_voice, atoi(timeout)*1000, atoi(max_failures), - timer_name, xml_menu_ctx->pool ); // set the menu_stack for the caller @@ -4323,7 +4320,7 @@ // do we need to build a new sub-menu ? if (xml_map->action == SWITCH_IVR_ACTION_EXECMENU && switch_ivr_menu_find(*menu_stack, param) == NULL) { if ((xml_menu = switch_xml_find_child(xml_menus, "menu", "name", param)) != NULL) { - status = switch_ivr_menu_stack_xml_build(xml_menu_ctx, menu_stack, xml_menus, xml_menu, timer_name); + status = switch_ivr_menu_stack_xml_build(xml_menu_ctx, menu_stack, xml_menus, xml_menu); } } @@ -4413,9 +4410,8 @@ char *macro_name, char *data, char *lang, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_input_args_t *args) + { switch_xml_t cfg, xml = NULL, language, macros, macro, input, action; char *lname = NULL, *mname = NULL, hint_data[1024] = "", enc_hint[1024] = ""; @@ -4529,7 +4525,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s)\n", func, odata, lang); if (!strcasecmp(func, "play-file")) { - switch_ivr_play_file(session, NULL, odata, NULL, input_callback, buf, buflen); + switch_ivr_play_file(session, NULL, odata, args); } else if (!strcasecmp(func, "execute")) { const switch_application_interface_t *application_interface; char *app_name = NULL; @@ -4558,22 +4554,20 @@ char *say_type = (char *) switch_xml_attr_soft(action, "type"); char *say_method = (char *) switch_xml_attr_soft(action, "method"); - si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), input_callback, buf, buflen); + si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), args); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid SAY Interface [%s]!\n", lang); } } else if (!strcasecmp(func, "speak-text")) { switch_codec_t *read_codec; if ((read_codec = switch_core_session_get_read_codec(session))) { + switch_ivr_speak_text(session, tts_engine, tts_voice, - NULL, read_codec->implementation->samples_per_second, - input_callback, odata, - buf, - buflen); + args); } } } Modified: freeswitch/branches/knhor/trunk/src/switch_swig.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_swig.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_swig.c Sat Dec 23 13:26:46 2006 @@ -158,18 +158,14 @@ */ int fs_ivr_play_file(switch_core_session_t *session, - char *file, - char *timer_name, - switch_input_callback_function_t dtmf_callback, - void *buf, - unsigned int buflen) + char *file) { switch_status_t status; if (switch_strlen_zero(timer_name)) { timer_name = NULL; } - status = switch_ivr_play_file(session, NULL, file, timer_name, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, file, NULL); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -202,7 +198,7 @@ { switch_status_t status; - status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0); + status = switch_ivr_play_file(session, NULL, file, NULL, NULL); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -294,16 +290,12 @@ int fs_switch_ivr_speak_text (switch_core_session_t *session, char *tts_name, char *voice_name, - char *timer_name, uint32_t rate, - switch_input_callback_function_t dtmf_callback, - char *text, - void *buf, - unsigned int buflen) + char *text) { switch_status_t status; - status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen); + status = switch_ivr_speak_text(session,tts_name,voice_name,rate,text,NULL); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; }

1 0

[commit] r3814 - in freeswitch/branches/knhor/trunk: . conf libs/libsndfile libs/srtp/include libs/srtp/srtp libs/win32/apr-iconv libs/win32/apr-util src src/include src/mod/applications/mod_conference src/mod/dialplans/mod_dialplan_xml src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia src/mod/event_handlers/mod_event_socket src/mod/event_handlers/mod_xmpp_event src/mod/languages/mod_spidermonkey src/mod/languages/mod_spidermonkey_etpan src/mod/say/mod_say_en src/mod/xml_int/
by Freeswitch SVN 23 Dec '06

23 Dec '06

Author: knhor Date: Sat Dec 23 00:27:43 2006 New Revision: 3814 Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/conf/freeswitch.xml freeswitch/branches/knhor/trunk/libs/libsndfile/configure (props changed) freeswitch/branches/knhor/trunk/libs/libsndfile/install-sh (props changed) freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h freeswitch/branches/knhor/trunk/libs/srtp/srtp/srtp.c freeswitch/branches/knhor/trunk/libs/win32/apr-iconv/libapriconv.vcproj freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj freeswitch/branches/knhor/trunk/modules.conf.in freeswitch/branches/knhor/trunk/src/include/switch_apr.h freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/branches/knhor/trunk/src/switch_ivr.c freeswitch/branches/knhor/trunk/src/switch_rtp.c Log: Merged revisions 3793-3813 via svnmerge from trunk. copy mod_conference.c from trunk since it was really out of wack. Modified: freeswitch/branches/knhor/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/branches/knhor/trunk/conf/freeswitch.xml (original) +++ freeswitch/branches/knhor/trunk/conf/freeswitch.xml Sat Dec 23 00:27:43 2006 @@ -485,6 +485,19 @@  <context name="default"> + <extension name="556">  + <condition field="destination_number" expression="^556$"> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="phrase" data="spell,${caller_id_name}"/> + <action application="phrase" data="spell-phonetic,${caller_id_name}"/> + <action application="phrase" data="timespec,12:45:15"/> + <action application="phrase" data="saydate,0"/> + <action application="phrase" data="msgcount,130"/> +  + </condition> + </extension> + <extension name="tollfree"> <condition field="destination_number" expression="^(18(0{2}|8{2}|7{2}|6{2})\d{7})$"> <action application="enum" data="$1"/> @@ -647,9 +660,29 @@  </input> </macro> - <macro name="timeleft"> + <macro name="saydate"> + <input pattern="(.*)"> + <action function="say" data="$1" method="pronounced" type="current_date_time"/> + </input> + </macro> + <macro name="timespec"> + <input pattern="(.*)"> + <action function="say" data="$1" method="pronounced" type="time_measurement"/> + </input> + </macro> + <macro name="spell"> + <input pattern="(.*)"> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + </input> + </macro> + <macro name="spell-phonetic"> + <input pattern="(.*)"> + <action function="say" data="$1" method="pronounced" type="name_phonetic"/> + </input> + </macro> + <macro name="tts-timeleft"> <input pattern="(\d+):(\d+)"> - <action function="speak-text" data="You have $1 minutes, $2 seconds remaining"/> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> </input> </macro> </language> Modified: freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h ============================================================================== --- freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h (original) +++ freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h Sat Dec 23 00:27:43 2006 @@ -51,7 +51,6 @@ #endif #ifdef _MSC_VER -#pragma pack(4) #pragma warning(disable:4214) #endif @@ -895,6 +894,10 @@ * is not identical) */ +#ifdef _MSC_VER +#pragma pack(push, r1, 1) +#endif + #ifndef WORDS_BIGENDIAN typedef struct { @@ -904,9 +907,9 @@ unsigned version:2; /* protocol version */ unsigned pt:7; /* payload type */ unsigned m:1; /* marker bit */ - uint16_t seq; /* sequence number */ - uint32_t ts; /* timestamp */ - uint32_t ssrc; /* synchronization source */ + unsigned seq:16; /* sequence number */ + unsigned ts:32; /* timestamp */ + unsigned ssrc:32; /* synchronization source */ } srtp_hdr_t; #else /* BIG_ENDIAN */ @@ -918,9 +921,9 @@ unsigned cc:4; /* CSRC count */ unsigned m:1; /* marker bit */ unsigned pt:7; /* payload type */ - uint16_t seq; /* sequence number */ - uint32_t ts; /* timestamp */ - uint32_t ssrc; /* synchronization source */ + unsigned seq:16; /* sequence number */ + unsigned ts:32; /* timestamp */ + unsigned ssrc:32; /* synchronization source */ } srtp_hdr_t; #endif @@ -945,8 +948,8 @@ unsigned p:1; /* padding flag */ unsigned version:2; /* protocol version */ unsigned pt:8; /* payload type */ - uint16_t len; /* length */ - uint32_t ssrc; /* synchronization source */ + unsigned len:16; /* length */ + unsigned ssrc:32; /* synchronization source */ } srtcp_hdr_t; typedef struct { @@ -964,8 +967,8 @@ unsigned p:1; /* padding flag */ unsigned rc:5; /* reception report count */ unsigned pt:8; /* payload type */ - uint16_t len; /* length */ - uint32_t ssrc; /* synchronization source */ + unsigned len:16; /* length */ + unsigned ssrc:32; /* synchronization source */ } srtcp_hdr_t; typedef struct { @@ -973,7 +976,7 @@ unsigned int p:1; /* padding flag */ unsigned int count:5; /* varies by packet type */ unsigned int pt:8; /* payload type */ - uint16_t length; /* len of uint32s of packet less header */ + unsigned length:16; /* len of uint32s of packet less header */ } rtcp_common_t; typedef struct { @@ -992,7 +995,7 @@ #define SRTCP_INDEX_MASK 0x7fffffff #ifdef _MSC_VER -#pragma pack() +#pragma pack(pop, r1) #endif #ifdef __cplusplus Modified: freeswitch/branches/knhor/trunk/libs/srtp/srtp/srtp.c ============================================================================== --- freeswitch/branches/knhor/trunk/libs/srtp/srtp/srtp.c (original) +++ freeswitch/branches/knhor/trunk/libs/srtp/srtp/srtp.c Sat Dec 23 00:27:43 2006 @@ -684,7 +684,7 @@ * estimate the packet index using the start of the replay window * and the sequence number from the header */ - delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs(hdr->seq)); + delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs((uint16_t)hdr->seq)); status = rdbx_check(&stream->rtp_rdbx, delta); if (status) return status; /* we've been asked to reuse an index */ @@ -842,7 +842,7 @@ est = (xtd_seq_num_t) make64(0,ntohs(hdr->seq)); delta = low32(est); #else - est = (xtd_seq_num_t) ntohs(hdr->seq); + est = (xtd_seq_num_t) ntohs((uint16_t)hdr->seq); delta = (int)est; #endif } else { @@ -856,7 +856,7 @@ } else { /* estimate packet index from seq. num. in header */ - delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs(hdr->seq)); + delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs((uint16_t)hdr->seq)); /* check replay database */ status = rdbx_check(&stream->rtp_rdbx, delta); Modified: freeswitch/branches/knhor/trunk/libs/win32/apr-iconv/libapriconv.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/apr-iconv/libapriconv.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/apr-iconv/libapriconv.vcproj Sat Dec 23 00:27:43 2006 @@ -48,7 +48,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libapriconv.pch" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj Sat Dec 23 00:27:43 2006 @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libaprutil.pch" @@ -149,7 +149,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/branches/knhor/trunk/modules.conf.in ============================================================================== --- freeswitch/branches/knhor/trunk/modules.conf.in (original) +++ freeswitch/branches/knhor/trunk/modules.conf.in Sat Dec 23 00:27:43 2006 @@ -44,5 +44,6 @@ #languages/mod_spidermonkey_teletone #languages/mod_spidermonkey_core_db #languages/mod_spidermonkey_odbc +#languages/mod_spidermonkey_etpan timers/mod_softtimer #xml_int/mod_xml_rpc Modified: freeswitch/branches/knhor/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_apr.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_apr.h Sat Dec 23 00:27:43 2006 @@ -262,6 +262,9 @@ #define switch_thread_data_set apr_thread_data_set #define switch_thread_data_get apr_thread_data_get #define switch_thread_self apr_os_thread_current +#define switch_time_make(sec, usec) ((apr_time_t)(sec) * APR_USEC_PER_SEC \ + + (apr_time_t)(usec)) + /** * Put the active calling thread to sleep until signaled to wake up. Each Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Dec 23 00:27:43 2006 @@ -9,7 +9,7 @@ * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * - * Software distributed under the License is distributed on an "AS IS" basis, + * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. @@ -48,14 +48,14 @@ #define CONF_CHAT_PROTO "conf" #ifndef MIN -#define MIN(a,b) ((a)<(b)?(a):(b)) +#define MIN(a, b) ((a)<(b)?(a):(b)) #endif /* this doesn't work correctly yet, don't bother trying! */ //#define OPTION_IVR_MENU_SUPPORT */ typedef enum { - FILE_STOP_CURRENT, + FILE_STOP_CURRENT, FILE_STOP_ALL } file_stop_t; @@ -72,20 +72,20 @@ } globals; typedef enum { - CALLER_CONTROL_MUTE, - CALLER_CONTROL_DEAF_MUTE, - CALLER_CONTROL_ENERGY_UP, - CALLER_CONTROL_ENERGY_EQU_CONF, - CALLER_CONTROL_ENERGEY_DN, - CALLER_CONTROL_VOL_TALK_UP, - CALLER_CONTROL_VOL_TALK_ZERO, - CALLER_CONTROL_VOL_TALK_DN, - CALLER_CONTROL_VOL_LISTEN_UP, - CALLER_CONTROL_VOL_LISTEN_ZERO, - CALLER_CONTROL_VOL_LISTEN_DN, - CALLER_CONTROL_HANGUP, - CALLER_CONTROL_MENU, - CALLER_CONTROL_DIAL, + CALLER_CONTROL_MUTE, + CALLER_CONTROL_DEAF_MUTE, + CALLER_CONTROL_ENERGY_UP, + CALLER_CONTROL_ENERGY_EQU_CONF, + CALLER_CONTROL_ENERGEY_DN, + CALLER_CONTROL_VOL_TALK_UP, + CALLER_CONTROL_VOL_TALK_ZERO, + CALLER_CONTROL_VOL_TALK_DN, + CALLER_CONTROL_VOL_LISTEN_UP, + CALLER_CONTROL_VOL_LISTEN_ZERO, + CALLER_CONTROL_VOL_LISTEN_DN, + CALLER_CONTROL_HANGUP, + CALLER_CONTROL_MENU, + CALLER_CONTROL_DIAL, } caller_control_t; /* forward declaration for conference_obj and caller_control */ @@ -110,30 +110,30 @@ } caller_control_menu_info_t; typedef enum { - MFLAG_RUNNING = (1 << 0), - MFLAG_CAN_SPEAK = (1 << 1), - MFLAG_CAN_HEAR = (1 << 2), - MFLAG_KICKED = (1 << 3), - MFLAG_ITHREAD = (1 << 4), + MFLAG_RUNNING = (1 << 0), + MFLAG_CAN_SPEAK = (1 << 1), + MFLAG_CAN_HEAR = (1 << 2), + MFLAG_KICKED = (1 << 3), + MFLAG_ITHREAD = (1 << 4), MFLAG_NOCHANNEL = (1 << 5) } member_flag_t; typedef enum { - CFLAG_RUNNING = (1 << 0), - CFLAG_DYNAMIC = (1 << 1), - CFLAG_ENFORCE_MIN = (1 << 2), - CFLAG_DESTRUCT = (1 << 3), - CFLAG_LOCKED = (1 << 4), + CFLAG_RUNNING = (1 << 0), + CFLAG_DYNAMIC = (1 << 1), + CFLAG_ENFORCE_MIN = (1 << 2), + CFLAG_DESTRUCT = (1 << 3), + CFLAG_LOCKED = (1 << 4), CFLAG_ANSWERED = (1 << 5) } conf_flag_t; typedef enum { - RFLAG_CAN_SPEAK = (1 << 0), + RFLAG_CAN_SPEAK = (1 << 0), RFLAG_CAN_HEAR = (1 << 1) } relation_flag_t; typedef enum { - NODE_TYPE_FILE, + NODE_TYPE_FILE, NODE_TYPE_SPEECH } node_type_t; @@ -243,14 +243,21 @@ switch_memory_pool_t *pool; } conference_record_t; +typedef enum { + CONF_API_SUB_ARGS_SPLIT, + CONF_API_SUB_MEMBER_TARGET, + CONF_API_SUB_ARGS_AS_ONE +} conference_fntype_t; + /* API command parser */ typedef struct api_command { char *pname; void *pfnapicmd; - int fntype; + conference_fntype_t fntype; char *psyntax; } api_command_t; + /* Function Prototypes */ static uint32_t next_member_id(void); static conference_relationship_t *member_get_relationship(conference_member_t *member, conference_member_t *other_member); @@ -263,16 +270,16 @@ static void conference_loop_output(conference_member_t *member); static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop); static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel); -static switch_status_t conference_say(conference_obj_t *conference, char *text, uint32_t leadin); +static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim); static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); -static switch_status_t conference_outcall(conference_obj_t *conference, - switch_core_session_t *session, - char *bridgeto, - uint32_t timeout, - char *flags, - char *cid_name, +static switch_status_t conference_outcall(conference_obj_t *conference, + switch_core_session_t *session, + char *bridgeto, + uint32_t timeout, + char *flags, + char *cid_name, char *cid_num); static void conference_function(switch_core_session_t *session, char *data); static void launch_conference_thread(conference_obj_t *conference); @@ -285,26 +292,26 @@ static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); static void launch_conference_record_thread(conference_obj_t *conference, char *path); -typedef int (*conf_api_args_cmd_t)(conference_obj_t*, switch_stream_handle_t*, int, char**); -typedef int (*conf_api_member_cmd_t)(conference_member_t*, switch_stream_handle_t*, void*); -typedef int (*conf_api_text_cmd_t)(conference_obj_t*, switch_stream_handle_t*, char*); +typedef switch_status_t (*conf_api_args_cmd_t)(conference_obj_t*, switch_stream_handle_t*, int, char**); +typedef switch_status_t (*conf_api_member_cmd_t)(conference_member_t*, switch_stream_handle_t*, void*); +typedef switch_status_t (*conf_api_text_cmd_t)(conference_obj_t*, switch_stream_handle_t*, const char*); -static void conference_member_itterator(conference_obj_t *conference, - switch_stream_handle_t *stream, - conf_api_member_cmd_t pfncallback, +static void conference_member_itterator(conference_obj_t *conference, + switch_stream_handle_t *stream, + conf_api_member_cmd_t pfncallback, void *data); -static int conf_api_sub_mute(conference_member_t *member, - switch_stream_handle_t *stream, - void *data); -static int conf_api_sub_unmute(conference_member_t *member, - switch_stream_handle_t *stream, - void *data); -static int conf_api_sub_deaf(conference_member_t *member, - switch_stream_handle_t *stream, - void *data); -static int conf_api_sub_undeaf(conference_member_t *member, - switch_stream_handle_t *stream, - void *data); +static switch_status_t conf_api_sub_mute(conference_member_t *member, + switch_stream_handle_t *stream, + void *data); +static switch_status_t conf_api_sub_unmute(conference_member_t *member, + switch_stream_handle_t *stream, + void *data); +static switch_status_t conf_api_sub_deaf(conference_member_t *member, + switch_stream_handle_t *stream, + void *data); +static switch_status_t conf_api_sub_undeaf(conference_member_t *member, + switch_stream_handle_t *stream, + void *data); /* Return a Distinct ID # */ static uint32_t next_member_id(void) @@ -323,7 +330,7 @@ { conference_relationship_t *rel = NULL; - if(member != NULL && other_member != NULL) { + if (member != NULL && other_member != NULL) { conference_relationship_t *global = NULL; switch_mutex_lock(member->flag_mutex); @@ -360,37 +367,39 @@ { conference_member_t *member = NULL; - if (conference != NULL && id != 0) { - for(member = conference->members; member; member = member->next) { + assert(conference != NULL); + assert(id != 0); - if (switch_test_flag(member, MFLAG_NOCHANNEL)) { - continue; - } + for(member = conference->members; member; member = member->next) { + + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + + if (member->id == id) { + break; + } + } + - if (member->id == id) { - break; - } - } - } - return member; } /* stop the specified recording */ -static int conference_record_stop(conference_obj_t *conference, char *path) +static switch_status_t conference_record_stop(conference_obj_t *conference, char *path) { conference_member_t *member = NULL; int count = 0; - if (conference != NULL) { - for(member = conference->members; member; member = member->next) { - if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) { - switch_clear_flag_locked(member, MFLAG_RUNNING); - count++; - } - } - } + assert (conference != NULL); + for(member = conference->members; member; member = member->next) { + if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) { + switch_clear_flag_locked(member, MFLAG_RUNNING); + count++; + } + } + return count; } @@ -442,64 +451,64 @@ static switch_status_t conference_add_member(conference_obj_t *conference, conference_member_t *member) { switch_status_t status = SWITCH_STATUS_FALSE; + switch_event_t *event; - if(conference != NULL && member != NULL) { - switch_event_t *event; + assert(conference != NULL); + assert(member != NULL); - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); - switch_mutex_lock(member->audio_in_mutex); - switch_mutex_lock(member->audio_out_mutex); - switch_mutex_lock(member->flag_mutex); - member->conference = member->last_conference = conference; - member->next = conference->members; - member->energy_level = conference->energy_level; - conference->members = member; + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + switch_mutex_lock(member->audio_in_mutex); + switch_mutex_lock(member->audio_out_mutex); + switch_mutex_lock(member->flag_mutex); + member->conference = member->last_conference = conference; + member->next = conference->members; + member->energy_level = conference->energy_level; + conference->members = member; - if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { - conference->count++; - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } + if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { + conference->count++; + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } - if (conference->enter_sound) { - conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session)); - } + if (conference->enter_sound) { + conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session)); + } - if (conference->count == 1 && conference->alone_sound) { - conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); - } + if (conference->count == 1 && conference->alone_sound) { + conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); + } - if (conference->min && conference->count >= conference->min) { - switch_set_flag(conference, CFLAG_ENFORCE_MIN); - } + if (conference->min && conference->count >= conference->min) { + switch_set_flag(conference, CFLAG_ENFORCE_MIN); + } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member"); - switch_event_fire(&event); - } - } - switch_mutex_unlock(member->flag_mutex); - switch_mutex_unlock(member->audio_out_mutex); - switch_mutex_unlock(member->audio_in_mutex); - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member"); + switch_event_fire(&event); + } + } + switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->audio_out_mutex); + switch_mutex_unlock(member->audio_in_mutex); + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + status = SWITCH_STATUS_SUCCESS; + - status = SWITCH_STATUS_SUCCESS; - } - return status; } @@ -507,95 +516,99 @@ static switch_status_t conference_del_member(conference_obj_t *conference, conference_member_t *member) { switch_status_t status = SWITCH_STATUS_FALSE; + conference_member_t *imember, *last = NULL; + switch_event_t *event; - if(conference != NULL && member != NULL ) { - conference_member_t *imember, *last = NULL; - switch_event_t *event; + assert(conference != NULL); + assert(member != NULL); + - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); - switch_mutex_lock(member->audio_in_mutex); - switch_mutex_lock(member->audio_out_mutex); - switch_mutex_lock(member->flag_mutex); - for (imember = conference->members; imember; imember = imember->next) { - if (imember == member ) { - if (last) { - last->next = imember->next; - } else { - conference->members = imember->next; - } - break; - } - last = imember; - } - /* Close Unused Handles */ - if (member->fnode) { - conference_file_node_t *fnode, *cur; - switch_memory_pool_t *pool; + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + switch_mutex_lock(member->audio_in_mutex); + switch_mutex_lock(member->audio_out_mutex); + switch_mutex_lock(member->flag_mutex); - fnode = member->fnode; - while(fnode) { - cur = fnode; - fnode = fnode->next; + for (imember = conference->members; imember; imember = imember->next) { + if (imember == member ) { + if (last) { + last->next = imember->next; + } else { + conference->members = imember->next; + } + break; + } + last = imember; + } - if (cur->type == NODE_TYPE_SPEECH) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&cur->sh, &flags); - } else { - switch_core_file_close(&cur->fh); - } + /* Close Unused Handles */ + if (member->fnode) { + conference_file_node_t *fnode, *cur; + switch_memory_pool_t *pool; - pool = cur->pool; - switch_core_destroy_memory_pool(&pool); - } - } + fnode = member->fnode; + while(fnode) { + cur = fnode; + fnode = fnode->next; - member->conference = NULL; + if (cur->type == NODE_TYPE_SPEECH) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + switch_core_speech_close(&cur->sh, &flags); + } else { + switch_core_file_close(&cur->fh); + } - if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { - conference->count--; - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } + pool = cur->pool; + switch_core_destroy_memory_pool(&pool); + } + } - if ((conference->min && switch_test_flag(conference, CFLAG_ENFORCE_MIN) && conference->count < conference->min) - || (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) ) { - switch_set_flag(conference, CFLAG_DESTRUCT); - } else { - if (conference->exit_sound) { - conference_play_file(conference, conference->exit_sound, 0, switch_core_session_get_channel(member->session)); - } - if (conference->count == 1 && conference->alone_sound) { - conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); - } - } + member->conference = NULL; - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { + conference->count--; + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); - switch_event_fire(&event); - } - } - switch_mutex_unlock(member->flag_mutex); - switch_mutex_unlock(member->audio_out_mutex); - switch_mutex_unlock(member->audio_in_mutex); - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); + if ((conference->min && switch_test_flag(conference, CFLAG_ENFORCE_MIN) && conference->count < conference->min) + || (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) ) { + switch_set_flag(conference, CFLAG_DESTRUCT); + } else { + if (conference->exit_sound) { + conference_play_file(conference, conference->exit_sound, 0, switch_core_session_get_channel(member->session)); + } + if (conference->count == 1 && conference->alone_sound) { + conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); + } + } - status = SWITCH_STATUS_SUCCESS; - } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); + switch_event_fire(&event); + } + } + + switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->audio_out_mutex); + switch_mutex_unlock(member->audio_in_mutex); + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + status = SWITCH_STATUS_SUCCESS; + + return status; } @@ -655,9 +668,9 @@ int len = (int) imember->read; imember->mux_resampler->from_len = switch_short_to_float(bptr, imember->mux_resampler->from, (int) len / 2); - imember->mux_resampler->to_len = switch_resample_process(imember->mux_resampler, imember->mux_resampler->from, - imember->mux_resampler->from_len, imember->mux_resampler->to, - imember->mux_resampler->to_size, 0); + imember->mux_resampler->to_len = switch_resample_process(imember->mux_resampler, imember->mux_resampler->from, + imember->mux_resampler->from_len, imember->mux_resampler->to, + imember->mux_resampler->to_size, 0); switch_float_to_short(imember->mux_resampler->to, out, len); len = imember->mux_resampler->to_len * 2; switch_buffer_write(imember->resample_buffer, out, len); @@ -683,10 +696,10 @@ switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; uint32_t rate = conference->rate; - if (switch_core_speech_read_tts(&conference->fnode->sh, - file_frame, - &file_data_len, - &rate, + if (switch_core_speech_read_tts(&conference->fnode->sh, + file_frame, + &file_data_len, + &rate, &flags) == SWITCH_STATUS_SUCCESS) { file_sample_len = file_data_len / 2; } else { @@ -1166,13 +1179,13 @@ if (member != NULL && data != NULL) { caller_control_menu_ctx_t *menu_ctx = (caller_control_menu_ctx_t *)data; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "conference_loop_fn_menu handler '%s'\n",menu_ctx->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "conference_loop_fn_menu handler '%s'\n", menu_ctx->name); if (menu_ctx->menu_stack != NULL && menu_ctx->xml_ctx != NULL) { - switch_ivr_menu_execute(member->session,menu_ctx->menu_stack,menu_ctx->name,member); + switch_ivr_menu_execute(member->session, menu_ctx->menu_stack, menu_ctx->name, member); } else { - if(menu_ctx->menu_stack == NULL) + if (menu_ctx->menu_stack == NULL) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "conference_loop_fn_menu handler NULL menu_stack\n"); - if(menu_ctx->xml_ctx == NULL) + if (menu_ctx->xml_ctx == NULL) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "conference_loop_fn_menu handler NULL xml_ctx\n"); } } @@ -1187,10 +1200,10 @@ int argc = 0; if (lbuf != NULL) { - memset(argv,0,sizeof(argv)); + memset(argv, 0, sizeof(argv)); argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", - argc,argv[0],argv[1],argv[2],argv[3]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", + argc, argv[0], argv[1], argv[2], argv[3]); if (argc >= 4) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2]); @@ -1203,6 +1216,7 @@ } } + /* marshall frames from the call leg to the conference thread for muxing to other call legs */ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj) { @@ -1211,11 +1225,11 @@ switch_status_t status; switch_frame_t *read_frame = NULL; switch_codec_t *read_codec; - uint32_t hangover = 40, - hangunder = 15, - hangover_hits = 0, - hangunder_hits = 0, - energy_level = 0, + uint32_t hangover = 40, + hangunder = 15, + hangover_hits = 0, + hangunder_hits = 0, + energy_level = 0, diff_level = 400; uint8_t talking = 0; @@ -1311,8 +1325,8 @@ int len = (int) read_frame->datalen;; member->read_resampler->from_len = switch_short_to_float(bptr, member->read_resampler->from, (int) len / 2); - member->read_resampler->to_len = switch_resample_process(member->read_resampler, member->read_resampler->from, - member->read_resampler->from_len, member->read_resampler->to, + member->read_resampler->to_len = switch_resample_process(member->read_resampler, member->read_resampler->from, + member->read_resampler->from_len, member->read_resampler->to, member->read_resampler->to_size, 0); switch_float_to_short(member->read_resampler->to, read_frame->data, len); len = member->read_resampler->to_len * 2; @@ -1352,22 +1366,22 @@ } static caller_control_fn_table_t ccfntbl[] = { - {"mute", "0", CALLER_CONTROL_MUTE, conference_loop_fn_mute_toggle}, - {"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE, conference_loop_fn_deafmute_toggle}, - {"energy up", "9", CALLER_CONTROL_ENERGY_UP, conference_loop_fn_energy_up}, - {"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONF, conference_loop_fn_energy_equ_conf}, - {"energy dn", "7", CALLER_CONTROL_ENERGEY_DN, conference_loop_fn_energy_dn}, - {"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP, conference_loop_fn_volume_talk_up}, - {"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO, conference_loop_fn_volume_talk_zero}, - {"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN, conference_loop_fn_volume_talk_dn}, - {"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP, conference_loop_fn_volume_listen_up}, - {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero}, - {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn}, - {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup}, + {"mute", "0", CALLER_CONTROL_MUTE, conference_loop_fn_mute_toggle}, + {"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE, conference_loop_fn_deafmute_toggle}, + {"energy up", "9", CALLER_CONTROL_ENERGY_UP, conference_loop_fn_energy_up}, + {"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONF, conference_loop_fn_energy_equ_conf}, + {"energy dn", "7", CALLER_CONTROL_ENERGEY_DN, conference_loop_fn_energy_dn}, + {"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP, conference_loop_fn_volume_talk_up}, + {"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO, conference_loop_fn_volume_talk_zero}, + {"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN, conference_loop_fn_volume_talk_dn}, + {"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP, conference_loop_fn_volume_listen_up}, + {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero}, + {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn}, + {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup}, #ifdef OPTION_IVR_MENU_SUPPORT - {"menu", NULL, CALLER_CONTROL_MENU, conference_loop_fn_menu}, + {"menu", NULL, CALLER_CONTROL_MENU, conference_loop_fn_menu}, #endif - {"dial", NULL, CALLER_CONTROL_DIAL, conference_loop_fn_dial}, + {"dial", NULL, CALLER_CONTROL_DIAL, conference_loop_fn_dial}, }; #define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0])) @@ -1388,10 +1402,10 @@ assert(channel != NULL); assert(member->conference != NULL); - if (switch_core_timer_init(&timer, - member->conference->timer_name, - member->conference->interval, - samples, + if (switch_core_timer_init(&timer, + member->conference->timer_name, + member->conference->interval, + samples, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", member->conference->timer_name, member->conference->interval, samples); @@ -1412,11 +1426,11 @@ launch_conference_loop_input(member, switch_core_session_get_pool(member->session)); /* build a digit stream object */ - if (member->conference->dtmf_parser != NULL && switch_ivr_digit_stream_new(member->conference->dtmf_parser,&member->digit_stream) != SWITCH_STATUS_SUCCESS) { + if (member->conference->dtmf_parser != NULL && switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Warning Will Robinson, there is no digit parser stream object\n"); } - /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be proccessed, */ + /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be proccessed, */ /* you better not block this thread loop for more than the duration of member->conference->timer_name! */ while(switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD) && switch_channel_ready(channel)) { char dtmf[128] = ""; @@ -1464,34 +1478,39 @@ if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - if(member->conference->dtmf_parser != NULL) { + if (member->conference->dtmf_parser != NULL) { for (digit = dtmf; *digit && caller_action == NULL; digit++) { caller_action = (caller_control_action_t *)switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); } } - /* otherwise, clock the parser so that it can handle digit timeout detection */ - } else if(member->conference->dtmf_parser != NULL) { + /* otherwise, clock the parser so that it can handle digit timeout detection */ + } else if (member->conference->dtmf_parser != NULL) { caller_action = (caller_control_action_t *)switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, '\0'); } /* if a caller action has been detected, handle it */ if (caller_action != NULL && caller_action->fndesc != NULL && caller_action->fndesc->handler != NULL) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel); + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel); + char *param = NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, - SWITCH_LOG_INFO, - "executing caller control '%s' param '%s' on call '%u,%s,%s,%s'\n", - caller_action->fndesc->key, - (caller_action->fndesc->action != CALLER_CONTROL_MENU ? caller_action->data : ""), - member->id, - switch_channel_get_name(channel), - profile->caller_id_name, - profile->caller_id_number - ); - caller_action->fndesc->handler(member,caller_action->data); + if (caller_action->fndesc->action != CALLER_CONTROL_MENU) { + param = caller_action->data; + } + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_INFO, + "executing caller control '%s' param '%s' on call '%u, %s, %s, %s'\n", + caller_action->fndesc->key, + param ? param : "none", + member->id, + switch_channel_get_name(channel), + profile->caller_id_name, + profile->caller_id_number + ); + caller_action->fndesc->handler(member, caller_action->data); + /* set up for next pass */ caller_action = NULL; } @@ -1528,10 +1547,10 @@ switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; uint32_t rate = member->conference->rate; - if (switch_core_speech_read_tts(&member->fnode->sh, - file_frame, - &file_data_len, - &rate, + if (switch_core_speech_read_tts(&member->fnode->sh, + file_frame, + &file_data_len, + &rate, &flags) == SWITCH_STATUS_SUCCESS) { file_sample_len = file_data_len / 2; } else { @@ -1598,8 +1617,8 @@ switch_clear_flag_locked(member, MFLAG_RUNNING); switch_core_timer_destroy(&timer); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n", - switch_channel_cause2str(switch_channel_get_cause(channel))); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n", + switch_channel_cause2str(switch_channel_get_cause(channel))); /* if it's an outbound channel, store the release cause in the conference struct, we might need it */ if (switch_channel_test_flag(channel, CF_OUTBOUND)) { @@ -1672,9 +1691,9 @@ goto end; } - if (switch_core_file_open(&fh, - rec->path, - SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, + if (switch_core_file_open(&fh, + rec->path, + SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, rec->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s]\n", rec->path); goto end; @@ -1709,7 +1728,7 @@ switch_core_file_close(&fh); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n"); -end: + end: if (rec->pool) { switch_memory_pool_t *pool = rec->pool; @@ -1729,27 +1748,26 @@ static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop) { uint32_t count = 0; + conference_file_node_t *nptr; - if (conference != NULL) { - conference_file_node_t *nptr; + assert(conference != NULL); - switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->mutex); - if (stop == FILE_STOP_ALL) { - for (nptr = conference->fnode; nptr; nptr = nptr->next) { - nptr->done++; - count++; - } - } else { - if (conference->fnode) { - conference->fnode->done++; - count++; - } - } + if (stop == FILE_STOP_ALL) { + for (nptr = conference->fnode; nptr; nptr = nptr->next) { + nptr->done++; + count++; + } + } else { + if (conference->fnode) { + conference->fnode->done++; + count++; + } + } + + switch_mutex_unlock(conference->mutex); - switch_mutex_unlock(conference->mutex); - } - return count; } @@ -1784,1638 +1802,1694 @@ /* Play a file in the conference room */ static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_SUCCESS; + conference_file_node_t *fnode, *nptr; + switch_memory_pool_t *pool; + uint32_t count; + char *expanded = NULL; - if (conference != NULL && channel != NULL) { - conference_file_node_t *fnode, *nptr; - switch_memory_pool_t *pool; - uint32_t count; - char *expanded = NULL; - uint8_t frexp = 0; + assert(conference != NULL); - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); - count = conference->count; - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + count = conference->count; + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); - if (!count) { - status = SWITCH_STATUS_FALSE; - goto done; - } + if (!count) { + status = SWITCH_STATUS_FALSE; + goto done; + } - if (channel) { - if ((expanded = switch_channel_expand_variables(channel, file)) != file) { - file = expanded; - frexp = 1; - } - } + if (channel) { + if ((expanded = switch_channel_expand_variables(channel, file)) != file) { + file = expanded; + } else { + expanded = NULL; + } + } - + if #ifdef WIN32 - if (*(file +1) != ':' && *file != '/') { + (*(file +1) != ':' && *file != '/') #else - if (*file != '/') { + (*file != '/') #endif - status = conference_say(conference, file, leadin); - goto done; - } + { + status = conference_say(conference, file, leadin); + goto done; + } - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - status = SWITCH_STATUS_MEMERR; - goto done; - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + status = SWITCH_STATUS_MEMERR; + goto done; + } - /* Create a node object*/ - if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - status = SWITCH_STATUS_MEMERR; - goto done; - } + /* Create a node object*/ + if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + status = SWITCH_STATUS_MEMERR; + goto done; + } - fnode->type = NODE_TYPE_FILE; - fnode->leadin = leadin; + fnode->type = NODE_TYPE_FILE; + fnode->leadin = leadin; - /* Open the file */ - if (switch_core_file_open(&fnode->fh, - file, - SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - pool) != SWITCH_STATUS_SUCCESS) { - switch_core_destroy_memory_pool(&pool); - status = SWITCH_STATUS_NOTFOUND; - goto done; - } + /* Open the file */ + if (switch_core_file_open(&fnode->fh, + file, + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, + pool) != SWITCH_STATUS_SUCCESS) { + switch_core_destroy_memory_pool(&pool); + status = SWITCH_STATUS_NOTFOUND; + goto done; + } - fnode->pool = pool; + fnode->pool = pool; - /* Queue the node */ - switch_mutex_lock(conference->mutex); - for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next); + /* Queue the node */ + switch_mutex_lock(conference->mutex); + for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next); - if (nptr) { - nptr->next = fnode; - } else { - conference->fnode = fnode; - } - switch_mutex_unlock(conference->mutex); + if (nptr) { + nptr->next = fnode; + } else { + conference->fnode = fnode; + } + switch_mutex_unlock(conference->mutex); - done: + done: - if (frexp) { - switch_safe_free(expanded); - } - } - return status; + switch_safe_free(expanded); + + + + return status; } /* Play a file in the conference room to a member */ static switch_status_t conference_member_play_file(conference_member_t *member, char *file, uint32_t leadin) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_FALSE; - if (member != NULL && file != NULL) { - conference_file_node_t *fnode, *nptr; - switch_memory_pool_t *pool; + if (member != NULL && file != NULL) { + conference_file_node_t *fnode, *nptr; + switch_memory_pool_t *pool; - if (*file != '/') { - return conference_member_say(member, file, leadin); - } + if (*file != '/') { + return conference_member_say(member, file, leadin); + } - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - return SWITCH_STATUS_MEMERR; - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return SWITCH_STATUS_MEMERR; + } - /* Create a node object*/ - if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - return SWITCH_STATUS_MEMERR; - } + /* Create a node object*/ + if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + return SWITCH_STATUS_MEMERR; + } - fnode->type = NODE_TYPE_FILE; - fnode->leadin = leadin; + fnode->type = NODE_TYPE_FILE; + fnode->leadin = leadin; - /* Open the file */ - if (switch_core_file_open(&fnode->fh, - file, - SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - pool) != SWITCH_STATUS_SUCCESS) { - switch_core_destroy_memory_pool(&pool); - return SWITCH_STATUS_NOTFOUND; - } + /* Open the file */ + if (switch_core_file_open(&fnode->fh, + file, + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, + pool) != SWITCH_STATUS_SUCCESS) { + switch_core_destroy_memory_pool(&pool); + return SWITCH_STATUS_NOTFOUND; + } - fnode->pool = pool; + fnode->pool = pool; - /* Queue the node */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "queueing file '%s' for play\n",file); - switch_mutex_lock(member->flag_mutex); - for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); + /* Queue the node */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "queueing file '%s' for play\n", file); + switch_mutex_lock(member->flag_mutex); + for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); - if (nptr) { - nptr->next = fnode; - } else { - member->fnode = fnode; - } - switch_mutex_unlock(member->flag_mutex); + if (nptr) { + nptr->next = fnode; + } else { + member->fnode = fnode; + } + switch_mutex_unlock(member->flag_mutex); - status = SWITCH_STATUS_SUCCESS; - } + status = SWITCH_STATUS_SUCCESS; + } - return status; + return status; } /* Say some thing with TTS in the conference room */ static switch_status_t conference_member_say(conference_member_t *member, char *text, uint32_t leadin) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_FALSE; - if (member != NULL && !switch_strlen_zero(text)) { - conference_obj_t *conference = (member != NULL ? member->conference : NULL); - conference_file_node_t *fnode, *nptr; - switch_memory_pool_t *pool; - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + if (member != NULL && !switch_strlen_zero(text)) { + conference_obj_t *conference = (member != NULL ? member->conference : NULL); + conference_file_node_t *fnode, *nptr; + switch_memory_pool_t *pool; + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - if (conference == NULL) { - return SWITCH_STATUS_FALSE; - } + assert(conference != NULL); + + if (!(conference->tts_engine && conference->tts_voice)) { + return SWITCH_STATUS_SUCCESS; + } - if (!(conference->tts_engine && conference->tts_voice)) { - return SWITCH_STATUS_SUCCESS; - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return SWITCH_STATUS_MEMERR; + } - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - return SWITCH_STATUS_MEMERR; - } + /* Create a node object*/ + if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + return SWITCH_STATUS_MEMERR; + } - /* Create a node object*/ - if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - return SWITCH_STATUS_MEMERR; - } + fnode->type = NODE_TYPE_SPEECH; + fnode->leadin = leadin; - fnode->type = NODE_TYPE_SPEECH; - fnode->leadin = leadin; + memset(&fnode->sh, 0, sizeof(fnode->sh)); + if (switch_core_speech_open(&fnode->sh, + conference->tts_engine, + conference->tts_voice, + conference->rate, + &flags, + conference->pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); + return SWITCH_STATUS_FALSE; + } - memset(&fnode->sh, 0, sizeof(fnode->sh)); - if (switch_core_speech_open(&fnode->sh, - conference->tts_engine, - conference->tts_voice, - conference->rate, - &flags, - conference->pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); - return SWITCH_STATUS_FALSE; - } + fnode->pool = pool; - fnode->pool = pool; + /* Queue the node */ + switch_mutex_lock(member->flag_mutex); + for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); - /* Queue the node */ - switch_mutex_lock(member->flag_mutex); - for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); + if (nptr) { + nptr->next = fnode; + } else { + member->fnode = fnode; + } - if (nptr) { - nptr->next = fnode; - } else { - member->fnode = fnode; - } + /* Begin Generation */ + switch_sleep(200000); + switch_core_speech_feed_tts(&fnode->sh, text, &flags); + switch_mutex_unlock(member->flag_mutex); - /* Begin Generation */ - switch_sleep(200000); - switch_core_speech_feed_tts(&fnode->sh, text, &flags); - switch_mutex_unlock(member->flag_mutex); + status = SWITCH_STATUS_SUCCESS; + } - status = SWITCH_STATUS_SUCCESS; - } - - return status; + return status; } /* Say some thing with TTS in the conference room */ -static switch_status_t conference_say(conference_obj_t *conference, char *text, uint32_t leadin) +static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_FALSE; + conference_file_node_t *fnode, *nptr; + switch_memory_pool_t *pool; + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + uint32_t count; - if (conference != NULL && !switch_strlen_zero(text)) { - conference_file_node_t *fnode, *nptr; - switch_memory_pool_t *pool; - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - uint32_t count; + assert(conference != NULL); - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); - count = conference->count; - if (!(conference->tts_engine && conference->tts_voice)) { - count = 0; - } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); + if (switch_strlen_zero(text)) { + return SWITCH_STATUS_GENERR; + } - if (!count) { - return SWITCH_STATUS_FALSE; - } - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - return SWITCH_STATUS_MEMERR; - } - /* Create a node object*/ - if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - return SWITCH_STATUS_MEMERR; - } + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + count = conference->count; + if (!(conference->tts_engine && conference->tts_voice)) { + count = 0; + } + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); - fnode->type = NODE_TYPE_SPEECH; - fnode->leadin = leadin; + if (!count) { + return SWITCH_STATUS_FALSE; + } - memset(&fnode->sh, 0, sizeof(fnode->sh)); - if (switch_core_speech_open(&fnode->sh, - conference->tts_engine, - conference->tts_voice, - conference->rate, - &flags, - conference->pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); - return SWITCH_STATUS_FALSE; - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return SWITCH_STATUS_MEMERR; + } - fnode->pool = pool; + /* Create a node object*/ + if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + return SWITCH_STATUS_MEMERR; + } - /* Queue the node */ - switch_mutex_lock(conference->mutex); - for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next); + fnode->type = NODE_TYPE_SPEECH; + fnode->leadin = leadin; - if (nptr) { - nptr->next = fnode; - } else { - conference->fnode = fnode; - } + memset(&fnode->sh, 0, sizeof(fnode->sh)); + if (switch_core_speech_open(&fnode->sh, + conference->tts_engine, + conference->tts_voice, + conference->rate, + &flags, + conference->pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); + return SWITCH_STATUS_FALSE; + } - /* Begin Generation */ - switch_sleep(200000); - switch_core_speech_feed_tts(&fnode->sh, text, &flags); - switch_mutex_unlock(conference->mutex); + fnode->pool = pool; - status = SWITCH_STATUS_SUCCESS; - } + /* Queue the node */ + switch_mutex_lock(conference->mutex); + for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next); - return status; + if (nptr) { + nptr->next = fnode; + } else { + conference->fnode = fnode; + } + + /* Begin Generation */ + switch_sleep(200000); + switch_core_speech_feed_tts(&fnode->sh, (char *)text, &flags); + switch_mutex_unlock(conference->mutex); + + status = SWITCH_STATUS_SUCCESS; + + return status; } /* execute a callback for every member of the conference */ static void conference_member_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, conf_api_member_cmd_t pfncallback, void *data) { - conference_member_t *member = NULL; + conference_member_t *member = NULL; - if(conference != NULL && stream != NULL && pfncallback != NULL) { - switch_mutex_lock(conference->member_mutex); + assert(conference != NULL); + assert(stream != NULL); + assert(pfncallback != NULL); - for (member = conference->members; member; member = member->next) { - pfncallback(member,stream,data); - } - switch_mutex_unlock(conference->member_mutex); - } + switch_mutex_lock(conference->member_mutex); + + for (member = conference->members; member; member = member->next) { + pfncallback(member, stream, data); + } + + switch_mutex_unlock(conference->member_mutex); + } static void conference_list_pretty(conference_obj_t *conference, switch_stream_handle_t *stream) { - if (conference != NULL && stream != NULL) { - conference_member_t *member = NULL; + conference_member_t *member = NULL; - switch_mutex_lock(conference->member_mutex); -// stream->write_function(stream, "<pre>Current Callers:\n"); + assert(conference != NULL); + assert(stream != NULL); - for (member = conference->members; member; member = member->next) { - switch_channel_t *channel; - switch_caller_profile_t *profile; + switch_mutex_lock(conference->member_mutex); + // stream->write_function(stream, "<pre>Current Callers:\n"); - if (switch_test_flag(member, MFLAG_NOCHANNEL)) { - continue; - } - channel = switch_core_session_get_channel(member->session); - profile = switch_channel_get_caller_profile(channel); + for (member = conference->members; member; member = member->next) { + switch_channel_t *channel; + switch_caller_profile_t *profile; + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + channel = switch_core_session_get_channel(member->session); + profile = switch_channel_get_caller_profile(channel); - stream->write_function(stream, "%u) %s (%s)\n", - member->id, - profile->caller_id_name, - profile->caller_id_number - ); - } - switch_mutex_unlock(conference->member_mutex); - } + stream->write_function(stream, "%u) %s (%s)\n", + member->id, + profile->caller_id_name, + profile->caller_id_number + ); + + } + + switch_mutex_unlock(conference->member_mutex); + } static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim) { - if (conference != NULL && stream != NULL && delim != NULL) { - conference_member_t *member = NULL; + conference_member_t *member = NULL; - switch_mutex_lock(conference->member_mutex); + assert(conference != NULL); + assert(stream != NULL); + assert(delim != NULL); - for (member = conference->members; member; member = member->next) { - switch_channel_t *channel; - switch_caller_profile_t *profile; - char *uuid; - char *name; - uint32_t count = 0; - if (switch_test_flag(member, MFLAG_NOCHANNEL)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "continue\n"); - continue; - } + switch_mutex_lock(conference->member_mutex); - uuid = switch_core_session_get_uuid(member->session); - channel = switch_core_session_get_channel(member->session); - profile = switch_channel_get_caller_profile(channel); - name = switch_channel_get_name(channel); + for (member = conference->members; member; member = member->next) { + switch_channel_t *channel; + switch_caller_profile_t *profile; + char *uuid; + char *name; + uint32_t count = 0; + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "continue\n"); + continue; + } - stream->write_function(stream, "%u%s%s%s%s%s%s%s%s%s", - member->id,delim, - name,delim, - uuid,delim, - profile->caller_id_name,delim, - profile->caller_id_number, delim); + uuid = switch_core_session_get_uuid(member->session); + channel = switch_core_session_get_channel(member->session); + profile = switch_channel_get_caller_profile(channel); + name = switch_channel_get_name(channel); - if (switch_test_flag(member, MFLAG_CAN_HEAR)) { - stream->write_function(stream, "hear"); - count++; - } - if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { - stream->write_function(stream, "%s%s", count ? "|" : "", "speak"); - count++; - } + stream->write_function(stream, "%u%s%s%s%s%s%s%s%s%s", + member->id, delim, + name, delim, + uuid, delim, + profile->caller_id_name, delim, + profile->caller_id_number, delim); - stream->write_function(stream, "%s%d%s%d%s%d\n", - delim, - member->volume_in_level, delim, - member->volume_out_level, delim, - member->energy_level); - } - switch_mutex_unlock(conference->member_mutex); - } + if (switch_test_flag(member, MFLAG_CAN_HEAR)) { + stream->write_function(stream, "hear"); + count++; + } + + if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { + stream->write_function(stream, "%s%s", count ? "|" : "", "speak"); + count++; + } + + stream->write_function(stream, "%s%d%s%d%s%d\n", + delim, + member->volume_in_level, delim, + member->volume_out_level, delim, + member->energy_level); + } + + switch_mutex_unlock(conference->member_mutex); + } -static int conf_api_sub_mute(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); - if (member->conference->muted_sound) { - conference_member_play_file(member, member->conference->muted_sound, 0); - } else { - char msg[512]; + switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); + if (member->conference->muted_sound) { + conference_member_play_file(member, member->conference->muted_sound, 0); + } else { + char msg[512]; - snprintf(msg, sizeof(msg), "Muted"); - conference_member_say(member, msg, 0); - } - if(stream != NULL) { - stream->write_function(stream, "OK mute %u\n", member->id); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + snprintf(msg, sizeof(msg), "Muted"); + conference_member_say(member, msg, 0); + } + if (stream != NULL) { + stream->write_function(stream, "OK mute %u\n", member->id); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); - switch_event_fire(&event); - } - } else { - syntax_err = 1; - } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); + switch_event_fire(&event); + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_unmute(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_unmute(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - switch_set_flag_locked(member, MFLAG_CAN_SPEAK); - if(stream != NULL) { - stream->write_function(stream, "OK unmute %u\n", member->id); - } - if (member->conference->unmuted_sound) { - conference_member_play_file(member, member->conference->unmuted_sound, 0); - } else { - char msg[512]; + switch_set_flag_locked(member, MFLAG_CAN_SPEAK); + if (stream != NULL) { + stream->write_function(stream, "OK unmute %u\n", member->id); + } + if (member->conference->unmuted_sound) { + conference_member_play_file(member, member->conference->unmuted_sound, 0); + } else { + char msg[512]; - snprintf(msg, sizeof(msg), "Un-Muted"); - conference_member_say(member, msg, 0); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + snprintf(msg, sizeof(msg), "Un-Muted"); + conference_member_say(member, msg, 0); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); - switch_event_fire(&event); - } - } else { - syntax_err = 1; - } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); + switch_event_fire(&event); + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_deaf(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_deaf(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - switch_clear_flag_locked(member, MFLAG_CAN_HEAR); - if(stream != NULL) { - stream->write_function(stream, "OK deaf %u\n", member->id); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + switch_clear_flag_locked(member, MFLAG_CAN_HEAR); + if (stream != NULL) { + stream->write_function(stream, "OK deaf %u\n", member->id); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); - switch_event_fire(&event); - } - } else { - syntax_err = 1; - } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); + switch_event_fire(&event); + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_undeaf(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_undeaf(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - switch_set_flag_locked(member, MFLAG_CAN_HEAR); - if(stream != NULL) { - stream->write_function(stream, "OK undeaf %u\n", member->id); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + switch_set_flag_locked(member, MFLAG_CAN_HEAR); + if (stream != NULL) { + stream->write_function(stream, "OK undeaf %u\n", member->id); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); - switch_event_fire(&event); - } - } else { - syntax_err = 1; - } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); + switch_event_fire(&event); + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_kick(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_kick(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - switch_mutex_lock(member->flag_mutex); - switch_clear_flag(member, MFLAG_RUNNING); - switch_set_flag(member, MFLAG_KICKED); - switch_mutex_unlock(member->flag_mutex); - switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); + switch_mutex_lock(member->flag_mutex); + switch_clear_flag(member, MFLAG_RUNNING); + switch_set_flag(member, MFLAG_KICKED); + switch_mutex_unlock(member->flag_mutex); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); - if(stream != NULL) { - stream->write_function(stream, "OK kicked %u\n", member->id); - } + if (stream != NULL) { + stream->write_function(stream, "OK kicked %u\n", member->id); + } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); - switch_event_fire(&event); - } - } else { - syntax_err = 1; - } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); + switch_event_fire(&event); + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_energy(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_energy(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - if (data) { - switch_mutex_lock(member->flag_mutex); - member->energy_level = atoi((char *)data); - switch_mutex_unlock(member->flag_mutex); - } + if (data) { + switch_mutex_lock(member->flag_mutex); + member->energy_level = atoi((char *)data); + switch_mutex_unlock(member->flag_mutex); + } - if(stream != NULL) { - stream->write_function(stream, "Energy %u=%d\n", member->id, member->energy_level); - } + if (stream != NULL) { + stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level); + } - if (data) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (data) { + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level); - switch_event_fire(&event); - } - } - } else { - syntax_err = 1; - } + switch_event_fire(&event); + } + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_volume_in(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_volume_in(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - if (data) { - switch_mutex_lock(member->flag_mutex); - member->volume_in_level = atoi((char *)data); - switch_normalize_volume(member->volume_in_level); - switch_mutex_unlock(member->flag_mutex); - } + if (data) { + switch_mutex_lock(member->flag_mutex); + member->volume_in_level = atoi((char *)data); + switch_normalize_volume(member->volume_in_level); + switch_mutex_unlock(member->flag_mutex); + } - if(stream != NULL) { - stream->write_function(stream, "Volume IN %u=%d\n", member->id, member->volume_in_level); - } - if (data) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (stream != NULL) { + stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level); + } + if (data) { + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level); - switch_event_fire(&event); - } - } - } else { - syntax_err = 1; - } + switch_event_fire(&event); + } + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_volume_out(conference_member_t *member, switch_stream_handle_t *stream, void *data) +static switch_status_t conf_api_sub_volume_out(conference_member_t *member, switch_stream_handle_t *stream, void *data) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (member != NULL) { - switch_event_t *event; + if (member != NULL) { + switch_event_t *event; - if (data) { - switch_mutex_lock(member->flag_mutex); - member->volume_out_level = atoi((char *)data); - switch_normalize_volume(member->volume_out_level); - switch_mutex_unlock(member->flag_mutex); - } + if (data) { + switch_mutex_lock(member->flag_mutex); + member->volume_out_level = atoi((char *)data); + switch_normalize_volume(member->volume_out_level); + switch_mutex_unlock(member->flag_mutex); + } - if(stream != NULL) { - stream->write_function(stream, "Volume OUT %u=%d\n", member->id, member->volume_out_level); - } + if (stream != NULL) { + stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level); + } - if (data) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (data) { + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level); - switch_event_fire(&event); - } - } - } else { - syntax_err = 1; - } + switch_event_fire(&event); + } + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_list(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_list(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 1; + int ret_status = SWITCH_STATUS_GENERR; - switch_hash_index_t *hi; - void *val; - char *d = ";"; - int pretty = 0; - int argofs = (argc >= 2 && strcasecmp(argv[1],"list") == 0); // detect being called from chat vs. api + switch_hash_index_t *hi; + void *val; + char *d = ";"; + int pretty = 0; + int argofs = (argc >= 2 && strcasecmp(argv[1], "list") == 0); // detect being called from chat vs. api - if (argv[1+argofs]) { - if (argv[2+argofs] && !strcasecmp(argv[1+argofs], "delim")) { - d = argv[2+argofs]; + if (argv[1+argofs]) { + if (argv[2+argofs] && !strcasecmp(argv[1+argofs], "delim")) { + d = argv[2+argofs]; - if (*d == '"') { - if (++d) { - char *p; - if ((p = strchr(d, '"'))) { - *p = '\0'; - } - } else { - d = ";"; - } - } - } else if (strcasecmp(argv[1+argofs], "pretty") == 0) { - pretty = 1; - } - } + if (*d == '"') { + if (++d) { + char *p; + if ((p = strchr(d, '"'))) { + *p = '\0'; + } + } else { + d = ";"; + } + } + } else if (strcasecmp(argv[1+argofs], "pretty") == 0) { + pretty = 1; + } + } - if (conference == NULL) { - for (hi = switch_hash_first(globals.conference_pool, globals.conference_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); - conference = (conference_obj_t *) val; + if (conference == NULL) { + for (hi = switch_hash_first(globals.conference_pool, globals.conference_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + conference = (conference_obj_t *) val; - stream->write_function(stream, "Conference %s (%u member%s)\n", - conference->name, - conference->count, - conference->count == 1 ? "" : ""); - if (pretty) { - conference_list_pretty(conference, stream); - } else { - conference_list(conference, stream, d); - } - } - } else { - if (pretty) { - conference_list_pretty(conference, stream); - } else { - conference_list(conference, stream, d); - } - } + stream->write_function(stream, "Conference %s (%u member%s)\n", + conference->name, + conference->count, + conference->count == 1 ? "" : "s"); + if (pretty) { + conference_list_pretty(conference, stream); + } else { + conference_list(conference, stream, d); + } + } + } else { + if (pretty) { + conference_list_pretty(conference, stream); + } else { + conference_list(conference, stream, d); + } + } - syntax_err = 0; + ret_status = SWITCH_STATUS_SUCCESS; - return syntax_err; + return ret_status; } -static int conf_api_sub_play(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_play(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 1; + int ret_status = SWITCH_STATUS_GENERR; + switch_event_t *event; - if (conference != NULL && stream != NULL) { - switch_event_t *event; + assert(conference != NULL); + assert(stream != NULL); - if (argc == 3) { - if (conference_play_file(conference, argv[2], 0, NULL) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "(play) Playing file %s\n", argv[2]); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "play-file"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", argv[2]); - switch_event_fire(&event); - } - } else { - stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)"); - } - syntax_err = 0; - } else if (argc == 4) { - uint32_t id = atoi(argv[3]); - conference_member_t *member; + + if (argc == 3) { + if (conference_play_file(conference, argv[2], 0, NULL) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "(play) Playing file %s\n", argv[2]); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "play-file"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", argv[2]); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)"); + } + ret_status = SWITCH_STATUS_SUCCESS; + } else if (argc == 4) { + uint32_t id = atoi(argv[3]); + conference_member_t *member; - if ((member = conference_member_get(conference, id))) { - if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "(play) Playing file %s to member %u\n", argv[2], id); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", argv[2]); - switch_event_fire(&event); - } - } else { - stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)"); - } - syntax_err = 0; - } else { - stream->write_function(stream, "Member: %u not found.\n", id); - } - } - } + if ((member = conference_member_get(conference, id))) { + if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "(play) Playing file %s to member %u\n", argv[2], id); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", argv[2]); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)"); + } + ret_status = SWITCH_STATUS_SUCCESS; + } else { + stream->write_function(stream, "Member: %u not found.\n", id); + } + } - return syntax_err; + return ret_status; } -static int conf_api_sub_say(conference_obj_t *conference, switch_stream_handle_t *stream, char *text) +static switch_status_t conf_api_sub_say(conference_obj_t *conference, switch_stream_handle_t *stream, const char *text) { - int syntax_err = 1; + int ret_status = SWITCH_STATUS_GENERR; - if (conference != NULL && stream != NULL) { - if (!switch_strlen_zero(text)) { - if (conference_say(conference, text, 0) == SWITCH_STATUS_SUCCESS) { - switch_event_t *event; + if (switch_strlen_zero(text)) { + stream->write_function(stream, "(say) Error! No text."); + return ret_status; + } - stream->write_function(stream, "(say) OK\n"); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", text); - switch_event_fire(&event); - } - } else { - stream->write_function(stream, "(say) Error!"); - } - syntax_err = 0; - } else { - stream->write_function(stream, "(say) Error! No text."); - } - } + if (conference_say(conference, text, 0) == SWITCH_STATUS_SUCCESS) { + switch_event_t *event; - return syntax_err; + stream->write_function(stream, "(say) OK\n"); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); + switch_event_fire(&event); + } + ret_status = SWITCH_STATUS_SUCCESS; + } else { + stream->write_function(stream, "(say) Error!"); + } + + return ret_status; } -static int conf_api_sub_saymember(conference_obj_t *conference, switch_stream_handle_t *stream, char *text) +static switch_status_t conf_api_sub_saymember(conference_obj_t *conference, switch_stream_handle_t *stream, const char *text) { - int syntax_err = 1; + int ret_status = SWITCH_STATUS_GENERR; + char *expanded = NULL; + char *start_text = NULL; + char *workspace = NULL; + uint32_t id = 0; + conference_member_t *member; - if (conference != NULL) { - if (!switch_strlen_zero(text)) { - char *name = strdup(text); - uint32_t id = 0; - conference_member_t *member; + if (switch_strlen_zero(text)) { + stream->write_function(stream, "(saymember) No Text!\n"); + goto done; + } - if (!switch_strlen_zero(name)) { - text = strchr(name, ' '); - *name = '\0'; - id = atoi(name); - free(name); - } + if (!(workspace = strdup(text))) { + stream->write_function(stream, "(saymember) Memory Error!\n"); + goto done; + } - if (id != 0 && (member = conference_member_get(conference, id))) { - if (text && conference_member_say(member, text, 0) == SWITCH_STATUS_SUCCESS) { - switch_event_t *event; + if ((start_text = strchr(workspace, ' '))) { + *start_text++ = '\0'; + text = start_text; + } - stream->write_function(stream, "(saymember) OK\n"); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", text); - switch_event_fire(&event); - } - } else { - stream->write_function(stream, "(saymember) Error!"); - } - syntax_err = 0; - } else { - stream->write_function(stream, "(saymember) Unknown Member %u!", id); - } - } - } + id = atoi(workspace); - return syntax_err; + if (!id || switch_strlen_zero(text)) { + stream->write_function(stream, "(saymember) No Text!\n"); + goto done; + } + + if (!(member = conference_member_get(conference, id))) { + stream->write_function(stream, "(saymember) Unknown Member %u!", id); + goto done; + } + + if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), (char *)text)) != text) { + text = expanded; + } else { + expanded = NULL; + } + + if (text && conference_member_say(member, (char *)text, 0) == SWITCH_STATUS_SUCCESS) { + switch_event_t *event; + + stream->write_function(stream, "(saymember) OK\n"); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); + switch_event_fire(&event); + } + ret_status = SWITCH_STATUS_SUCCESS; + } else { + stream->write_function(stream, "(saymember) Error!"); + } + + done: + switch_safe_free(workspace); + switch_safe_free(expanded); + return ret_status; } -static int conf_api_sub_stop(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_stop(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 1; + int ret_status = SWITCH_STATUS_GENERR; + uint8_t current = 0, all = 0; - if (conference != NULL) { - uint8_t current = 0, all = 0; + assert(conference != NULL); + assert(stream != NULL); - if (argc > 2) { - current = strcasecmp(argv[2], "current") ? 0 : 1; - all = strcasecmp(argv[2], "all") ? 0 : 1; - } + if (argc > 2) { + current = strcasecmp(argv[2], "current") ? 0 : 1; + all = strcasecmp(argv[2], "all") ? 0 : 1; + } - if (current || all) { - if (argc == 4) { - uint32_t id = atoi(argv[3]); - conference_member_t *member; + if (current || all) { + if (argc == 4) { + uint32_t id = atoi(argv[3]); + conference_member_t *member; - if ((member = conference_member_get(conference, id))) { - uint32_t stopped = conference_member_stop_file(member, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); - stream->write_function(stream, "Stopped %u files.\n", stopped); - } else { - stream->write_function(stream, "Member: %u not found.\n", id); - } - syntax_err = 0; - } else { - uint32_t stopped = conference_stop_file(conference, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); - stream->write_function(stream, "Stopped %u files.\n", stopped); - syntax_err = 0; - } - } - } + if ((member = conference_member_get(conference, id))) { + uint32_t stopped = conference_member_stop_file(member, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); + stream->write_function(stream, "Stopped %u files.\n", stopped); + } else { + stream->write_function(stream, "Member: %u not found.\n", id); + } + ret_status = SWITCH_STATUS_SUCCESS; + } else { + uint32_t stopped = conference_stop_file(conference, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); + stream->write_function(stream, "Stopped %u files.\n", stopped); + ret_status = SWITCH_STATUS_SUCCESS; + } + } - return syntax_err; + return ret_status; } -static int conf_api_sub_relate(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_relate(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 1; + int ret_status = SWITCH_STATUS_GENERR; - if (conference != NULL && stream != NULL) { - if (argc > 4) { - uint8_t nospeak = 0, nohear = 0, clear = 0; - nospeak = strstr(argv[4], "nospeak") ? 1 : 0; - nohear = strstr(argv[4], "nohear") ? 1 : 0; + assert(conference != NULL); + assert(stream != NULL); - if (!strcasecmp(argv[4], "clear")) { - clear = 1; - } + if (argc > 4) { + uint8_t nospeak = 0, nohear = 0, clear = 0; + nospeak = strstr(argv[4], "nospeak") ? 1 : 0; + nohear = strstr(argv[4], "nohear") ? 1 : 0; - if (!(clear || nospeak || nohear)) { - syntax_err = 1; - goto done; - } - syntax_err = 0; + if (!strcasecmp(argv[4], "clear")) { + clear = 1; + } - if (clear) { - conference_member_t *member = NULL; - uint32_t id = atoi(argv[2]); - uint32_t oid = atoi(argv[3]); + if (!(clear || nospeak || nohear)) { + ret_status = SWITCH_STATUS_GENERR; + goto done; + } + ret_status = SWITCH_STATUS_SUCCESS; - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); - if ((member = conference_member_get(conference, id))) { - member_del_relationship(member, oid); - stream->write_function(stream, "relationship %u->%u cleared.", id, oid); - } else { - stream->write_function(stream, "relationship %u->%u not found", id, oid); - } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); - } else if (nospeak || nohear) { - conference_member_t *member = NULL, *other_member = NULL; - uint32_t id = atoi(argv[2]); - uint32_t oid = atoi(argv[3]); + if (clear) { + conference_member_t *member = NULL; + uint32_t id = atoi(argv[2]); + uint32_t oid = atoi(argv[3]); - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); - if ((member = conference_member_get(conference, id)) && (other_member = conference_member_get(conference, oid))) { - conference_relationship_t *rel = NULL; - if ((rel = member_get_relationship(member, other_member))) { - rel->flags = 0; - } else { - rel = member_add_relationship(member, oid); - } + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + if ((member = conference_member_get(conference, id))) { + member_del_relationship(member, oid); + stream->write_function(stream, "relationship %u->%u cleared.", id, oid); + } else { + stream->write_function(stream, "relationship %u->%u not found", id, oid); + } + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + } else if (nospeak || nohear) { + conference_member_t *member = NULL, *other_member = NULL; + uint32_t id = atoi(argv[2]); + uint32_t oid = atoi(argv[3]); - if (rel) { - switch_set_flag(rel, RFLAG_CAN_SPEAK | RFLAG_CAN_HEAR); - if (nospeak) { - switch_clear_flag(rel, RFLAG_CAN_SPEAK); - } - if (nohear) { - switch_clear_flag(rel, RFLAG_CAN_HEAR); - } - stream->write_function(stream, "ok %u->%u set\n", id, oid); - } else { - stream->write_function(stream, "error!\n"); - } - } else { - stream->write_function(stream, "relationship %u->%u not found", id, oid); - } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); - } - } - } + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + if ((member = conference_member_get(conference, id)) && (other_member = conference_member_get(conference, oid))) { + conference_relationship_t *rel = NULL; + if ((rel = member_get_relationship(member, other_member))) { + rel->flags = 0; + } else { + rel = member_add_relationship(member, oid); + } -done: - return syntax_err; + if (rel) { + switch_set_flag(rel, RFLAG_CAN_SPEAK | RFLAG_CAN_HEAR); + if (nospeak) { + switch_clear_flag(rel, RFLAG_CAN_SPEAK); + } + if (nohear) { + switch_clear_flag(rel, RFLAG_CAN_HEAR); + } + stream->write_function(stream, "ok %u->%u set\n", id, oid); + } else { + stream->write_function(stream, "error!\n"); + } + } else { + stream->write_function(stream, "relationship %u->%u not found", id, oid); + } + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + } + } + + done: + return ret_status; } -static int conf_api_sub_lock(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_lock(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - if (conference != NULL && stream != NULL) { - switch_event_t *event; + switch_event_t *event; - switch_set_flag_locked(conference, CFLAG_LOCKED); - stream->write_function(stream, "OK %s locked\n", argv[0]); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "lock"); - switch_event_fire(&event); - } - } + assert(conference != NULL); + assert(stream != NULL); - return 0; + switch_set_flag_locked(conference, CFLAG_LOCKED); + stream->write_function(stream, "OK %s locked\n", argv[0]); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "lock"); + switch_event_fire(&event); + } + + return 0; } -static int conf_api_sub_unlock(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_unlock(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - if (conference != NULL && stream != NULL) { - switch_event_t *event; + switch_event_t *event; - switch_clear_flag_locked(conference, CFLAG_LOCKED); - stream->write_function(stream, "OK %s unlocked\n", argv[0]); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); - switch_event_fire(&event); - } - } + assert(conference != NULL); + assert(stream != NULL); - return 0; + switch_clear_flag_locked(conference, CFLAG_LOCKED); + stream->write_function(stream, "OK %s unlocked\n", argv[0]); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); + switch_event_fire(&event); + } + + + return 0; } -static int conf_api_sub_dial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_dial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (conference != NULL && stream != NULL) { - if (argc > 2) { - conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); - stream->write_function(stream, "OK\n"); - } else { - syntax_err = 1; - } - } + assert(conference != NULL); + assert(stream != NULL); - return syntax_err; + if (argc > 2) { + conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); + stream->write_function(stream, "OK\n"); + } else { + ret_status = SWITCH_STATUS_GENERR; + } + + return ret_status; } -static int conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (conference != NULL && stream != NULL) { - if (argc > 3 && !switch_strlen_zero(argv[2])) { - int x; + assert(conference != NULL); + assert(stream != NULL); - for (x=3; x<argc; x++) { - conference_member_t *member = NULL; - uint32_t id = atoi(argv[x]); - conference_obj_t *new_conference = NULL; - switch_channel_t *channel; - switch_event_t *event; - char *profile_name; - switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; + if (argc > 3 && !switch_strlen_zero(argv[2])) { + int x; - if (!(member = conference_member_get(conference, id))) { - stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); - continue; - } + for (x = 3; x<argc; x++) { + conference_member_t *member = NULL; + uint32_t id = atoi(argv[x]); + conference_obj_t *new_conference = NULL; + switch_channel_t *channel; + switch_event_t *event; + char *profile_name; + switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; - channel = switch_core_session_get_channel(member->session); + if (!(member = conference_member_get(conference, id))) { + stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); + continue; + } - /* build a new conference if it doesn't exist */ - if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[2]))) { - switch_memory_pool_t *pool = NULL; - char *conf_name; - conf_xml_cfg_t xml_cfg; + channel = switch_core_session_get_channel(member->session); - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - goto done; - } + /* build a new conference if it doesn't exist */ + if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[2]))) { + switch_memory_pool_t *pool = NULL; + char *conf_name; + conf_xml_cfg_t xml_cfg = {0}; - conf_name = switch_core_strdup(pool, argv[2]); + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + goto done; + } - if ((profile_name = strchr(conf_name, '@'))) { - *profile_name++ = '\0'; + conf_name = switch_core_strdup(pool, argv[2]); - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } + if ((profile_name = strchr(conf_name, '@'))) { + *profile_name++ = '\0'; - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } + + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT - xml_cfg.menus = switch_xml_child(cfg, "menus"); + xml_cfg.menus = switch_xml_child(cfg, "menus"); #endif - } + } - /* Release the config registry handle */ - if (cxml) { - switch_xml_free(cxml); - cxml = NULL; - } + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + cxml = NULL; + } - /* Create the conference object. */ - new_conference = conference_new(conf_name, xml_cfg, pool); + /* Create the conference object. */ + new_conference = conference_new(conf_name, xml_cfg, pool); - if (!new_conference) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - if (pool != NULL) { - switch_core_destroy_memory_pool(&pool); - } - goto done; - } + if (!new_conference) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + if (pool != NULL) { + switch_core_destroy_memory_pool(&pool); + } + goto done; + } - /* Set the minimum number of members (once you go above it you cannot go below it) */ - new_conference->min = 1; + /* Set the minimum number of members (once you go above it you cannot go below it) */ + new_conference->min = 1; - /* Indicate the conference is dynamic */ - switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); + /* Indicate the conference is dynamic */ + switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); - /* Start the conference thread for this conference */ - launch_conference_thread(new_conference); - } + /* Start the conference thread for this conference */ + launch_conference_thread(new_conference); + } - /* move the member from the old conference to the new one */ - conference_del_member(member->last_conference, member); - conference_add_member(new_conference, member); + /* move the member from the old conference to the new one */ + conference_del_member(member->last_conference, member); + conference_add_member(new_conference, member); - stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]); + stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]); - /* tell them what happened */ - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); - switch_event_fire(&event); - } - } - } else { - syntax_err = 1; - } - } -done: - return syntax_err; + /* tell them what happened */ + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); + switch_event_fire(&event); + } + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } + + done: + return ret_status; } -static int conf_api_sub_record(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_record(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + assert(conference != NULL); + assert(stream != NULL); - if (conference != NULL && stream != NULL) { - if (argc > 2) { - launch_conference_record_thread(conference, argv[2]); - } else { - syntax_err = 1; - } - } + if (argc > 2) { + launch_conference_record_thread(conference, argv[2]); + } else { + ret_status = SWITCH_STATUS_GENERR; + } - return syntax_err; + return ret_status; } -static int conf_api_sub_norecord(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +static switch_status_t conf_api_sub_norecord(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { - int syntax_err = 0; + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - if (conference != NULL && stream != NULL) { - if (argc > 2) { - int all = (strcasecmp(argv[2], "all") == 0 ); + assert(conference != NULL); + assert(stream != NULL); - if(!conference_record_stop(conference, all ? NULL : argv[2]) && !all) { - stream->write_function(stream, "non-existant recording '%s'\n", argv[2]); - } - } else { - syntax_err = 1; - } - } + if (argc > 2) { + int all = (strcasecmp(argv[2], "all") == 0 ); - return syntax_err; + if (!conference_record_stop(conference, all ? NULL : argv[2]) && !all) { + stream->write_function(stream, "non-existant recording '%s'\n", argv[2]); + } + } else { + ret_status = SWITCH_STATUS_GENERR; + } + + return ret_status; } -enum { - CONF_API_SUB_ARGS_SPLIT, - CONF_API_SUB_MEMBER_TARGET, - CONF_API_SUB_ARGS_AS_ONE, -}; - /* API Interface Function sub-commands */ static api_command_t conf_api_sub_commands[] = { - {"list", &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"}, - {"energy", &conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET, "<confname> energy <member_id|all|last> [<newval>]"}, - {"volume in", &conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_in <member_id|all|last> [<newval>]"}, - {"volume out", &conf_api_sub_volume_out, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_out <member_id|all|last> [<newval>]"}, - {"play", &conf_api_sub_play, CONF_API_SUB_ARGS_SPLIT, "<confname> play <file_path> [<member_id>]"}, - {"say", &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, - {"saymember", &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, - {"stop", &conf_api_sub_stop, CONF_API_SUB_MEMBER_TARGET, "<confname> stop <[current|all|last]> [<member_id>]"}, - {"kick", &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"}, - {"mute", &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"}, - {"unmute", &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, - {"deaf", &conf_api_sub_deaf, CONF_API_SUB_MEMBER_TARGET, "<confname> deaf <[member_id|all]|last>"}, - {"undeaf", &conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, - {"relate", &conf_api_sub_relate, CONF_API_SUB_ARGS_SPLIT, "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"}, - {"lock", &conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"}, - {"unlock", &conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, - {"dial", &conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT, "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, - {"transfer", &conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, - {"record", &conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"}, - {"norecord", &conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"}, + {"list", &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"}, + {"energy", &conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET, "<confname> energy <member_id|all|last> [<newval>]"}, + {"volume_in", &conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_in <member_id|all|last> [<newval>]"}, + {"volume_out", &conf_api_sub_volume_out, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_out <member_id|all|last> [<newval>]"}, + {"play", &conf_api_sub_play, CONF_API_SUB_ARGS_SPLIT, "<confname> play <file_path> [<member_id>]"}, + {"say", &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, + {"saymember", &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, + {"stop", &conf_api_sub_stop, CONF_API_SUB_MEMBER_TARGET, "<confname> stop <[current|all|last]> [<member_id>]"}, + {"kick", &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"}, + {"mute", &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"}, + {"unmute", &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, + {"deaf", &conf_api_sub_deaf, CONF_API_SUB_MEMBER_TARGET, "<confname> deaf <[member_id|all]|last>"}, + {"undeaf", &conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, + {"relate", &conf_api_sub_relate, CONF_API_SUB_ARGS_SPLIT, "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"}, + {"lock", &conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"}, + {"unlock", &conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, + {"dial", &conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT, "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, + {"transfer", &conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, + {"record", &conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"}, + {"norecord", &conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"}, }; #define CONFFUNCAPISIZE (sizeof(conf_api_sub_commands)/sizeof(conf_api_sub_commands[0])) -switch_status_t conf_api_dispatch(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv, char *cmdline, int argn) -{ switch_status_t status = SWITCH_STATUS_FALSE; +switch_status_t conf_api_dispatch(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv, const char *cmdline, int argn) +{ + switch_status_t status = SWITCH_STATUS_FALSE; + uint32_t i, found = 0; + assert(conference != NULL); + assert(stream != NULL); - if (conference != NULL) { - int i,found=0; + /* loop through the command table to find a match */ + for (i = 0; i<CONFFUNCAPISIZE && !found; i++) { + if (strcasecmp(argv[argn], conf_api_sub_commands[i].pname) == 0) { + found = 1; + switch(conf_api_sub_commands[i].fntype) { - /* loop through the command table to find a match */ - for (i=0; i<CONFFUNCAPISIZE && !found; i++) { - if (strcasecmp(argv[argn],conf_api_sub_commands[i].pname) == 0) { - found = 1; - switch(conf_api_sub_commands[i].fntype) { + /* commands that we've broken the command line into arguments for */ + case CONF_API_SUB_ARGS_SPLIT: + { conf_api_args_cmd_t pfn = (conf_api_args_cmd_t)conf_api_sub_commands[i].pfnapicmd; - /* commands that we've broken the command line into arguments for */ - case CONF_API_SUB_ARGS_SPLIT: - { conf_api_args_cmd_t pfn = (conf_api_args_cmd_t)conf_api_sub_commands[i].pfnapicmd; + if (pfn(conference, stream, argc, argv) != SWITCH_STATUS_SUCCESS) { + /* command returned error, so show syntax usage */ + stream->write_function(stream, conf_api_sub_commands[i].psyntax); + } + } + break; - if (pfn(conference, stream, argc, argv) != 0) { - /* command returned error, so show syntax usage */ - stream->write_function(stream,conf_api_sub_commands[i].psyntax); - } - } - break; + /* member specific command that can be itteratted */ + case CONF_API_SUB_MEMBER_TARGET: + { + uint32_t id = atoi(argv[argn+1]); + int all = ( id == 0 && strcasecmp(argv[argn+1], "all") == 0 ); + int last = ( id == 0 && strcasecmp(argv[argn+1], "last") == 0 ); - /* member specific command that can be itteratted */ - case CONF_API_SUB_MEMBER_TARGET: - { - uint32_t id = atoi(argv[argn+1]); - int all = ( id == 0 && strcasecmp(argv[argn+1], "all") == 0 ); - int last = ( id == 0 && strcasecmp(argv[argn+1], "last") == 0 ); + if (all) { + conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); + } else if (last) { + conference_member_t *member = NULL; + conference_member_t *last_member = NULL; - if(all) { - conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); - } else if (last) { - conference_member_t *member = NULL; - conference_member_t *last_member = NULL; + switch_mutex_lock(conference->member_mutex); - switch_mutex_lock(conference->member_mutex); + /* find last (oldest) member */ + member = conference->members; + while (member != NULL) { + if (last_member == NULL || member->id > last_member->id) { + last_member = member; + } + member = member->next; + } - /* find last (oldest) member */ - member = conference->members; - while (member != NULL) { - if (last_member == NULL || member->id > last_member->id) { - last_member = member; - } - member = member->next; - } + /* exec functio on last (oldest) member */ + if (last_member != NULL) { + conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; + pfn(last_member, stream, argv[argn+2]); + } - /* exec functio on last (oldest) member */ - if (last_member != NULL) { - conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; - pfn(last_member, stream, argv[argn+2]); - } + switch_mutex_unlock(conference->member_mutex); + } else { + conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; + conference_member_t *member = conference_member_get(conference, id); - switch_mutex_unlock(conference->member_mutex); - } else { - conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; - conference_member_t *member = conference_member_get(conference, id); + if (member != NULL) { + pfn(conference_member_get(conference, id), stream, argv[argn+2]); + } else { + if (id == 0) { + stream->write_function(stream, conf_api_sub_commands[i].psyntax); + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + } + } + } + } + break; - if (member != NULL) { - pfn(conference_member_get(conference, id), stream, argv[argn+2]); - } else { - if (id == 0) { - stream->write_function(stream,conf_api_sub_commands[i].psyntax); - } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); - } - } - } - } - break; + /* commands that deals with all text after command */ + case CONF_API_SUB_ARGS_AS_ONE: + { + conf_api_text_cmd_t pfn = (conf_api_text_cmd_t) conf_api_sub_commands[i].pfnapicmd; + char *start_text; + const char *modified_cmdline = cmdline; + const char *cmd = conf_api_sub_commands[i].pname; - /* commands that deals with all text after command */ - case CONF_API_SUB_ARGS_AS_ONE: - { conf_api_text_cmd_t pfn = (conf_api_text_cmd_t)conf_api_sub_commands[i].pfnapicmd; - char *pstr = cmdline+strlen(conf_api_sub_commands[i].pname)+1; + if ((start_text = strstr(modified_cmdline, cmd))) { + modified_cmdline = start_text + strlen(cmd); + while(modified_cmdline && *modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) { + modified_cmdline++; + } + } + + /* call the command handler */ + if (pfn(conference, stream, modified_cmdline) != SWITCH_STATUS_SUCCESS) { + /* command returned error, so show syntax usage */ + stream->write_function(stream, conf_api_sub_commands[i].psyntax); + } + } + break; + } + } + } - /* advance past all leading white space after command */ - while(*pstr == ' ' || *pstr == '\t') { - pstr++; - } + if (!found) { + stream->write_function(stream, "Confernece command '%s' not found.\n", argv[argn]); + } else { + status = SWITCH_STATUS_SUCCESS; + } - /* call the command handler */ - if (pfn(conference, stream, pstr) != 0) { - /* command returned error, so show syntax usage */ - stream->write_function(stream,conf_api_sub_commands[i].psyntax); - } - } - break; - } - } - } - - if(!found) { - stream->write_function(stream, "Confernece command '%s' not found.\n", argv[argn]); - } else { - status = SWITCH_STATUS_SUCCESS; - } - } - - return status; + return status; } /* API Interface Function */ static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { - char *lbuf = NULL; - switch_status_t status = SWITCH_STATUS_SUCCESS; - char *http = NULL; + char *lbuf = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *http = NULL; + int argc; + char *argv[25] = {0}; - if (session) { - return SWITCH_STATUS_FALSE; - } + if (!buf) { + buf = "help"; + } - if (stream->event) { - http = switch_event_get_header(stream->event, "http-host"); - } + if (session) { + return SWITCH_STATUS_FALSE; + } - if (http) { - /* Output must be to a web browser */ - stream->write_function(stream, "<pre>\n"); - } + if (stream->event) { + http = switch_event_get_header(stream->event, "http-host"); + } - if (buf != NULL && (lbuf = strdup(buf))) { - int argc; - char *argv[25]; + if (http) { + /* Output must be to a web browser */ + stream->write_function(stream, "<pre>\n"); + } - memset(argv,0,sizeof(argv)); - argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!(lbuf = strdup(buf))) { + return status; + } - /* try to find a command to execute */ - if (argc) { - conference_obj_t *conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]); + argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if(conference != NULL) { - if (argc >= 2) { - status = conf_api_dispatch(conference, stream, argc, argv, lbuf, 1); - } else { - stream->write_function(stream,"Conference command, not specified.\nTry 'help'\n"); - } - } else { - /* special case the list command, because it doesn't require a conference argument */ - if (strcasecmp(argv[0],"list") == 0) { - conf_api_sub_list(NULL, stream, argc, argv); - } else if (strcasecmp(argv[0],"help") == 0 || strcasecmp(argv[0],"commands") == 0) { - stream->write_function(stream, "%s\n", conf_api_interface.syntax); - } else { - stream->write_function(stream, "Conference %s not found\n", argv[0]); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); - } - } + /* try to find a command to execute */ + if (argc) { + conference_obj_t *conference = NULL; - } else { - stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n"); - } - } + if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) { + if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); + } - switch_safe_free(lbuf); + if (argc >= 2) { + conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); + } else { + stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); + } - return status; + switch_thread_rwlock_unlock(conference->rwlock); + } else { + /* special case the list command, because it doesn't require a conference argument */ + if (strcasecmp(argv[0], "list") == 0) { + conf_api_sub_list(NULL, stream, argc, argv); + } else if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) { + stream->write_function(stream, "%s\n", conf_api_interface.syntax); + } else { + stream->write_function(stream, "Conference %s not found\n", argv[0]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); + } + } + + } else { + stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n"); + } + + switch_safe_free(lbuf); + + return status; + } /* outbound call bridge progress call state callback handler */ static switch_status_t audio_bridge_on_ring(switch_core_session_t *session) { - switch_channel_t *channel = NULL; + switch_channel_t *channel = NULL; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CUSTOM RING\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CUSTOM RING\n"); - /* put the channel in a passive state so we can loop audio to it */ - switch_channel_set_state(channel, CS_TRANSMIT); - return SWITCH_STATUS_FALSE; + /* put the channel in a passive state so we can loop audio to it */ + switch_channel_set_state(channel, CS_TRANSMIT); + return SWITCH_STATUS_FALSE; } static const switch_state_handler_table_t audio_bridge_peer_state_handlers = { - /*.on_init */ NULL, - /*.on_ring */ audio_bridge_on_ring, - /*.on_execute */ NULL, - /*.on_hangup */ NULL, - /*.on_loopback */ NULL, - /*.on_transmit */ NULL, - /*.on_hold */ NULL, + /*.on_init */ NULL, + /*.on_ring */ audio_bridge_on_ring, + /*.on_execute */ NULL, + /*.on_hangup */ NULL, + /*.on_loopback */ NULL, + /*.on_transmit */ NULL, + /*.on_hold */ NULL, }; /* generate an outbound call from the conference */ -static switch_status_t conference_outcall(conference_obj_t *conference, - switch_core_session_t *session, - char *bridgeto, - uint32_t timeout, - char *flags, - char *cid_name, - char *cid_num) +static switch_status_t conference_outcall(conference_obj_t *conference, + switch_core_session_t *session, + char *bridgeto, + uint32_t timeout, + char *flags, + char *cid_name, + char *cid_num) { - switch_core_session_t *peer_session; - switch_channel_t *peer_channel; - switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_channel_t *caller_channel = NULL; - char appdata[512]; - switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + switch_core_session_t *peer_session; + switch_channel_t *peer_channel; + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_channel_t *caller_channel = NULL; + char appdata[512]; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; - if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); - return SWITCH_STATUS_FALSE; - } + if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); + return SWITCH_STATUS_FALSE; + } - if (session != NULL) { - caller_channel = switch_core_session_get_channel(session); + if (session != NULL) { + caller_channel = switch_core_session_get_channel(session); - } + } - if (switch_strlen_zero(cid_name)) { - cid_name = conference->caller_id_name; - } + if (switch_strlen_zero(cid_name)) { + cid_name = conference->caller_id_name; + } - if (switch_strlen_zero(cid_num)) { - cid_num = conference->caller_id_number; - } + if (switch_strlen_zero(cid_num)) { + cid_num = conference->caller_id_number; + } - /* establish an outbound call leg */ - if (switch_ivr_originate(session, - &peer_session, - &cause, - bridgeto, - timeout, - &audio_bridge_peer_state_handlers, - cid_name, - cid_num, - NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", - switch_channel_cause2str(cause)); - if (caller_channel) { - switch_channel_hangup(caller_channel, cause); - } - goto done; - } + /* establish an outbound call leg */ + if (switch_ivr_originate(session, + &peer_session, + &cause, + bridgeto, + timeout, + &audio_bridge_peer_state_handlers, + cid_name, + cid_num, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", + switch_channel_cause2str(cause)); + if (caller_channel) { + switch_channel_hangup(caller_channel, cause); + } + goto done; + } - peer_channel = switch_core_session_get_channel(peer_session); - assert(peer_channel != NULL); + peer_channel = switch_core_session_get_channel(peer_session); + assert(peer_channel != NULL); - /* make sure the conference still exists */ - if (!switch_test_flag(conference, CFLAG_RUNNING)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference is gone now, nevermind..\n"); - if (caller_channel) { - switch_channel_hangup(caller_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); - } - switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); - goto done; - } + /* make sure the conference still exists */ + if (!switch_test_flag(conference, CFLAG_RUNNING)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference is gone now, nevermind..\n"); + if (caller_channel) { + switch_channel_hangup(caller_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); + } + switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); + goto done; + } - if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) { - switch_channel_answer(caller_channel); - } + if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + switch_channel_answer(caller_channel); + } - /* if the outbound call leg is ready */ - if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { - switch_caller_extension_t *extension = NULL; + /* if the outbound call leg is ready */ + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { + switch_caller_extension_t *extension = NULL; - /* build an extension name object */ - if ((extension = switch_caller_extension_new(peer_session, conference->name, conference->name)) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); - status = SWITCH_STATUS_MEMERR; - goto done; - } - /* add them to the conference */ - if (flags && strcasecmp(flags, "none")) { - snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags); - switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); - } else { - switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference->name); - } + /* build an extension name object */ + if ((extension = switch_caller_extension_new(peer_session, conference->name, conference->name)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + status = SWITCH_STATUS_MEMERR; + goto done; + } + /* add them to the conference */ + if (flags && strcasecmp(flags, "none")) { + snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags); + switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); + } else { + switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference->name); + } - switch_channel_set_caller_extension(peer_channel, extension); - switch_channel_set_state(peer_channel, CS_EXECUTE); + switch_channel_set_caller_extension(peer_channel, extension); + switch_channel_set_state(peer_channel, CS_EXECUTE); - } else { - switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ANSWER); - status = SWITCH_STATUS_FALSE; - goto done; - } + } else { + switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ANSWER); + status = SWITCH_STATUS_FALSE; + goto done; + } -done: - switch_thread_rwlock_unlock(conference->rwlock); - return status; + done: + switch_thread_rwlock_unlock(conference->rwlock); + return status; } /* Play a file */ static switch_status_t conference_local_play_file(switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len) { - uint32_t x = 0; - switch_status_t status = SWITCH_STATUS_SUCCESS; + uint32_t x = 0; + switch_status_t status = SWITCH_STATUS_SUCCESS; - /* generate some space infront of the file to be played */ - for (x = 0; x < leadin; x++) { - switch_frame_t *read_frame; - switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); + /* generate some space infront of the file to be played */ + for (x = 0; x < leadin; x++) { + switch_frame_t *read_frame; + switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); - if (!SWITCH_READ_ACCEPTABLE(status)) { - break; - } - } + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + } - /* if all is well, really play the file */ - if (status == SWITCH_STATUS_SUCCESS) { - status = switch_ivr_play_file(session, NULL, path, NULL, NULL, NULL, 0); - } + /* if all is well, really play the file */ + if (status == SWITCH_STATUS_SUCCESS) { + status = switch_ivr_play_file(session, NULL, path, NULL, NULL, NULL, 0); + } - return status; + return status; } /* Application interface function that is called from the dialplan to join the channel to a conference */ static void conference_function(switch_core_session_t *session, char *data) { - switch_codec_t *read_codec = NULL; - switch_memory_pool_t *pool = NULL, *freepool = NULL; - uint32_t flags = 0; - conference_member_t member = {0}; - conference_obj_t *conference = NULL; - switch_channel_t *channel = NULL; - char *mydata = switch_core_session_strdup(session, data); - char *conf_name = NULL; - char *bridge_prefix = "bridge:"; - char *flags_prefix = "+flags{"; - char *bridgeto = NULL; - char *profile_name = NULL; - switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; - char *flags_str; - member_flag_t uflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; - switch_core_session_message_t msg = {0}; - uint8_t rl = 0, isbr = 0; - char *dpin = NULL; - conf_xml_cfg_t xml_cfg; + switch_codec_t *read_codec = NULL; + switch_memory_pool_t *pool = NULL, *freepool = NULL; + uint32_t flags = 0; + conference_member_t member = {0}; + conference_obj_t *conference = NULL; + switch_channel_t *channel = NULL; + char *mydata = switch_core_session_strdup(session, data); + char *conf_name = NULL; + char *bridge_prefix = "bridge:"; + char *flags_prefix = "+flags{"; + char *bridgeto = NULL; + char *profile_name = NULL; + switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; + char *flags_str; + member_flag_t uflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; + switch_core_session_message_t msg = {0}; + uint8_t rl = 0, isbr = 0; + char *dpin = NULL; + conf_xml_cfg_t xml_cfg = {0}; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); - if (!mydata) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - return; - } + if (!mydata) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return; + } - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - return; - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return; + } - /* Start the conference muted or deaf ? */ - if ((flags_str=strstr(mydata, flags_prefix))) { - char *p; + /* Start the conference muted or deaf ? */ + if ((flags_str = strstr(mydata, flags_prefix))) { + char *p; - *flags_str = '\0'; - flags_str += strlen(flags_prefix); - if ((p = strchr(flags_str, '}'))) { - *p = '\0'; - } + *flags_str = '\0'; + flags_str += strlen(flags_prefix); + if ((p = strchr(flags_str, '}'))) { + *p = '\0'; + } - if (strstr(flags_str, "mute")) { - uflags &= ~MFLAG_CAN_SPEAK; - } else if (strstr(flags_str, "deaf")) { - uflags &= ~MFLAG_CAN_HEAR; - } - } + if (strstr(flags_str, "mute")) { + uflags &= ~MFLAG_CAN_SPEAK; + } else if (strstr(flags_str, "deaf")) { + uflags &= ~MFLAG_CAN_HEAR; + } + } - /* is this a bridging conference ? */ - if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) { - isbr = 1; - mydata += strlen(bridge_prefix); - if ((bridgeto = strchr(mydata, ':'))) { - *bridgeto++ = '\0'; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Config Error!\n"); - goto done; - } - } + /* is this a bridging conference ? */ + if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) { + isbr = 1; + mydata += strlen(bridge_prefix); + if ((bridgeto = strchr(mydata, ':'))) { + *bridgeto++ = '\0'; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Config Error!\n"); + goto done; + } + } - conf_name = mydata; + conf_name = mydata; - /* is there a conference pin ? */ - if ((dpin = strchr(conf_name, '+'))) { - *dpin++ = '\0'; - } + /* is there a conference pin ? */ + if ((dpin = strchr(conf_name, '+'))) { + *dpin++ = '\0'; + } - /* is there profile specification ? */ - if ((profile_name = strchr(conf_name, '@'))) { - *profile_name++ = '\0'; + /* is there profile specification ? */ + if ((profile_name = strchr(conf_name, '@'))) { + *profile_name++ = '\0'; - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT - xml_cfg.menus = switch_xml_child(cfg, "menus"); + xml_cfg.menus = switch_xml_child(cfg, "menus"); #endif - } + } - /* if this is a bridging call, and it's not a duplicate, build a */ - /* conference object, and skip pin handling, and locked checking */ - if (isbr) { - char *uuid = switch_core_session_get_uuid(session); + /* if this is a bridging call, and it's not a duplicate, build a */ + /* conference object, and skip pin handling, and locked checking */ + if (isbr) { + char *uuid = switch_core_session_get_uuid(session); - if (!strcmp(conf_name, "_uuid_")) { - conf_name = uuid; - } + if (!strcmp(conf_name, "_uuid_")) { + conf_name = uuid; + } - if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name); - goto done; - } + if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name); + goto done; + } - /* Create the conference object. */ - conference = conference_new(conf_name, xml_cfg, pool); + /* Create the conference object. */ + conference = conference_new(conf_name, xml_cfg, pool); - if (!conference) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - goto done; - } + if (!conference) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + goto done; + } - /* Set the minimum number of members (once you go above it you cannot go below it) */ - conference->min = 2; + /* Set the minimum number of members (once you go above it you cannot go below it) */ + conference->min = 2; - /* if the dialplan specified a pin, override the profile's value */ - if (dpin) { - conference->pin = switch_core_strdup(conference->pool, dpin); - } + /* if the dialplan specified a pin, override the profile's value */ + if (dpin) { + conference->pin = switch_core_strdup(conference->pool, dpin); + } - /* Indicate the conference is dynamic */ - switch_set_flag_locked(conference, CFLAG_DYNAMIC); + /* Indicate the conference is dynamic */ + switch_set_flag_locked(conference, CFLAG_DYNAMIC); - /* Start the conference thread for this conference */ - launch_conference_thread(conference); + /* Start the conference thread for this conference */ + launch_conference_thread(conference); - } else { - /* if the conference exists, get the pointer to it */ - if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { - freepool = pool; - /* couldn't find the conference, create one */ - } else { - conference = conference_new(conf_name, xml_cfg, pool); + } else { + /* if the conference exists, get the pointer to it */ + if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + freepool = pool; + /* couldn't find the conference, create one */ + } else { + conference = conference_new(conf_name, xml_cfg, pool); - if (!conference) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - goto done; - } + if (!conference) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + goto done; + } - /* if the dialplan specified a pin, override the profile's value */ - if (dpin) { - conference->pin = switch_core_strdup(conference->pool, dpin); - } + /* if the dialplan specified a pin, override the profile's value */ + if (dpin) { + conference->pin = switch_core_strdup(conference->pool, dpin); + } - /* Set the minimum number of members (once you go above it you cannot go below it) */ - conference->min = 1; + /* Set the minimum number of members (once you go above it you cannot go below it) */ + conference->min = 1; - /* Indicate the conference is dynamic */ - switch_set_flag_locked(conference, CFLAG_DYNAMIC); + /* Indicate the conference is dynamic */ + switch_set_flag_locked(conference, CFLAG_DYNAMIC); - /* Start the conference thread for this conference */ - launch_conference_thread(conference); - } + /* Start the conference thread for this conference */ + launch_conference_thread(conference); + } /* acquire a read lock on the thread so it can't leave without us */ if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { @@ -3424,214 +3498,214 @@ } rl++; - /* if this is not an outbound call, deal with conference pins */ - if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin) { - char pin_buf[80] = ""; - int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ - int pin_valid = 0; - switch_status_t status = SWITCH_STATUS_SUCCESS; + /* if this is not an outbound call, deal with conference pins */ + if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin) { + char pin_buf[80] = ""; + int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ + int pin_valid = 0; + switch_status_t status = SWITCH_STATUS_SUCCESS; - /* Answer the channel */ - switch_channel_answer(channel); + /* Answer the channel */ + switch_channel_answer(channel); - while(!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { + while(!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { - /* be friendly */ - if (conference->pin_sound) { - conference_local_play_file(session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); - } - /* wait for them if neccessary */ - if (strlen(pin_buf) < strlen(conference->pin)) { - char *buf = pin_buf + strlen(pin_buf); - char term = '\0'; + /* be friendly */ + if (conference->pin_sound) { + conference_local_play_file(session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + } + /* wait for them if neccessary */ + if (strlen(pin_buf) < strlen(conference->pin)) { + char *buf = pin_buf + strlen(pin_buf); + char term = '\0'; - status = switch_ivr_collect_digits_count(session, - buf, - sizeof(pin_buf) - (unsigned int)strlen(pin_buf), - (unsigned int)strlen(conference->pin) - (unsigned int)strlen(pin_buf), - "#", &term, 10000); - } + status = switch_ivr_collect_digits_count(session, + buf, + sizeof(pin_buf) - (unsigned int)strlen(pin_buf), + (unsigned int)strlen(conference->pin) - (unsigned int)strlen(pin_buf), + "#", &term, 10000); + } - pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0); - if (!pin_valid) { - /* zero the collected pin */ - memset(pin_buf,0,sizeof(pin_buf)); + pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0); + if (!pin_valid) { + /* zero the collected pin */ + memset(pin_buf, 0, sizeof(pin_buf)); - /* more friendliness */ - if (conference->bad_pin_sound) { - conference_local_play_file(session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf)); - } - } - pin_retries --; - } + /* more friendliness */ + if (conference->bad_pin_sound) { + conference_local_play_file(session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf)); + } + } + pin_retries --; + } - if (!pin_valid) { - goto done; - } - } + if (!pin_valid) { + goto done; + } + } - /* don't allow more callers if the conference is locked, unless we invited them */ - if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name); - if (conference->locked_sound) { - /* Answer the channel */ - switch_channel_answer(channel); - conference_local_play_file(session, conference->locked_sound, 20, NULL, 0); - } - goto done; - } - } + /* don't allow more callers if the conference is locked, unless we invited them */ + if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name); + if (conference->locked_sound) { + /* Answer the channel */ + switch_channel_answer(channel); + conference_local_play_file(session, conference->locked_sound, 20, NULL, 0); + } + goto done; + } + } - /* Release the config registry handle */ - if (cxml) { - switch_xml_free(cxml); - cxml = NULL; - } + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + cxml = NULL; + } - /* if we're using "bridge:" make an outbound call and bridge it in */ - if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { - if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { - goto done; - } - } else { - /* if we're not using "bridge:" set the conference answered flag */ - /* and this isn't an outbound channel, answer the call */ - if (!switch_channel_test_flag(channel, CF_OUTBOUND)) - switch_set_flag(conference, CFLAG_ANSWERED); - } + /* if we're using "bridge:" make an outbound call and bridge it in */ + if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { + if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + goto done; + } + } else { + /* if we're not using "bridge:" set the conference answered flag */ + /* and this isn't an outbound channel, answer the call */ + if (!switch_channel_test_flag(channel, CF_OUTBOUND)) + switch_set_flag(conference, CFLAG_ANSWERED); + } - /* Save the original read codec. */ - read_codec = switch_core_session_get_read_codec(session); - member.native_rate = read_codec->implementation->samples_per_second; + /* Save the original read codec. */ + read_codec = switch_core_session_get_read_codec(session); + member.native_rate = read_codec->implementation->samples_per_second; - /* Setup a Signed Linear codec for reading audio. */ - if (switch_core_codec_init(&member.read_codec, - "L16", - NULL, - read_codec->implementation->samples_per_second, - read_codec->implementation->microseconds_per_frame / 1000, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, - pool) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); - flags = 0; - goto done; - } + /* Setup a Signed Linear codec for reading audio. */ + if (switch_core_codec_init(&member.read_codec, + "L16", + NULL, + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", + conference->rate, conference->interval); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", + conference->rate, conference->interval); + flags = 0; + goto done; + } - if (read_codec->implementation->samples_per_second != conference->rate) { - switch_audio_resampler_t **resampler = read_codec->implementation->samples_per_second > conference->rate ? - &member.read_resampler : &member.mux_resampler; + if (read_codec->implementation->samples_per_second != conference->rate) { + switch_audio_resampler_t **resampler = read_codec->implementation->samples_per_second > conference->rate ? + &member.read_resampler : &member.mux_resampler; - switch_resample_create(resampler, - read_codec->implementation->samples_per_second, - read_codec->implementation->samples_per_second * 20, - conference->rate, - conference->rate * 20, - switch_core_session_get_pool(session)); + switch_resample_create(resampler, + read_codec->implementation->samples_per_second, + read_codec->implementation->samples_per_second * 20, + conference->rate, + conference->rate * 20, + switch_core_session_get_pool(session)); - /* Setup an audio buffer for the resampled audio */ - if (switch_buffer_create_dynamic(&member.resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); - goto done; - } - } - /* Setup a Signed Linear codec for writing audio. */ - if (switch_core_codec_init(&member.write_codec, - "L16", - NULL, - conference->rate, - conference->interval, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, - pool) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); - flags = 0; - goto codec_done2; - } + /* Setup an audio buffer for the resampled audio */ + if (switch_buffer_create_dynamic(&member.resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); + goto done; + } + } + /* Setup a Signed Linear codec for writing audio. */ + if (switch_core_codec_init(&member.write_codec, + "L16", + NULL, + conference->rate, + conference->interval, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", + conference->rate, conference->interval); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", + conference->rate, conference->interval); + flags = 0; + goto codec_done2; + } - /* Setup an audio buffer for the incoming audio */ - if (switch_buffer_create_dynamic(&member.audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); - goto codec_done1; - } + /* Setup an audio buffer for the incoming audio */ + if (switch_buffer_create_dynamic(&member.audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); + goto codec_done1; + } - /* Setup an audio buffer for the outgoing audio */ - if (switch_buffer_create_dynamic(&member.mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); - goto codec_done1; - } + /* Setup an audio buffer for the outgoing audio */ + if (switch_buffer_create_dynamic(&member.mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); + goto codec_done1; + } - /* Prepare MUTEXS */ - member.id = next_member_id(); - member.pool = pool; - member.session = session; - switch_mutex_init(&member.flag_mutex, SWITCH_MUTEX_NESTED, pool); - switch_mutex_init(&member.audio_in_mutex, SWITCH_MUTEX_NESTED, pool); - switch_mutex_init(&member.audio_out_mutex, SWITCH_MUTEX_NESTED, pool); + /* Prepare MUTEXS */ + member.id = next_member_id(); + member.pool = pool; + member.session = session; + switch_mutex_init(&member.flag_mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&member.audio_in_mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&member.audio_out_mutex, SWITCH_MUTEX_NESTED, pool); - /* Install our Signed Linear codec so we get the audio in that format */ - switch_core_session_set_read_codec(member.session, &member.read_codec); + /* Install our Signed Linear codec so we get the audio in that format */ + switch_core_session_set_read_codec(member.session, &member.read_codec); - /* Add the caller to the conference */ - if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) { - goto codec_done1; - } - switch_set_flag_locked((&member), MFLAG_RUNNING | uflags); + /* Add the caller to the conference */ + if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) { + goto codec_done1; + } + switch_set_flag_locked((&member), MFLAG_RUNNING | uflags); - msg.from = __FILE__; + msg.from = __FILE__; - /* Tell the channel we are going to be in a bridge */ - msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; - switch_core_session_receive_message(session, &msg); + /* Tell the channel we are going to be in a bridge */ + msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; + switch_core_session_receive_message(session, &msg); - /* Run the confernece loop */ - conference_loop_output(&member); + /* Run the confernece loop */ + conference_loop_output(&member); - /* Tell the channel we are no longer going to be in a bridge */ - msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; - switch_core_session_receive_message(session, &msg); + /* Tell the channel we are no longer going to be in a bridge */ + msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; + switch_core_session_receive_message(session, &msg); - /* Remove the caller from the conference */ - conference_del_member(member.last_conference, &member); + /* Remove the caller from the conference */ + conference_del_member(member.last_conference, &member); - /* Put the original codec back */ - switch_core_session_set_read_codec(member.session, read_codec); + /* Put the original codec back */ + switch_core_session_set_read_codec(member.session, read_codec); - /* Clean Up. codec_done(X): is for error situations after the codecs were setup and done: is for situations before */ -codec_done1: - switch_core_codec_destroy(&member.read_codec); -codec_done2: - switch_core_codec_destroy(&member.write_codec); -done: + /* Clean Up. codec_done(X): is for error situations after the codecs were setup and done: is for situations before */ + codec_done1: + switch_core_codec_destroy(&member.read_codec); + codec_done2: + switch_core_codec_destroy(&member.write_codec); + done: - switch_buffer_destroy(&member.resample_buffer); - switch_buffer_destroy(&member.audio_buffer); - switch_buffer_destroy(&member.mux_buffer); + switch_buffer_destroy(&member.resample_buffer); + switch_buffer_destroy(&member.audio_buffer); + switch_buffer_destroy(&member.mux_buffer); - /* Release the config registry handle */ - if (cxml) { - switch_xml_free(cxml); - } + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + } - if (freepool) { - switch_core_destroy_memory_pool(&freepool); - } + if (freepool) { + switch_core_destroy_memory_pool(&freepool); + } - if (switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) { - switch_ivr_play_file(session, NULL, conference->kicked_sound, NULL, NULL, NULL, 0); - } + if (switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) { + switch_ivr_play_file(session, NULL, conference->kicked_sound, NULL, NULL, NULL, 0); + } - switch_core_session_reset(session); + switch_core_session_reset(session); /* release the readlock */ if (rl) { @@ -3642,801 +3716,818 @@ /* Create a thread for the conference and launch it */ static void launch_conference_thread(conference_obj_t *conference) { - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; - switch_set_flag_locked(conference, CFLAG_RUNNING); - switch_threadattr_create(&thd_attr, conference->pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_mutex_lock(globals.hash_mutex); - switch_core_hash_insert(globals.conference_hash, conference->name, conference); - switch_mutex_unlock(globals.hash_mutex); - switch_thread_create(&thread, thd_attr, conference_thread_run, conference, conference->pool); + switch_set_flag_locked(conference, CFLAG_RUNNING); + switch_threadattr_create(&thd_attr, conference->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_mutex_lock(globals.hash_mutex); + switch_core_hash_insert(globals.conference_hash, conference->name, conference); + switch_mutex_unlock(globals.hash_mutex); + switch_thread_create(&thread, thd_attr, conference_thread_run, conference, conference->pool); } static void launch_conference_record_thread(conference_obj_t *conference, char *path) { - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - switch_memory_pool_t *pool; - conference_record_t *rec; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + switch_memory_pool_t *pool; + conference_record_t *rec; - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + } - /* Create a node object*/ - if (!(rec = switch_core_alloc(pool, sizeof(*rec)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - } + /* Create a node object*/ + if (!(rec = switch_core_alloc(pool, sizeof(*rec)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + } - rec->conference = conference; - rec->path = switch_core_strdup(pool, path); - rec->pool = pool; + rec->conference = conference; + rec->path = switch_core_strdup(pool, path); + rec->pool = pool; - switch_threadattr_create(&thd_attr, rec->pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, conference_record_thread_run, rec, rec->pool); + switch_threadattr_create(&thd_attr, rec->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, conference_record_thread_run, rec, rec->pool); } static const switch_application_interface_t conference_application_interface = { - /*.interface_name */ global_app_name, - /*.application_function */ conference_function, - NULL, NULL, NULL, - /*.next*/ NULL + /*.interface_name */ global_app_name, + /*.application_function */ conference_function, + NULL, NULL, NULL, + /*.next*/ NULL }; static switch_api_interface_t conf_api_interface = { - /*.interface_name */ "conference", - /*.desc */ "Conference module commands", - /*.function */ conf_api_main, - /*.syntax */ /* see switch_module_load, this is built on the fly */ - /*.next */ + /*.interface_name */ "conference", + /*.desc */ "Conference module commands", + /*.function */ conf_api_main, + /*.syntax */ /* see switch_module_load, this is built on the fly */ + /*.next */ }; static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) { - char name[512] = "", *p, *lbuf; - switch_chat_interface_t *ci; - conference_obj_t *conference = NULL; - switch_stream_handle_t stream = {0}; + char name[512] = "", *p, *lbuf; + switch_chat_interface_t *ci; + conference_obj_t *conference = NULL; + switch_stream_handle_t stream = {0}; - if ((p = strchr(to, '+'))) { - to = ++p; - } + if ((p = strchr(to, '+'))) { + to = ++p; + } - if (!body) { - return SWITCH_STATUS_SUCCESS; - } + if (!body) { + return SWITCH_STATUS_SUCCESS; + } - if (!(ci = switch_loadable_module_get_chat_interface(proto))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); - } + if (!(ci = switch_loadable_module_get_chat_interface(proto))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); + } - if ((p = strchr(to, '@'))) { - switch_copy_string(name, to, ++p-to); - } else { - switch_copy_string(name, to, sizeof(name)); - } + if ((p = strchr(to, '@'))) { + switch_copy_string(name, to, ++p-to); + } else { + switch_copy_string(name, to, sizeof(name)); + } - if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, name))) { - ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL); - return SWITCH_STATUS_FALSE; - } + if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, name))) { + ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL); + return SWITCH_STATUS_FALSE; + } - SWITCH_STANDARD_STREAM(stream); + SWITCH_STANDARD_STREAM(stream); - if (body != NULL && (lbuf = strdup(body))) { - int argc; - char *argv[25]; + if (body != NULL && (lbuf = strdup(body))) { + int argc; + char *argv[25]; - memset(argv,0,sizeof(argv)); - argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + memset(argv, 0, sizeof(argv)); + argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - /* try to find a command to execute */ - if (argc) { - /* special case list */ - if (strcasecmp(argv[0],"list") == 0) { - conference_list_pretty(conference, &stream); - /* provide help */ - } else if (strcasecmp(argv[0],"help") == 0 || strcasecmp(argv[0],"commands") == 0) { - stream.write_function(&stream, "%s\n", conf_api_interface.syntax); - /* find a normal command */ - } else { - conf_api_dispatch(conference, &stream, argc, argv, lbuf, 0); - } - } else { - stream.write_function(&stream, "No parameters specified.\nTry 'help'\n"); - } - } - switch_safe_free(lbuf); + /* try to find a command to execute */ + if (argc) { + /* special case list */ + if (strcasecmp(argv[0], "list") == 0) { + conference_list_pretty(conference, &stream); + /* provide help */ + } + else { + if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) { + stream.write_function(&stream, "%s\n", conf_api_interface.syntax); + /* find a normal command */ + } else { + conf_api_dispatch(conference, &stream, argc, argv, (const char *)body, 0); + } + } + } else { + stream.write_function(&stream, "No parameters specified.\nTry 'help'\n"); + } + } + switch_safe_free(lbuf); - ci->chat_send(CONF_CHAT_PROTO, to, from, "", stream.data, NULL); - switch_safe_free(stream.data); + ci->chat_send(CONF_CHAT_PROTO, to, from, "", stream.data, NULL); + switch_safe_free(stream.data); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } static const switch_chat_interface_t conference_chat_interface = { - /*.name */ CONF_CHAT_PROTO, - /*.chat_send */ chat_send, + /*.name */ CONF_CHAT_PROTO, + /*.chat_send */ chat_send, }; static switch_loadable_module_interface_t conference_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ &conference_application_interface, - /*.api_interface */ &conf_api_interface, - /*.file_interface */ NULL, - /*.speech_interface */ NULL, - /*.directory_interface */ NULL, - /*.chat_interface */ &conference_chat_interface + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ &conference_application_interface, + /*.api_interface */ &conf_api_interface, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL, + /*.chat_interface */ &conference_chat_interface }; #ifdef OPTION_IVR_MENU_SUPPORT static switch_ivr_action_t conference_caller_control_menu_handler(switch_ivr_menu_t *menu, char *param, char *buf, size_t buflen, void *obj) { - switch_ivr_action_t action = SWITCH_IVR_ACTION_NOOP; + switch_ivr_action_t action = SWITCH_IVR_ACTION_NOOP; - if (!switch_strlen_zero(param)) { - if (obj != NULL) { - int i,found; - char *action_name = strdup(param); + if (!switch_strlen_zero(param)) { + if (obj != NULL) { + int i, found; + char *action_name = strdup(param); - if (action_name != NULL) { - char *sep = (action_name != NULL ? strchr(action_name,' ') : NULL); + if (action_name != NULL) { + char *sep = (action_name != NULL ? strchr(action_name, ' ') : NULL); - /* split the action from any parameters */ - if (sep != NULL) { - *sep ='\0'; - } + /* split the action from any parameters */ + if (sep != NULL) { + *sep = '\0'; + } - /* find and execute the caller control handler */ - for(i=0,found=0; !found && i<CCFNTBL_QTY; i++) { - found = (ccfntbl[i].action != CALLER_CONTROL_MENU && strcasecmp(ccfntbl[i].key,action_name) == 0); - if (found) { - if (obj != NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "invoking caller control menu action '%s'\n",ccfntbl[i].key); - ccfntbl[i].handler((conference_member_t *)obj, (sep != NULL ? sep+1 : NULL)); - if (ccfntbl[i].action == CALLER_CONTROL_HANGUP) { - action = SWITCH_IVR_ACTION_DIE; - } - } - } - } + /* find and execute the caller control handler */ + for(i = 0, found = 0; !found && i<CCFNTBL_QTY; i++) { + found = (ccfntbl[i].action != CALLER_CONTROL_MENU && strcasecmp(ccfntbl[i].key, action_name) == 0); + if (found) { + if (obj != NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "invoking caller control menu action '%s'\n", ccfntbl[i].key); + ccfntbl[i].handler((conference_member_t *)obj, (sep != NULL ? sep+1 : NULL)); + if (ccfntbl[i].action == CALLER_CONTROL_HANGUP) { + action = SWITCH_IVR_ACTION_DIE; + } + } + } + } - free(action_name); - } + free(action_name); + } - if (!found) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unknown caller control menu action '%s'\n",param); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unable to invoke caller control menu action '%s', NULL member!\n",param); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NULL or empty param!\n"); - } + if (!found) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unknown caller control menu action '%s'\n", param); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unable to invoke caller control menu action '%s', NULL member!\n", param); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NULL or empty param!\n"); + } - return action; + return action; } /* -static switch_status_t ivr_menu_callback_play_file(char *file, uint32_t leadin, void *member) -{ - switch_status_t status; + static switch_status_t ivr_menu_callback_play_file(char *file, uint32_t leadin, void *member) + { + switch_status_t status; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ivr_menu_callback_play_file\n"); - status = conference_member_play_file((conference_member_t *)member, file, leadin); - if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ivr_menu_callback_play_file ERROR\n"); - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ivr_menu_callback_play_file\n"); + status = conference_member_play_file((conference_member_t *)member, file, leadin); + if (status != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ivr_menu_callback_play_file ERROR\n"); + } - return status; -} + return status; + } -static switch_status_t ivr_menu_callback_say(char *file, uint32_t leadin, void *member) -{ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ivr_menu_callback_say\n"); - return conference_member_say((conference_member_t *)member, file, leadin); -} + static switch_status_t ivr_menu_callback_say(char *file, uint32_t leadin, void *member) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ivr_menu_callback_say\n"); + return conference_member_say((conference_member_t *)member, file, leadin); + } */ -static switch_status_t conference_caller_control_menu_build(caller_control_menu_ctx_t **ctx, conference_obj_t *conference, switch_xml_t menu_group, char *menu_name) +static switch_status_t conference_caller_control_menu_build(caller_control_menu_ctx_t **ctx, + conference_obj_t *conference, + switch_xml_t menu_group, + char *menu_name) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_FALSE; + switch_xml_t xml_menus; + switch_xml_t xml_menu; - if (ctx != NULL && conference != NULL && menu_group != NULL && menu_name != NULL) { - switch_xml_t xml_menus = switch_xml_child(menu_group, "menus"); - switch_xml_t xml_menu = (xml_menus != NULL ? switch_xml_find_child(xml_menus, "menu", "name", menu_name) : NULL); + assert(conference != NULL); + assert(ctx != NULL); + assert(menu_group != NULL); + assert(menu_name != NULL); + assert(xml_menus != NULL); - /* if we found the requested menu in our menu_group */ - if (xml_menu != NULL && xml_menu != NULL) { - *ctx = (caller_control_menu_ctx_t *)switch_core_alloc(conference->pool,sizeof(caller_control_menu_ctx_t)); + xml_menus = switch_xml_child(menu_group, "menus"); + xml_menu = (xml_menus != NULL ? switch_xml_find_child(xml_menus, "menu", "name", menu_name) : NULL); - if (*ctx != NULL) { - memset(*ctx,0,sizeof(caller_control_menu_ctx_t)); - /* setup an xml parser context, and a menu stack context for the specified menu in our memory pool */ - status = switch_ivr_menu_stack_xml_init(&(*ctx)->xml_ctx, conference->pool); - if (status == SWITCH_STATUS_SUCCESS) { - (*ctx)->name = switch_core_strdup(conference->pool,menu_name); - /* add our xml menu handler to the xml stack parser */ - status = switch_ivr_menu_stack_xml_add_custom((*ctx)->xml_ctx, "control", &conference_caller_control_menu_handler); - if (status != SWITCH_STATUS_SUCCESS) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to add custom xml handler\n"); + /* if we found the requested menu in our menu_group */ + if (xml_menu != NULL && xml_menu != NULL) { + *ctx = (caller_control_menu_ctx_t *)switch_core_alloc(conference->pool, sizeof(caller_control_menu_ctx_t)); - /* parse the xml stack to build the menu stack */ - status = switch_ivr_menu_stack_xml_build((*ctx)->xml_ctx, &(*ctx)->menu_stack, xml_menus, xml_menu, conference->timer_name); - if (status != SWITCH_STATUS_SUCCESS) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build xml menu stack\n"); + if (*ctx != NULL) { + memset(*ctx, 0, sizeof(caller_control_menu_ctx_t)); -/* - // instruct ivr menu to use our file play and tts routines - status = switch_ivr_menu_set_fileplay_callback((*ctx)->menu_stack, &ivr_menu_callback_play_file); - if (status != SWITCH_STATUS_SUCCESS) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to set file play calback\n"); - status = switch_ivr_menu_set_tts_callback((*ctx)->menu_stack, &ivr_menu_callback_say); - if (status != SWITCH_STATUS_SUCCESS) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to set tts calback\n"); -*/ - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to init xml menu context\n"); - } - if (status != SWITCH_STATUS_SUCCESS) - *ctx = NULL; - } - } else { - if(xml_menus == NULL) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "caller control menu unable to find xml menus\n"); - if(xml_menu == NULL) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "caller control menu unable to find xml menu '%s'\n",menu_name); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "null parameters!\n"); - } + /* setup an xml parser context, and a menu stack context for the specified menu in our memory pool */ + status = switch_ivr_menu_stack_xml_init(&(*ctx)->xml_ctx, conference->pool); + if (status == SWITCH_STATUS_SUCCESS) { + (*ctx)->name = switch_core_strdup(conference->pool, menu_name); - return status; + /* add our xml menu handler to the xml stack parser */ + status = switch_ivr_menu_stack_xml_add_custom((*ctx)->xml_ctx, "control", &conference_caller_control_menu_handler); + if (status != SWITCH_STATUS_SUCCESS) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to add custom xml handler\n"); + + /* parse the xml stack to build the menu stack */ + status = switch_ivr_menu_stack_xml_build((*ctx)->xml_ctx, &(*ctx)->menu_stack, xml_menus, xml_menu, conference->timer_name); + if (status != SWITCH_STATUS_SUCCESS) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build xml menu stack\n"); + + /* + // instruct ivr menu to use our file play and tts routines + status = switch_ivr_menu_set_fileplay_callback((*ctx)->menu_stack, &ivr_menu_callback_play_file); + if (status != SWITCH_STATUS_SUCCESS) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to set file play calback\n"); + status = switch_ivr_menu_set_tts_callback((*ctx)->menu_stack, &ivr_menu_callback_say); + if (status != SWITCH_STATUS_SUCCESS) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to set tts calback\n"); + */ + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to init xml menu context\n"); + } + if (status != SWITCH_STATUS_SUCCESS) + *ctx = NULL; + } + } else { + if (xml_menus == NULL) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "caller control menu unable to find xml menus\n"); + if (xml_menu == NULL) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "caller control menu unable to find xml menu '%s'\n", menu_name); + } + + return status; } #endif -static switch_status_t conference_new_install_caller_controls_default(conference_obj_t *conference) +static switch_status_t conf_default_controls(conference_obj_t *conference) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_FALSE; + uint32_t i; + caller_control_action_t *action; - if(conference != NULL) { - int i; - caller_control_action_t *action; + assert(conference != NULL); - for(i=0,status=SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i<CCFNTBL_QTY; i++) { - if (!switch_strlen_zero(ccfntbl[i].digits)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing default caller control action '%s' bound to '%s'.\n", - ccfntbl[i].key, - ccfntbl[i].digits); - action = (caller_control_action_t *)switch_core_alloc(conference->pool,sizeof(caller_control_action_t)); - if (action != NULL) { - action->fndesc = &ccfntbl[i]; - action->data = NULL; - status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,ccfntbl[i].digits,action); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to alloc memory for caller control binding '%s' to '%s'\n",ccfntbl[i].key,ccfntbl[i].digits); - status = SWITCH_STATUS_MEMERR; - } - } - } - } + for(i = 0, status = SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i<CCFNTBL_QTY; i++) { + if (!switch_strlen_zero(ccfntbl[i].digits)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing default caller control action '%s' bound to '%s'.\n", + ccfntbl[i].key, + ccfntbl[i].digits); + action = (caller_control_action_t *)switch_core_alloc(conference->pool, sizeof(caller_control_action_t)); + if (action != NULL) { + action->fndesc = &ccfntbl[i]; + action->data = NULL; + status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, ccfntbl[i].digits, action); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to alloc memory for caller control binding '%s' to '%s'\n", + ccfntbl[i].key, ccfntbl[i].digits); + status = SWITCH_STATUS_MEMERR; + } + } + } + - return status; + return status; } static switch_status_t conference_new_install_caller_controls_custom(conference_obj_t *conference, switch_xml_t xml_controls, switch_xml_t xml_menus) { - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_FALSE; + switch_xml_t xml_kvp; - if (conference != NULL && xml_controls != NULL) { - switch_xml_t xml_kvp; + assert(conference != NULL); + assert(xml_controls != NULL); - /* parse the controls tree for caller control digit strings */ - for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) { - char *key = (char *) switch_xml_attr(xml_kvp, "action"); - char *val = (char *) switch_xml_attr(xml_kvp, "digits"); - char *data = (char *)switch_xml_attr_soft(xml_kvp, "data"); + /* parse the controls tree for caller control digit strings */ + for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) { + char *key = (char *) switch_xml_attr(xml_kvp, "action"); + char *val = (char *) switch_xml_attr(xml_kvp, "digits"); + char *data = (char *)switch_xml_attr_soft(xml_kvp, "data"); - if(!switch_strlen_zero(key) && !switch_strlen_zero(val)) { - int i; + if (!switch_strlen_zero(key) && !switch_strlen_zero(val)) { + uint32_t i; - /* scan through all of the valid actions, and if found, */ - /* set the new caller control action digit string, then */ - /* stop scanning the table, and go to the next xml kvp. */ - for(i=0,status=SWITCH_STATUS_NOOP; i<CCFNTBL_QTY && status == SWITCH_STATUS_NOOP; i++) { + /* scan through all of the valid actions, and if found, */ + /* set the new caller control action digit string, then */ + /* stop scanning the table, and go to the next xml kvp. */ + for(i = 0, status = SWITCH_STATUS_NOOP; i<CCFNTBL_QTY && status == SWITCH_STATUS_NOOP; i++) { - if(strcasecmp(ccfntbl[i].key,key) == 0) { - status = SWITCH_STATUS_SUCCESS; + if (strcasecmp(ccfntbl[i].key, key) == 0) { + status = SWITCH_STATUS_SUCCESS; #ifdef OPTION_IVR_MENU_SUPPORT - if (xml_menus != NULL && ccfntbl[i].action == CALLER_CONTROL_MENU) { - char *menu_group_name = strdup(data); - char *menu_name = (menu_group_name != NULL ? strchr(menu_group_name,'/') : NULL); + if (xml_menus != NULL && ccfntbl[i].action == CALLER_CONTROL_MENU) { + char *menu_group_name = strdup(data); + char *menu_name = (menu_group_name != NULL ? strchr(menu_group_name, '/') : NULL); - /* format: "menu_group_name/menu_name" */ - /* separate the menu name from the menu group */ - if (menu_name != NULL) { - *(menu_name++) = '\0'; - } - /* if there is a menu name, build the menu */ - if (menu_name != NULL) { - caller_control_menu_ctx_t *menu_ctx = NULL; - switch_xml_t menu_group = switch_xml_find_child(xml_menus, "group", "name", menu_group_name); + /* format: "menu_group_name/menu_name" */ + /* separate the menu name from the menu group */ + if (menu_name != NULL) { + *(menu_name++) = '\0'; + } + /* if there is a menu name, build the menu */ + if (menu_name != NULL) { + caller_control_menu_ctx_t *menu_ctx = NULL; + switch_xml_t menu_group = switch_xml_find_child(xml_menus, "group", "name", menu_group_name); - status = conference_caller_control_menu_build(&menu_ctx, conference, menu_group, menu_name); - data = (char *)menu_ctx; - } else { - status = SWITCH_STATUS_FALSE; - } + status = conference_caller_control_menu_build(&menu_ctx, conference, menu_group, menu_name); + data = (char *)menu_ctx; + } else { + status = SWITCH_STATUS_FALSE; + } - if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build menu '%s' bound to '%s'\n",data,val); - } + if (status != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build menu '%s' bound to '%s'\n", data, val); + } - /* clean up */ - if (menu_group_name != NULL) { - free(menu_group_name); - } - } + /* clean up */ + if (menu_group_name != NULL) { + free(menu_group_name); + } + } #endif - if (status == SWITCH_STATUS_SUCCESS) { - caller_control_action_t *action; + if (status == SWITCH_STATUS_SUCCESS) { + caller_control_action_t *action; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing caller control action '%s' bound to '%s'.\n",key,val); - action = (caller_control_action_t *)switch_core_alloc(conference->pool,sizeof(caller_control_action_t)); - if (action != NULL) { - action->fndesc = &ccfntbl[i]; - action->data = (void *)data; - status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,val,action); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to alloc memory for caller control binding '%s' to '%s'\n",ccfntbl[i].key,ccfntbl[i].digits); - status = SWITCH_STATUS_MEMERR; - } - } - } - } - if(status == SWITCH_STATUS_NOOP) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control action name '%s'.\n",key); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control config entry pair action='%s' digits='%s'\n",key,val); - } - } - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing caller control action '%s' bound to '%s'.\n", key, val); + action = (caller_control_action_t *)switch_core_alloc(conference->pool, sizeof(caller_control_action_t)); + if (action != NULL) { + action->fndesc = &ccfntbl[i]; + action->data = (void *)data; + status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, val, action); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits); + status = SWITCH_STATUS_MEMERR; + } + } + } + } + if (status == SWITCH_STATUS_NOOP) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control action name '%s'.\n", key); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control config entry pair action = '%s' digits = '%s'\n", key, val); + } + } - return status; + return status; } /* create a new conferene with a specific profile */ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool) { - conference_obj_t *conference; - switch_xml_t xml_kvp; - char *rate_name = NULL; - char *interval_name = NULL; - char *timer_name = NULL; - char *domain = NULL; - char *tts_engine = NULL; - char *tts_voice = NULL; - char *enter_sound = NULL; - char *exit_sound = NULL; - char *alone_sound = NULL; - char *ack_sound = NULL; - char *nack_sound = NULL; - char *muted_sound = NULL; - char *unmuted_sound = NULL; - char *locked_sound = NULL; - char *kicked_sound = NULL; - char *pin = NULL; - char *pin_sound = NULL; - char *bad_pin_sound = NULL; - char *energy_level = NULL; - char *caller_id_name = NULL; - char *caller_id_number = NULL; - char *caller_controls = NULL; - uint32_t rate = 8000, interval = 20; - switch_status_t status; + conference_obj_t *conference; + switch_xml_t xml_kvp; + char *rate_name = NULL; + char *interval_name = NULL; + char *timer_name = NULL; + char *domain = NULL; + char *tts_engine = NULL; + char *tts_voice = NULL; + char *enter_sound = NULL; + char *exit_sound = NULL; + char *alone_sound = NULL; + char *ack_sound = NULL; + char *nack_sound = NULL; + char *muted_sound = NULL; + char *unmuted_sound = NULL; + char *locked_sound = NULL; + char *kicked_sound = NULL; + char *pin = NULL; + char *pin_sound = NULL; + char *bad_pin_sound = NULL; + char *energy_level = NULL; + char *caller_id_name = NULL; + char *caller_id_number = NULL; + char *caller_controls = NULL; + uint32_t rate = 8000, interval = 20; + switch_status_t status; - /* Validate the conference name */ - if (switch_strlen_zero(name)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Record! no name.\n"); - return NULL; - } + /* Validate the conference name */ + if (switch_strlen_zero(name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Record! no name.\n"); + return NULL; + } - /* parse the profile tree for param values */ - for (xml_kvp = switch_xml_child(cfg.profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) { - char *var = (char *) switch_xml_attr_soft(xml_kvp, "name"); - char *val = (char *) switch_xml_attr_soft(xml_kvp, "value"); - char buf[128] = ""; - char *p; + /* parse the profile tree for param values */ + for (xml_kvp = switch_xml_child(cfg.profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) { + char *var = (char *) switch_xml_attr_soft(xml_kvp, "name"); + char *val = (char *) switch_xml_attr_soft(xml_kvp, "value"); + char buf[128] = ""; + char *p; - if ((p = strchr(var, '_'))) { - switch_copy_string(buf, var, sizeof(buf)); - for(p = buf; *p; p++) { - if (*p == '_') { - *p = '-'; - } - } - var = buf; - } + if ((p = strchr(var, '_'))) { + switch_copy_string(buf, var, sizeof(buf)); + for(p = buf; *p; p++) { + if (*p == '_') { + *p = '-'; + } + } + var = buf; + } - if (!strcasecmp(var, "rate")) { - rate_name = val; - } else if (!strcasecmp(var, "domain")) { - domain = val; - } else if (!strcasecmp(var, "interval")) { - interval_name= val; - } else if (!strcasecmp(var, "timer-name")) { - timer_name= val; - } else if (!strcasecmp(var, "tts-engine")) { - tts_engine= val; - } else if (!strcasecmp(var, "tts-voice")) { - tts_voice= val; - } else if (!strcasecmp(var, "enter-sound")) { - enter_sound = val; - } else if (!strcasecmp(var, "exit-sound")) { - exit_sound = val; - } else if (!strcasecmp(var, "alone-sound")) { - alone_sound = val; - } else if (!strcasecmp(var, "ack-sound")) { - ack_sound = val; - } else if (!strcasecmp(var, "nack-sound")) { - nack_sound = val; - } else if (!strcasecmp(var, "muted-sound")) { - muted_sound = val; - } else if (!strcasecmp(var, "unmuted-sound")) { - unmuted_sound = val; - } else if (!strcasecmp(var, "locked-sound")) { - locked_sound= val; - } else if (!strcasecmp(var, "kicked-sound")) { - kicked_sound = val; - } else if (!strcasecmp(var, "pin")) { - pin = val; - } else if (!strcasecmp(var, "pin-sound")) { - pin_sound = val; - } else if (!strcasecmp(var, "bad-pin-sound")) { - bad_pin_sound = val; - } else if (!strcasecmp(var, "energy-level")) { - energy_level = val; - } else if (!strcasecmp(var, "caller-id-name")) { - caller_id_name = val; - } else if (!strcasecmp(var, "caller-id-number")) { - caller_id_number = val; - } else if (!strcasecmp(var, "caller-controls")) { - caller_controls = val; - } - } + if (!strcasecmp(var, "rate")) { + rate_name = val; + } else if (!strcasecmp(var, "domain")) { + domain = val; + } else if (!strcasecmp(var, "interval")) { + interval_name = val; + } else if (!strcasecmp(var, "timer-name")) { + timer_name = val; + } else if (!strcasecmp(var, "tts-engine")) { + tts_engine = val; + } else if (!strcasecmp(var, "tts-voice")) { + tts_voice = val; + } else if (!strcasecmp(var, "enter-sound")) { + enter_sound = val; + } else if (!strcasecmp(var, "exit-sound")) { + exit_sound = val; + } else if (!strcasecmp(var, "alone-sound")) { + alone_sound = val; + } else if (!strcasecmp(var, "ack-sound")) { + ack_sound = val; + } else if (!strcasecmp(var, "nack-sound")) { + nack_sound = val; + } else if (!strcasecmp(var, "muted-sound")) { + muted_sound = val; + } else if (!strcasecmp(var, "unmuted-sound")) { + unmuted_sound = val; + } else if (!strcasecmp(var, "locked-sound")) { + locked_sound = val; + } else if (!strcasecmp(var, "kicked-sound")) { + kicked_sound = val; + } else if (!strcasecmp(var, "pin")) { + pin = val; + } else if (!strcasecmp(var, "pin-sound")) { + pin_sound = val; + } else if (!strcasecmp(var, "bad-pin-sound")) { + bad_pin_sound = val; + } else if (!strcasecmp(var, "energy-level")) { + energy_level = val; + } else if (!strcasecmp(var, "caller-id-name")) { + caller_id_name = val; + } else if (!strcasecmp(var, "caller-id-number")) { + caller_id_number = val; + } else if (!strcasecmp(var, "caller-controls")) { + caller_controls = val; + } + } - /* Set defaults and various paramaters */ + /* Set defaults and various paramaters */ - /* Speed in hertz */ - if (!switch_strlen_zero(rate_name)) { - uint32_t r = atoi(rate_name); - if (r) { - rate = r; - } - } + /* Speed in hertz */ + if (!switch_strlen_zero(rate_name)) { + uint32_t r = atoi(rate_name); + if (r) { + rate = r; + } + } - /* Packet Interval in milliseconds */ - if (!switch_strlen_zero(interval_name)) { - uint32_t i = atoi(interval_name); - if (i) { - interval = i; - } - } + /* Packet Interval in milliseconds */ + if (!switch_strlen_zero(interval_name)) { + uint32_t i = atoi(interval_name); + if (i) { + interval = i; + } + } - /* Timer module to use */ - if (switch_strlen_zero(timer_name)) { - timer_name = "soft"; - } + /* Timer module to use */ + if (switch_strlen_zero(timer_name)) { + timer_name = "soft"; + } - /* Caller ID Name */ - if (switch_strlen_zero(caller_id_name)) { - caller_id_name = (char *) global_app_name; - } + /* Caller ID Name */ + if (switch_strlen_zero(caller_id_name)) { + caller_id_name = (char *) global_app_name; + } - /* Caller ID Number */ - if (switch_strlen_zero(caller_id_number)) { - caller_id_number = "0000000000"; - } + /* Caller ID Number */ + if (switch_strlen_zero(caller_id_number)) { + caller_id_number = "0000000000"; + } - if (!pool) { - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - status = SWITCH_STATUS_TERM; - return NULL; - } - } + if (!pool) { + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + status = SWITCH_STATUS_TERM; + return NULL; + } + } - /* Create the conference object. */ - if (!(conference = switch_core_alloc(pool, sizeof(*conference)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - status = SWITCH_STATUS_TERM; - return NULL; - } + /* Create the conference object. */ + if (!(conference = switch_core_alloc(pool, sizeof(*conference)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + status = SWITCH_STATUS_TERM; + return NULL; + } - /* initialize the conference object with settings from the specified profile */ - conference->pool = pool; - conference->timer_name = switch_core_strdup(conference->pool, timer_name); - conference->tts_engine = switch_core_strdup(conference->pool, tts_engine); - conference->tts_voice = switch_core_strdup(conference->pool, tts_voice); + /* initialize the conference object with settings from the specified profile */ + conference->pool = pool; + conference->timer_name = switch_core_strdup(conference->pool, timer_name); + conference->tts_engine = switch_core_strdup(conference->pool, tts_engine); + conference->tts_voice = switch_core_strdup(conference->pool, tts_voice); - conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name); - conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number); + conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name); + conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number); - if (!switch_strlen_zero(enter_sound)) { - conference->enter_sound = switch_core_strdup(conference->pool, enter_sound); - } + if (!switch_strlen_zero(enter_sound)) { + conference->enter_sound = switch_core_strdup(conference->pool, enter_sound); + } - if (!switch_strlen_zero(exit_sound)) { - conference->exit_sound = switch_core_strdup(conference->pool, exit_sound); - } + if (!switch_strlen_zero(exit_sound)) { + conference->exit_sound = switch_core_strdup(conference->pool, exit_sound); + } - if (!switch_strlen_zero(ack_sound)) { - conference->ack_sound = switch_core_strdup(conference->pool, ack_sound); - } + if (!switch_strlen_zero(ack_sound)) { + conference->ack_sound = switch_core_strdup(conference->pool, ack_sound); + } - if (!switch_strlen_zero(nack_sound)) { - conference->nack_sound = switch_core_strdup(conference->pool, nack_sound); - } + if (!switch_strlen_zero(nack_sound)) { + conference->nack_sound = switch_core_strdup(conference->pool, nack_sound); + } - if (!switch_strlen_zero(muted_sound)) { - conference->muted_sound = switch_core_strdup(conference->pool, muted_sound); - } + if (!switch_strlen_zero(muted_sound)) { + conference->muted_sound = switch_core_strdup(conference->pool, muted_sound); + } - if (!switch_strlen_zero(unmuted_sound)) { - conference->unmuted_sound = switch_core_strdup(conference->pool, unmuted_sound); - } + if (!switch_strlen_zero(unmuted_sound)) { + conference->unmuted_sound = switch_core_strdup(conference->pool, unmuted_sound); + } - if (!switch_strlen_zero(kicked_sound)) { - conference->kicked_sound = switch_core_strdup(conference->pool, kicked_sound); - } + if (!switch_strlen_zero(kicked_sound)) { + conference->kicked_sound = switch_core_strdup(conference->pool, kicked_sound); + } - if (!switch_strlen_zero(pin_sound)) { - conference->pin_sound = switch_core_strdup(conference->pool, pin_sound); - } + if (!switch_strlen_zero(pin_sound)) { + conference->pin_sound = switch_core_strdup(conference->pool, pin_sound); + } - if (!switch_strlen_zero(bad_pin_sound)) { - conference->bad_pin_sound = switch_core_strdup(conference->pool, bad_pin_sound); - } + if (!switch_strlen_zero(bad_pin_sound)) { + conference->bad_pin_sound = switch_core_strdup(conference->pool, bad_pin_sound); + } - if (!switch_strlen_zero(pin)) { - conference->pin = switch_core_strdup(conference->pool, pin); - } + if (!switch_strlen_zero(pin)) { + conference->pin = switch_core_strdup(conference->pool, pin); + } - if (!switch_strlen_zero(alone_sound)) { - conference->alone_sound = switch_core_strdup(conference->pool, alone_sound); - } + if (!switch_strlen_zero(alone_sound)) { + conference->alone_sound = switch_core_strdup(conference->pool, alone_sound); + } - if (!switch_strlen_zero(locked_sound)) { - conference->locked_sound = switch_core_strdup(conference->pool, locked_sound); - } + if (!switch_strlen_zero(locked_sound)) { + conference->locked_sound = switch_core_strdup(conference->pool, locked_sound); + } - if (!switch_strlen_zero(energy_level)) { - conference->energy_level = atoi(energy_level); - } + if (!switch_strlen_zero(energy_level)) { + conference->energy_level = atoi(energy_level); + } - conference->name = switch_core_strdup(conference->pool, name); - if (domain) { - conference->domain = switch_core_strdup(conference->pool, domain); - } else { - conference->domain = "cluecon.com"; - } - conference->rate = rate; - conference->interval = interval; - conference->dtmf_parser = NULL; + conference->name = switch_core_strdup(conference->pool, name); + if (domain) { + conference->domain = switch_core_strdup(conference->pool, domain); + } else { + conference->domain = "cluecon.com"; + } + conference->rate = rate; + conference->interval = interval; + conference->dtmf_parser = NULL; - /* caller control configuration chores */ - if(switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { + /* caller control configuration chores */ + if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { - /* if no controls, or default controls specified, install default */ - if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) { - status = conference_new_install_caller_controls_default(conference); - } else if (strcasecmp(caller_controls,"none") != 0) { - /* try to build caller control if the group has been specified and != "none" */ - switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls); + /* if no controls, or default controls specified, install default */ + if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) { + status = conf_default_controls(conference); + } else if (strcasecmp(caller_controls, "none") != 0) { + /* try to build caller control if the group has been specified and != "none" */ + switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls); #ifdef OPTION_IVR_MENU_SUPPORT - status = conference_new_install_caller_controls_custom(conference, xml_controls, cfg.menus); + status = conference_new_install_caller_controls_custom(conference, xml_controls, cfg.menus); #else - status = conference_new_install_caller_controls_custom(conference, xml_controls, NULL); + status = conference_new_install_caller_controls_custom(conference, xml_controls, NULL); #endif - if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n",caller_controls); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls intalled.\n"); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n"); - } + if (status != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n", caller_controls); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls intalled.\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n"); + } - /* Activate the conference mutex for exclusivity */ - switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool); - switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool); - switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool); - switch_thread_rwlock_create(&conference->rwlock, conference->pool); + /* Activate the conference mutex for exclusivity */ + switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool); + switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool); + switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool); + switch_thread_rwlock_create(&conference->rwlock, conference->pool); - return conference; + return conference; } static void pres_event_handler(switch_event_t *event) { - char *to = switch_event_get_header(event, "to"); - char *dup_to = NULL, *conf_name, *e; - conference_obj_t *conference; + char *to = switch_event_get_header(event, "to"); + char *dup_to = NULL, *conf_name, *e; + conference_obj_t *conference; - if (!to || strncasecmp(to, "conf+", 5)) { - return; - } + if (!to || strncasecmp(to, "conf+", 5)) { + return; + } - if (!(dup_to = strdup(to))) { - return; - } + if (!(dup_to = strdup(to))) { + return; + } - conf_name = dup_to + 5; + conf_name = dup_to + 5; - if ((e = strchr(conf_name, '@'))) { - *e = '\0'; - } + if ((e = strchr(conf_name, '@'))) { + *e = '\0'; + } - if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { - switch_event_t *event; + if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } - } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conf_name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Idle"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "idle"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } + } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conf_name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Idle"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "idle"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } switch_safe_free(dup_to); } static void send_presence(switch_event_types_t id) { - switch_xml_t cxml, cfg, advertise, room; + switch_xml_t cxml, cfg, advertise, room; - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } - if ((advertise = switch_xml_child(cfg, "advertise"))) { - for (room = switch_xml_child(advertise, "room"); room; room = room->next) { - char *name = (char *) switch_xml_attr_soft(room, "name"); - char *status = (char *) switch_xml_attr_soft(room, "status"); - switch_event_t *event; + if ((advertise = switch_xml_child(cfg, "advertise"))) { + for (room = switch_xml_child(advertise, "room"); room; room = room->next) { + char *name = (char *) switch_xml_attr_soft(room, "name"); + char *status = (char *) switch_xml_attr_soft(room, "status"); + switch_event_t *event; - if (name && switch_event_create(&event, id) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", status ? status : "Available"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "idle"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } - } - } + if (name && switch_event_create(&event, id) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", status ? status : "Available"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "idle"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } + } + } - done: - /* Release the config registry handle */ - if (cxml) { - switch_xml_free(cxml); - cxml = NULL; - } + done: + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + cxml = NULL; + } } - /* Called by FreeSWITCH when the module loads */ +/* Called by FreeSWITCH when the module loads */ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { - int i; - size_t nl,ol=0; - char *p = NULL; - switch_status_t status = SWITCH_STATUS_SUCCESS; + uint32_t i; + size_t nl, ol = 0; + char *p = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; - memset(&globals, 0, sizeof(globals)); + memset(&globals, 0, sizeof(globals)); - /* build api interface help ".syntax" field string */ - p=strdup("list\n"); - for (i=0; i<CONFFUNCAPISIZE; i++) { - nl=strlen(conf_api_sub_commands[i].psyntax)+4; - if(p != NULL) - ol = strlen(p); - p = realloc(p,ol+nl); - if(p != NULL) { - strcat(p,"\t\t"); - strcat(p,conf_api_sub_commands[i].psyntax); - if(i<CONFFUNCAPISIZE-1) - strcat(p,"\n"); - } + /* build api interface help ".syntax" field string */ + p = strdup(""); + for (i = 0; i<CONFFUNCAPISIZE; i++) { + nl = strlen(conf_api_sub_commands[i].psyntax) + 4; + if (p != NULL) { + ol = strlen(p); + } + p = realloc(p, ol+nl); + if (p != NULL) { + strcat(p, "\t\t"); + strcat(p, conf_api_sub_commands[i].psyntax); + if (i < CONFFUNCAPISIZE-1) { + strcat(p, "\n"); + } + } - } - /* install api interface help ".syntax" field string */ - if(p != NULL) - conf_api_interface.syntax = p; + } + /* install api interface help ".syntax" field string */ + if (p != NULL) { + conf_api_interface.syntax = p; + } - /* Connect my internal structure to the blank pointer passed to me */ - *module_interface = &conference_module_interface; + /* Connect my internal structure to the blank pointer passed to me */ + *module_interface = &conference_module_interface; - /* create/register custom event message type */ - if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", CONF_EVENT_MAINT); - return SWITCH_STATUS_TERM; - } + /* create/register custom event message type */ + if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", CONF_EVENT_MAINT); + return SWITCH_STATUS_TERM; + } - /* Setup the pool */ - if (switch_core_new_memory_pool(&globals.conference_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no conference pool\n"); - return SWITCH_STATUS_TERM; - } + /* Setup the pool */ + if (switch_core_new_memory_pool(&globals.conference_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no conference pool\n"); + return SWITCH_STATUS_TERM; + } - /* Setup a hash to store conferences by name */ - switch_core_hash_init(&globals.conference_hash, globals.conference_pool); - switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); - switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); - switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); + /* Setup a hash to store conferences by name */ + switch_core_hash_init(&globals.conference_hash, globals.conference_pool); + switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); + switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); + switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); - /* Subscribe to presence request events */ - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n"); - return SWITCH_STATUS_GENERR; - } + /* Subscribe to presence request events */ + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n"); + return SWITCH_STATUS_GENERR; + } - send_presence(SWITCH_EVENT_PRESENCE_IN); + send_presence(SWITCH_EVENT_PRESENCE_IN); - globals.running = 1; - /* indicate that the module should continue to be loaded */ - return status; + globals.running = 1; + /* indicate that the module should continue to be loaded */ + return status; } SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { + if (globals.running) { + /* signal all threads to shutdown */ + globals.running = 0; - if (globals.running) { - /* signal all threads to shutdown */ - globals.running = 0; - /* wait for all threads */ - while (globals.threads) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d threads\n", globals.threads); - switch_yield(100000); - } + /* wait for all threads */ + while (globals.threads) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d threads\n", globals.threads); + switch_yield(100000); + } - /* free api interface help ".syntax" field string */ - if (conf_api_interface.syntax != NULL) - free((char *)conf_api_interface.syntax); - } + /* free api interface help ".syntax" field string */ + if (conf_api_interface.syntax != NULL) { + free((char *)conf_api_interface.syntax); + } + } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } /* For Emacs: @@ -4447,5 +4538,5 @@ * c-basic-offset:4 * End: * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + * vim:set softtabstop = 4 shiftwidth = 4 tabstop = 4 expandtab: */ Modified: freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Sat Dec 23 00:27:43 2006 @@ -150,11 +150,19 @@ for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) { char *application = (char*) switch_xml_attr_soft(xaction, "application"); char *data = (char *) switch_xml_attr_soft(xaction, "data"); - char substituted[1024] = ""; + char *substituted = NULL; + uint32_t len = 0; char *app_data = NULL; if (field && strchr(expression, '(')) { - switch_perform_substitution(re, proceed, data, field_data, substituted, sizeof(substituted), ovector); + len = (uint32_t)(strlen(data) + strlen(field_data) + 10); + if (!(substituted = malloc(len))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + proceed = 0; + goto done; + } + memset(substituted, 0, len); + switch_perform_substitution(re, proceed, data, field_data, substituted, len, ovector); app_data = substituted; } else { app_data = data; @@ -170,6 +178,7 @@ } switch_caller_extension_add_application(session, *extension, application, app_data); + switch_safe_free(substituted); } switch_clean_re(re); Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat Dec 23 00:27:43 2006 @@ -1280,17 +1280,19 @@ } if (tech_pvt->read_frame.datalen > 0) { - if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); - } else { - frames = 1; - } - samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; - ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; - tech_pvt->timestamp_recv += (int32_t) samples; - tech_pvt->read_frame.samples = (int) samples; - tech_pvt->last_read = tech_pvt->read_frame.datalen; + if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame && bytes) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = (tech_pvt->read_frame.datalen / bytes); + } else { + frames = 1; + } + samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; + ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; + tech_pvt->timestamp_recv += (int32_t) samples; + tech_pvt->read_frame.samples = (int) samples; + tech_pvt->last_read = tech_pvt->read_frame.datalen; + } break; } Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Dec 23 00:27:43 2006 @@ -1614,9 +1614,12 @@ size_t bytes = 0; int frames = 0; //tech_pvt->last_read = switch_time_now(); - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); - tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame); + if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { + if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame)) { + frames = (tech_pvt->read_frame.datalen / bytes); + tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame); + } + } break; } } Modified: freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sat Dec 23 00:27:43 2006 @@ -415,7 +415,9 @@ if (stream.data) { if (switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { - + if (!stream.data) { + stream.write_function(&stream, "Command returned no output!\n"); + } if (acs->bg) { switch_event_t *event; Modified: freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj Sat Dec 23 00:27:43 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Dec 23 00:27:43 2006 @@ -1592,7 +1592,7 @@ /*********************************************************************************/ enum session_tinyid { SESSION_NAME, SESSION_STATE, - PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST + PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST, SESSION_UUID }; static JSFunctionSpec session_methods[] = { @@ -1627,6 +1627,7 @@ {"ani", PROFILE_ANI, JSPROP_READONLY|JSPROP_PERMANENT}, {"aniii", PROFILE_ANI_II, JSPROP_READONLY|JSPROP_PERMANENT}, {"destination", PROFILE_DEST, JSPROP_READONLY|JSPROP_PERMANENT}, + {"uuid", SESSION_UUID, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; @@ -1660,6 +1661,9 @@ case SESSION_NAME: *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel))); break; + case SESSION_UUID: + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_uuid(channel))); + break; case SESSION_STATE: *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_state_name(switch_channel_get_state(channel)))); break; @@ -2254,7 +2258,9 @@ JS_DefineFunctions(cx, javascript_object, fs_functions); JS_InitStandardClasses(cx, javascript_object); - + + /* this doesnt load in standard classes figure out wtf */ + js_InitFileClass(cx, javascript_object); JS_InitClass(cx, javascript_object, Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Sat Dec 23 00:27:43 2006 @@ -223,7 +223,7 @@ {0} }; -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t etpan_load(JSContext *cx, JSObject *obj) { JS_DefineFunctions(cx, obj, etpan_functions); @@ -244,7 +244,7 @@ const sm_module_interface_t etpan_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ etpan_load, /*.next*/ NULL }; Modified: freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c Sat Dec 23 00:27:43 2006 @@ -30,46 +30,84 @@ */ #include <switch.h> #include <math.h> +#include <ctype.h> static const char modname[] = "mod_say_en"; -typedef struct { - switch_core_session_t *session; - switch_input_callback_function_t input_callback; - void *buf; - uint32_t buflen; -} common_args_t; -static void play_group(int a, int b, int c, char *what, common_args_t *args) +#define say_num(num) {\ + char tmp[80];\ + switch_status_t status;\ + snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((status = en_say_general_count(session, tmp, SST_ITEMS, SSM_PRONOUNCED, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) {\ + return status;\ + }}\ + +#define say_file(...) {\ + char tmp[80];\ + snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); \ + if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ + return SWITCH_STATUS_FALSE;\ + }}\ + + + +static switch_status_t en_spell(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) { - char tmp[80] = ""; + char *p; + for(p = tosay; p && *p; p++) { + int a = tolower((int) *p); + if (type == SST_NAME_SPELLED) { + say_file("ascii/%d.wav", a); + } else if (type == SST_NAME_PHONETIC) { + say_file("phonetic-ascii/%d.wav", a); + } + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t play_group(int a, + int b, + int c, + char *what, + switch_core_session_t *session, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + if (a) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", a); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); - switch_ivr_play_file(args->session, NULL, "digits/hundred.wav", NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d.wav", a); + say_file("digits/hundred.wav"); } if (b) { if (b > 1) { - snprintf(tmp, sizeof(tmp), "digits/%d0.wav", b); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d0.wav", b); } else { - snprintf(tmp, sizeof(tmp), "digits/%d%d.wav", b, c); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d%d.wav", b, c); c = 0; } } if (c) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", c); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d.wav", c); } if (what && (a || b || c)) { - switch_ivr_play_file(args->session, NULL, what, NULL, args->input_callback, args->buf, args->buflen); + say_file(what); } + return SWITCH_STATUS_SUCCESS; } static char *strip_commas(char *in, char *out, switch_size_t len) @@ -106,19 +144,13 @@ switch_channel_t *channel; int in; int x = 0, places[9] = {0}; - char tmp[80] = ""; char sbuf[13] = ""; - common_args_t args = {0}; - + switch_status_t status; + assert(session != NULL); channel = switch_core_session_get_channel(session); assert(channel != NULL); - args.session = session; - args.input_callback = input_callback; - args.buf = buf; - args.buflen = buflen; - if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 9) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); return SWITCH_STATUS_GENERR; @@ -135,15 +167,20 @@ switch (method) { case SSM_PRONOUNCED: - play_group(places[8], places[7], places[6], "digits/million.wav", &args); - play_group(places[5], places[4], places[3], "digits/thousand.wav", &args); - play_group(places[2], places[1], places[0], NULL, &args); + if ((status = play_group(places[8], places[7], places[6], "digits/million.wav", session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + return status; + } + if ((status = play_group(places[5], places[4], places[3], "digits/thousand.wav", session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + return status; + } + if ((status = play_group(places[2], places[1], places[0], NULL, session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + return status; + } break; case SSM_ITERATED: for(x = 8; x >= 0; x--) { if (places[x]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[x]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); + say_file("digits/%d.wav", places[x]); } } break; @@ -153,6 +190,138 @@ return SWITCH_STATUS_SUCCESS; } + +static switch_status_t en_say_time(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + int32_t t; + switch_time_t target = 0; + switch_time_exp_t tm; + uint8_t say_date = 0, say_time = 0; + + if (type == SST_TIME_MEASUREMENT) { + int64_t hours = 0; + int64_t minutes = 0; + int64_t seconds = 0; + int64_t r = 0; + + if (strchr(tosay, ':')) { + char *tme = switch_core_session_strdup(session, tosay); + char *p; + + if ((p = strrchr(tme, ':'))) { + *p++ = '\0'; + seconds = atoi(p); + if ((p = strrchr(tme, ':'))) { + *p++ = '\0'; + minutes = atoi(p); + if (tme) { + hours = atoi(tme); + } + } + } + } else { + if ((seconds = atoi(tosay)) <= 0) { + seconds = (int64_t) time(NULL); + } + + if (seconds >= 60) { + minutes = seconds / 60; + r = seconds % 60; + seconds = r; + } + + if (minutes >= 60) { + hours = minutes / 60; + r = minutes % 60; + minutes = r; + } + } + + if (hours) { + say_num(hours); + say_file("digits/hours.wav"); + } + + if (minutes) { + say_num(minutes); + say_file("digits/minutes.wav"); + } + + if (seconds) { + say_num(seconds); + say_file("digits/seconds.wav"); + } + + return SWITCH_STATUS_SUCCESS; + } + + if ((t = atoi(tosay)) > 0) { + target = switch_time_make(t, 0); + } else { + target = switch_time_now(); + } + switch_time_exp_lt(&tm, target); + + switch(type) { + case SST_CURRENT_DATE_TIME: + say_date = say_time = 1; + break; + case SST_CURRENT_DATE: + say_date = 1; + break; + case SST_CURRENT_TIME: + say_time = 1; + break; + default: + break; + } + + if (say_date) { + say_file("digits/day-%d.wav", tm.tm_wday); + say_file("digits/mon-%d.wav", tm.tm_mon); + say_num(tm.tm_mday); + say_num(tm.tm_year + 1900); + } + + if (say_time) { + int32_t hour = tm.tm_hour, pm = 0; + + if (hour > 12) { + hour -= 12; + pm = 1; + } else if (hour == 12) { + pm = 1; + } else if (hour == 0) { + hour = 12; + pm = 0; + } + + say_num(hour); + + if (tm.tm_min > 9) { + say_num(tm.tm_min); + } else if (tm.tm_min) { + say_file("digits/oh.wav"); + say_num(tm.tm_min); + } else { + say_file("digits/oclock.wav"); + } + + say_file("digits/%s.wav", pm ? "p-m" : "a-m"); + } + + return SWITCH_STATUS_SUCCESS; +} + + + + static switch_status_t en_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, @@ -170,6 +339,16 @@ case SST_PERSONS: case SST_MESSAGES: say_cb = en_say_general_count; + break; + case SST_TIME_MEASUREMENT: + case SST_CURRENT_DATE: + case SST_CURRENT_TIME: + case SST_CURRENT_DATE_TIME: + say_cb = en_say_time; + break; + case SST_NAME_SPELLED: + case SST_NAME_PHONETIC: + say_cb = en_spell; break; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Finish ME!\n"); Modified: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Sat Dec 23 00:27:43 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Sat Dec 23 00:27:43 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Sat Dec 23 00:27:43 2006 @@ -338,7 +338,7 @@ { switch_channel_t *channel; char dtmf[128]; - switch_file_handle_t lfh; + switch_file_handle_t lfh = {0}; switch_frame_t *read_frame; switch_codec_t codec, *read_codec; char *codec_name; @@ -346,11 +346,11 @@ char *p; const char *vval; time_t start = 0; + uint32_t org_silence_hits = 0; if (!fh) { fh = &lfh; } - memset(fh, 0, sizeof(*fh)); channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -433,10 +433,13 @@ } if (fh->thresh) { - if (!fh->silence_hits) { - fh->silence_hits = 20; + if (fh->silence_hits) { + fh->silence_hits = fh->samplerate * fh->silence_hits / read_codec->implementation->samples_per_frame; + } else { + fh->silence_hits = fh->samplerate * 3 / read_codec->implementation->samples_per_frame; } - } + org_silence_hits = fh->silence_hits; + } while(switch_channel_ready(channel)) { switch_size_t len; @@ -504,7 +507,9 @@ if (!--fh->silence_hits) { break; } - } + } else { + fh->silence_hits = org_silence_hits; + } } if (!switch_test_flag(fh, SWITCH_FILE_PAUSE)) { @@ -4488,17 +4493,26 @@ if (pattern) { pcre *re = NULL; int proceed = 0, ovector[30]; - char substituted[1024] = ""; + char *substituted = NULL; + uint32_t len = 0; char *odata = NULL; char *expanded = NULL; - + if ((proceed = switch_perform_regex(data, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { for (action = switch_xml_child(input, "action"); action; action = action->next) { char *adata = (char *) switch_xml_attr_soft(action, "data"); char *func = (char *) switch_xml_attr_soft(action, "function"); if (strchr(pattern, '(') && strchr(adata, '$')) { - switch_perform_substitution(re, proceed, adata, data, substituted, sizeof(substituted), ovector); + len = (uint32_t)(strlen(data) + strlen(adata) + 10); + if (!(substituted = malloc(len))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + switch_clean_re(re); + switch_safe_free(expanded); + goto done; + } + memset(substituted, 0, len); + switch_perform_substitution(re, proceed, adata, data, substituted, len, ovector); odata = substituted; } else { odata = adata; @@ -4512,7 +4526,7 @@ odata = expanded; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Handle %s:[%s] (%s)\n", func, odata, lang); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s)\n", func, odata, lang); if (!strcasecmp(func, "play-file")) { switch_ivr_play_file(session, NULL, odata, NULL, input_callback, buf, buflen); @@ -4567,6 +4581,7 @@ switch_clean_re(re); switch_safe_free(expanded); + switch_safe_free(substituted); } input = input->next; Modified: freeswitch/branches/knhor/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_rtp.c Sat Dec 23 00:27:43 2006 @@ -467,7 +467,7 @@ rtp_session->recv_msg.header.x = 0; rtp_session->recv_msg.header.cc = 0; - rtp_session->seq = rtp_session->send_msg.header.seq; + rtp_session->seq = (uint16_t)rtp_session->send_msg.header.seq; rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->packet_size = packet_size; @@ -782,7 +782,7 @@ *flags |= SFF_CNG; /* Return a CNG frame */ *payload_type = SWITCH_RTP_CNG_PAYLOAD; - return SWITCH_RTP_CNG_PAYLOAD; + return SWITCH_RTP_CNG_PAYLOAD + rtp_header_len; } if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { @@ -857,7 +857,7 @@ *flags |= SFF_CNG; /* Return a CNG frame */ *payload_type = SWITCH_RTP_CNG_PAYLOAD; - return SWITCH_RTP_CNG_PAYLOAD; + return SWITCH_RTP_CNG_PAYLOAD + rtp_header_len; } } @@ -896,7 +896,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_GOOGLEHACK) && rtp_session->recv_msg.header.pt == 102) { rtp_session->recv_msg.header.pt = 97; } - rtp_session->rseq = ntohs(rtp_session->recv_msg.header.seq); + rtp_session->rseq = ntohs((uint16_t)rtp_session->recv_msg.header.seq); rtp_session->rpayload = (switch_payload_t)rtp_session->recv_msg.header.pt; } else { if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { @@ -1296,7 +1296,7 @@ if (!rtp_session->mini && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { rtp_session->mini++; rtp_session->rpayload = (switch_payload_t)send_msg->header.pt; - rtp_session->rseq = ntohs(send_msg->header.seq); + rtp_session->rseq = ntohs((uint16_t)send_msg->header.seq); } }

1 0

22 Dec '06

Author: knhor Date: Fri Dec 22 00:27:56 2006 New Revision: 3793 Added: freeswitch/branches/knhor/trunk/libs/curl/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/ freeswitch/branches/knhor/trunk/libs/curl/CHANGES - copied unchanged from r3792, /freeswitch/trunk/libs/curl/CHANGES freeswitch/branches/knhor/trunk/libs/curl/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/curl/COPYING freeswitch/branches/knhor/trunk/libs/curl/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/README freeswitch/branches/knhor/trunk/libs/curl/RELEASE-NOTES - copied unchanged from r3792, /freeswitch/trunk/libs/curl/RELEASE-NOTES freeswitch/branches/knhor/trunk/libs/curl/acinclude.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/acinclude.m4 freeswitch/branches/knhor/trunk/libs/curl/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/aclocal.m4 freeswitch/branches/knhor/trunk/libs/curl/buildconf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/buildconf freeswitch/branches/knhor/trunk/libs/curl/buildconf.bat - copied unchanged from r3792, /freeswitch/trunk/libs/curl/buildconf.bat freeswitch/branches/knhor/trunk/libs/curl/compile - copied unchanged from r3792, /freeswitch/trunk/libs/curl/compile freeswitch/branches/knhor/trunk/libs/curl/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/curl/config.guess freeswitch/branches/knhor/trunk/libs/curl/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/curl/config.sub freeswitch/branches/knhor/trunk/libs/curl/configure - copied unchanged from r3792, /freeswitch/trunk/libs/curl/configure freeswitch/branches/knhor/trunk/libs/curl/configure.ac - copied unchanged from r3792, /freeswitch/trunk/libs/curl/configure.ac freeswitch/branches/knhor/trunk/libs/curl/curl-config.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/curl-config.in freeswitch/branches/knhor/trunk/libs/curl/curl-style.el - copied unchanged from r3792, /freeswitch/trunk/libs/curl/curl-style.el freeswitch/branches/knhor/trunk/libs/curl/depcomp - copied unchanged from r3792, /freeswitch/trunk/libs/curl/depcomp freeswitch/branches/knhor/trunk/libs/curl/docs/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/docs/ freeswitch/branches/knhor/trunk/libs/curl/docs/BINDINGS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/BINDINGS freeswitch/branches/knhor/trunk/libs/curl/docs/BUGS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/BUGS freeswitch/branches/knhor/trunk/libs/curl/docs/CONTRIBUTE - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/CONTRIBUTE freeswitch/branches/knhor/trunk/libs/curl/docs/DISTRO-DILEMMA - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/DISTRO-DILEMMA freeswitch/branches/knhor/trunk/libs/curl/docs/FAQ - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/FAQ freeswitch/branches/knhor/trunk/libs/curl/docs/FEATURES - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/FEATURES freeswitch/branches/knhor/trunk/libs/curl/docs/HISTORY - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/HISTORY freeswitch/branches/knhor/trunk/libs/curl/docs/INSTALL - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/INSTALL freeswitch/branches/knhor/trunk/libs/curl/docs/INSTALL.devcpp - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/INSTALL.devcpp freeswitch/branches/knhor/trunk/libs/curl/docs/INTERNALS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/INTERNALS freeswitch/branches/knhor/trunk/libs/curl/docs/KNOWN_BUGS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/KNOWN_BUGS freeswitch/branches/knhor/trunk/libs/curl/docs/LICENSE-MIXING - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/LICENSE-MIXING freeswitch/branches/knhor/trunk/libs/curl/docs/MANUAL - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/MANUAL freeswitch/branches/knhor/trunk/libs/curl/docs/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/docs/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/docs/README.netware - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/README.netware freeswitch/branches/knhor/trunk/libs/curl/docs/README.win32 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/README.win32 freeswitch/branches/knhor/trunk/libs/curl/docs/RESOURCES - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/RESOURCES freeswitch/branches/knhor/trunk/libs/curl/docs/SSLCERTS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/SSLCERTS freeswitch/branches/knhor/trunk/libs/curl/docs/THANKS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/THANKS freeswitch/branches/knhor/trunk/libs/curl/docs/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/TODO freeswitch/branches/knhor/trunk/libs/curl/docs/TheArtOfHttpScripting - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/TheArtOfHttpScripting freeswitch/branches/knhor/trunk/libs/curl/docs/VERSIONS - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/VERSIONS freeswitch/branches/knhor/trunk/libs/curl/docs/curl-config.1 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/curl-config.1 freeswitch/branches/knhor/trunk/libs/curl/docs/curl-config.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/curl-config.html freeswitch/branches/knhor/trunk/libs/curl/docs/curl-config.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/curl-config.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/curl.1 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/curl.1 freeswitch/branches/knhor/trunk/libs/curl/docs/curl.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/curl.html freeswitch/branches/knhor/trunk/libs/curl/docs/curl.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/curl.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/docs/examples/ freeswitch/branches/knhor/trunk/libs/curl/docs/examples/10-at-a-time.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/10-at-a-time.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/docs/examples/Makefile.example - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/Makefile.example freeswitch/branches/knhor/trunk/libs/curl/docs/examples/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/docs/examples/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/README freeswitch/branches/knhor/trunk/libs/curl/docs/examples/anyauthput.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/anyauthput.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/cacertinmem.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/cacertinmem.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/cookie_interface.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/cookie_interface.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/curlgtk.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/curlgtk.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/curlx.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/curlx.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/debug.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/debug.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/fileupload.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/fileupload.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/fopen.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/fopen.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ftp3rdparty.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/ftp3rdparty.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ftpget.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/ftpget.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ftpgetresp.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/ftpgetresp.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ftpupload.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/ftpupload.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ftpuploadresume.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/ftpuploadresume.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/getinfo.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/getinfo.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/getinmemory.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/getinmemory.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/ghiper.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/ghiper.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/hiperfifo.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/hiperfifo.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/htmltidy.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/htmltidy.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/htmltitle.cc - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/htmltitle.cc freeswitch/branches/knhor/trunk/libs/curl/docs/examples/http-post.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/http-post.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/httpput.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/httpput.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/https.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/https.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/makefile.dj - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/makefile.dj freeswitch/branches/knhor/trunk/libs/curl/docs/examples/multi-app.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/multi-app.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/multi-debugcallback.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/multi-debugcallback.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/multi-double.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/multi-double.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/multi-post.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/multi-post.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/multi-single.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/multi-single.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/multithread.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/multithread.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/opensslthreadlock.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/opensslthreadlock.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/persistant.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/persistant.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/post-callback.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/post-callback.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/postit2.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/postit2.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/sampleconv.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/sampleconv.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/sepheaders.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/sepheaders.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/simple.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/simple.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/simplepost.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/simplepost.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/simplessl.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/simplessl.c freeswitch/branches/knhor/trunk/libs/curl/docs/examples/synctime.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/examples/synctime.c freeswitch/branches/knhor/trunk/libs/curl/docs/index.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/index.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/ freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_cleanup.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_cleanup.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_cleanup.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_cleanup.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_cleanup.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_cleanup.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_duphandle.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_duphandle.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_duphandle.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_duphandle.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_duphandle.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_duphandle.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_escape.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_escape.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_escape.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_escape.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_escape.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_escape.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_getinfo.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_getinfo.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_getinfo.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_getinfo.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_getinfo.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_getinfo.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_init.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_init.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_init.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_init.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_init.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_init.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_perform.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_perform.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_perform.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_perform.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_perform.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_perform.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_reset.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_reset.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_reset.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_reset.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_reset.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_reset.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_setopt.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_setopt.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_setopt.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_setopt.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_setopt.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_setopt.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_strerror.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_strerror.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_strerror.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_strerror.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_strerror.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_strerror.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_unescape.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_unescape.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_unescape.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_unescape.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_easy_unescape.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_easy_unescape.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_escape.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_escape.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_escape.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_escape.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_escape.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_escape.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formadd.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formadd.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formadd.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formadd.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formadd.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formadd.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formfree.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formfree.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formfree.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formfree.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formfree.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formfree.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formget.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formget.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formget.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formget.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_formget.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_formget.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_free.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_free.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_free.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_free.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_free.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_free.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_getdate.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_getdate.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_getdate.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_getdate.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_getdate.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_getdate.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_getenv.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_getenv.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_getenv.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_getenv.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_getenv.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_getenv.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_cleanup.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_cleanup.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_cleanup.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_cleanup.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_cleanup.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_cleanup.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_init.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_init.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_init.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_init.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_init.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_init.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_init_mem.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_init_mem.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_init_mem.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_init_mem.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_global_init_mem.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_global_init_mem.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_mprintf.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_mprintf.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_mprintf.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_mprintf.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_mprintf.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_mprintf.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_add_handle.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_add_handle.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_add_handle.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_add_handle.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_add_handle.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_add_handle.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_assign.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_assign.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_assign.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_assign.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_assign.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_assign.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_cleanup.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_cleanup.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_cleanup.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_cleanup.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_cleanup.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_cleanup.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_fdset.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_fdset.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_fdset.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_fdset.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_fdset.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_fdset.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_info_read.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_info_read.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_info_read.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_info_read.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_info_read.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_info_read.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_init.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_init.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_init.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_init.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_init.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_init.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_perform.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_perform.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_perform.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_perform.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_perform.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_perform.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_remove_handle.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_remove_handle.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_remove_handle.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_remove_handle.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_remove_handle.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_remove_handle.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_setopt.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_setopt.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_setopt.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_setopt.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_setopt.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_setopt.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_socket.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_socket.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_socket.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_socket.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_socket.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_socket.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_strerror.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_strerror.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_strerror.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_strerror.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_strerror.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_strerror.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_timeout.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_timeout.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_timeout.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_timeout.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_multi_timeout.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_multi_timeout.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_cleanup.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_cleanup.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_cleanup.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_cleanup.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_cleanup.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_cleanup.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_init.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_init.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_init.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_init.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_init.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_init.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_setopt.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_setopt.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_setopt.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_setopt.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_setopt.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_setopt.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_strerror.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_strerror.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_strerror.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_strerror.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_share_strerror.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_share_strerror.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_slist_append.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_slist_append.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_slist_append.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_slist_append.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_slist_append.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_slist_append.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_slist_free_all.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_slist_free_all.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_slist_free_all.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_slist_free_all.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_slist_free_all.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_slist_free_all.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_strequal.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_strequal.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_strequal.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_strequal.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_strequal.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_strequal.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_unescape.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_unescape.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_unescape.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_unescape.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_unescape.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_unescape.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_version.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_version.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_version.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_version.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_version.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_version.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_version_info.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_version_info.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_version_info.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_version_info.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/curl_version_info.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/curl_version_info.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/index.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/index.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-easy.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-easy.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-easy.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-easy.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-easy.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-easy.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-errors.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-errors.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-errors.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-errors.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-errors.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-errors.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-multi.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-multi.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-multi.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-multi.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-multi.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-multi.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-share.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-share.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-share.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-share.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-share.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-share.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-tutorial.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-tutorial.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-tutorial.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-tutorial.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl-tutorial.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl-tutorial.pdf freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl.3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl.3 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl.html freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl.m4 freeswitch/branches/knhor/trunk/libs/curl/docs/libcurl/libcurl.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/docs/libcurl/libcurl.pdf freeswitch/branches/knhor/trunk/libs/curl/include/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/include/ freeswitch/branches/knhor/trunk/libs/curl/include/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/include/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/include/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/README freeswitch/branches/knhor/trunk/libs/curl/include/curl/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/include/curl/ freeswitch/branches/knhor/trunk/libs/curl/include/curl/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/include/curl/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/include/curl/curl.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/curl.h freeswitch/branches/knhor/trunk/libs/curl/include/curl/curlver.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/curlver.h freeswitch/branches/knhor/trunk/libs/curl/include/curl/easy.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/easy.h freeswitch/branches/knhor/trunk/libs/curl/include/curl/mprintf.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/mprintf.h freeswitch/branches/knhor/trunk/libs/curl/include/curl/multi.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/multi.h freeswitch/branches/knhor/trunk/libs/curl/include/curl/stdcheaders.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/stdcheaders.h freeswitch/branches/knhor/trunk/libs/curl/include/curl/types.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/include/curl/types.h freeswitch/branches/knhor/trunk/libs/curl/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/curl/install-sh freeswitch/branches/knhor/trunk/libs/curl/lib/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/lib/ freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.Watcom - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.Watcom freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.b32 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.b32 freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.inc - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.inc freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.m32 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.m32 freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.netware - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.netware freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.riscos - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.riscos freeswitch/branches/knhor/trunk/libs/curl/lib/Makefile.vc6 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/Makefile.vc6 freeswitch/branches/knhor/trunk/libs/curl/lib/README.ares - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.ares freeswitch/branches/knhor/trunk/libs/curl/lib/README.curlx - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.curlx freeswitch/branches/knhor/trunk/libs/curl/lib/README.encoding - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.encoding freeswitch/branches/knhor/trunk/libs/curl/lib/README.hostip - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.hostip freeswitch/branches/knhor/trunk/libs/curl/lib/README.httpauth - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.httpauth freeswitch/branches/knhor/trunk/libs/curl/lib/README.memoryleak - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.memoryleak freeswitch/branches/knhor/trunk/libs/curl/lib/README.multi_socket - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.multi_socket freeswitch/branches/knhor/trunk/libs/curl/lib/README.pipelining - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/README.pipelining freeswitch/branches/knhor/trunk/libs/curl/lib/amigaos.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/amigaos.c freeswitch/branches/knhor/trunk/libs/curl/lib/amigaos.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/amigaos.h freeswitch/branches/knhor/trunk/libs/curl/lib/arpa_telnet.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/arpa_telnet.h freeswitch/branches/knhor/trunk/libs/curl/lib/base64.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/base64.c freeswitch/branches/knhor/trunk/libs/curl/lib/base64.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/base64.h freeswitch/branches/knhor/trunk/libs/curl/lib/ca-bundle.crt - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ca-bundle.crt freeswitch/branches/knhor/trunk/libs/curl/lib/config-amigaos.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config-amigaos.h freeswitch/branches/knhor/trunk/libs/curl/lib/config-mac.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config-mac.h freeswitch/branches/knhor/trunk/libs/curl/lib/config-riscos.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config-riscos.h freeswitch/branches/knhor/trunk/libs/curl/lib/config-tpf.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config-tpf.h freeswitch/branches/knhor/trunk/libs/curl/lib/config-win32.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config-win32.h freeswitch/branches/knhor/trunk/libs/curl/lib/config-win32ce.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config-win32ce.h freeswitch/branches/knhor/trunk/libs/curl/lib/config.dos - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config.dos freeswitch/branches/knhor/trunk/libs/curl/lib/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/branches/knhor/trunk/libs/curl/lib/connect.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/connect.c freeswitch/branches/knhor/trunk/libs/curl/lib/connect.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/connect.h freeswitch/branches/knhor/trunk/libs/curl/lib/content_encoding.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/content_encoding.c freeswitch/branches/knhor/trunk/libs/curl/lib/content_encoding.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/content_encoding.h freeswitch/branches/knhor/trunk/libs/curl/lib/cookie.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/cookie.c freeswitch/branches/knhor/trunk/libs/curl/lib/cookie.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/cookie.h freeswitch/branches/knhor/trunk/libs/curl/lib/curllib.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/curllib.dsp freeswitch/branches/knhor/trunk/libs/curl/lib/curllib.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/curllib.dsw freeswitch/branches/knhor/trunk/libs/curl/lib/curllib.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/curllib.vcproj freeswitch/branches/knhor/trunk/libs/curl/lib/curlx.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/curlx.h freeswitch/branches/knhor/trunk/libs/curl/lib/dict.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/dict.c freeswitch/branches/knhor/trunk/libs/curl/lib/dict.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/dict.h freeswitch/branches/knhor/trunk/libs/curl/lib/easy.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/easy.c freeswitch/branches/knhor/trunk/libs/curl/lib/easyif.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/easyif.h freeswitch/branches/knhor/trunk/libs/curl/lib/escape.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/escape.c freeswitch/branches/knhor/trunk/libs/curl/lib/escape.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/escape.h freeswitch/branches/knhor/trunk/libs/curl/lib/file.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/file.c freeswitch/branches/knhor/trunk/libs/curl/lib/file.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/file.h freeswitch/branches/knhor/trunk/libs/curl/lib/formdata.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/formdata.c freeswitch/branches/knhor/trunk/libs/curl/lib/formdata.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/formdata.h freeswitch/branches/knhor/trunk/libs/curl/lib/ftp.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ftp.c freeswitch/branches/knhor/trunk/libs/curl/lib/ftp.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ftp.h freeswitch/branches/knhor/trunk/libs/curl/lib/getenv.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/getenv.c freeswitch/branches/knhor/trunk/libs/curl/lib/getinfo.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/getinfo.c freeswitch/branches/knhor/trunk/libs/curl/lib/getinfo.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/getinfo.h freeswitch/branches/knhor/trunk/libs/curl/lib/gtls.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/gtls.c freeswitch/branches/knhor/trunk/libs/curl/lib/gtls.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/gtls.h freeswitch/branches/knhor/trunk/libs/curl/lib/hash.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hash.c freeswitch/branches/knhor/trunk/libs/curl/lib/hash.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hash.h freeswitch/branches/knhor/trunk/libs/curl/lib/hostares.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostares.c freeswitch/branches/knhor/trunk/libs/curl/lib/hostasyn.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostasyn.c freeswitch/branches/knhor/trunk/libs/curl/lib/hostip.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostip.c freeswitch/branches/knhor/trunk/libs/curl/lib/hostip.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostip.h freeswitch/branches/knhor/trunk/libs/curl/lib/hostip4.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostip4.c freeswitch/branches/knhor/trunk/libs/curl/lib/hostip6.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostip6.c freeswitch/branches/knhor/trunk/libs/curl/lib/hostsyn.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostsyn.c freeswitch/branches/knhor/trunk/libs/curl/lib/hostthre.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/hostthre.c freeswitch/branches/knhor/trunk/libs/curl/lib/http.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http.c freeswitch/branches/knhor/trunk/libs/curl/lib/http.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http.h freeswitch/branches/knhor/trunk/libs/curl/lib/http_chunks.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_chunks.c freeswitch/branches/knhor/trunk/libs/curl/lib/http_chunks.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_chunks.h freeswitch/branches/knhor/trunk/libs/curl/lib/http_digest.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_digest.c freeswitch/branches/knhor/trunk/libs/curl/lib/http_digest.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_digest.h freeswitch/branches/knhor/trunk/libs/curl/lib/http_negotiate.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_negotiate.c freeswitch/branches/knhor/trunk/libs/curl/lib/http_negotiate.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_negotiate.h freeswitch/branches/knhor/trunk/libs/curl/lib/http_ntlm.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_ntlm.c freeswitch/branches/knhor/trunk/libs/curl/lib/http_ntlm.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/http_ntlm.h freeswitch/branches/knhor/trunk/libs/curl/lib/if2ip.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/if2ip.c freeswitch/branches/knhor/trunk/libs/curl/lib/if2ip.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/if2ip.h freeswitch/branches/knhor/trunk/libs/curl/lib/inet_ntoa_r.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/inet_ntoa_r.h freeswitch/branches/knhor/trunk/libs/curl/lib/inet_ntop.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/inet_ntop.c freeswitch/branches/knhor/trunk/libs/curl/lib/inet_ntop.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/inet_ntop.h freeswitch/branches/knhor/trunk/libs/curl/lib/inet_pton.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/inet_pton.c freeswitch/branches/knhor/trunk/libs/curl/lib/inet_pton.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/inet_pton.h freeswitch/branches/knhor/trunk/libs/curl/lib/krb4.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/krb4.c freeswitch/branches/knhor/trunk/libs/curl/lib/krb4.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/krb4.h freeswitch/branches/knhor/trunk/libs/curl/lib/ldap.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ldap.c freeswitch/branches/knhor/trunk/libs/curl/lib/ldap.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ldap.h freeswitch/branches/knhor/trunk/libs/curl/lib/libcurl.framework.make - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/libcurl.framework.make freeswitch/branches/knhor/trunk/libs/curl/lib/libcurl.imp - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/libcurl.imp freeswitch/branches/knhor/trunk/libs/curl/lib/libcurl.plist - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/libcurl.plist freeswitch/branches/knhor/trunk/libs/curl/lib/libcurl.rc - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/libcurl.rc freeswitch/branches/knhor/trunk/libs/curl/lib/llist.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/llist.c freeswitch/branches/knhor/trunk/libs/curl/lib/llist.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/llist.h freeswitch/branches/knhor/trunk/libs/curl/lib/makefile.amiga - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/makefile.amiga freeswitch/branches/knhor/trunk/libs/curl/lib/makefile.dj - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/makefile.dj freeswitch/branches/knhor/trunk/libs/curl/lib/md5.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/md5.c freeswitch/branches/knhor/trunk/libs/curl/lib/md5.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/md5.h freeswitch/branches/knhor/trunk/libs/curl/lib/memdebug.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/memdebug.c freeswitch/branches/knhor/trunk/libs/curl/lib/memdebug.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/memdebug.h freeswitch/branches/knhor/trunk/libs/curl/lib/memory.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/memory.h freeswitch/branches/knhor/trunk/libs/curl/lib/mprintf.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/mprintf.c freeswitch/branches/knhor/trunk/libs/curl/lib/msvcproj.foot - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/msvcproj.foot freeswitch/branches/knhor/trunk/libs/curl/lib/msvcproj.head - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/msvcproj.head freeswitch/branches/knhor/trunk/libs/curl/lib/multi.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/multi.c freeswitch/branches/knhor/trunk/libs/curl/lib/multiif.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/multiif.h freeswitch/branches/knhor/trunk/libs/curl/lib/netrc.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/netrc.c freeswitch/branches/knhor/trunk/libs/curl/lib/netrc.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/netrc.h freeswitch/branches/knhor/trunk/libs/curl/lib/nwlib.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/nwlib.c freeswitch/branches/knhor/trunk/libs/curl/lib/parsedate.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/parsedate.c freeswitch/branches/knhor/trunk/libs/curl/lib/parsedate.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/parsedate.h freeswitch/branches/knhor/trunk/libs/curl/lib/progress.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/progress.c freeswitch/branches/knhor/trunk/libs/curl/lib/progress.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/progress.h freeswitch/branches/knhor/trunk/libs/curl/lib/security.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/security.c freeswitch/branches/knhor/trunk/libs/curl/lib/select.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/select.c freeswitch/branches/knhor/trunk/libs/curl/lib/select.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/select.h freeswitch/branches/knhor/trunk/libs/curl/lib/sendf.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/sendf.c freeswitch/branches/knhor/trunk/libs/curl/lib/sendf.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/sendf.h freeswitch/branches/knhor/trunk/libs/curl/lib/setup.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/setup.h freeswitch/branches/knhor/trunk/libs/curl/lib/setup_once.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/setup_once.h freeswitch/branches/knhor/trunk/libs/curl/lib/share.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/share.c freeswitch/branches/knhor/trunk/libs/curl/lib/share.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/share.h freeswitch/branches/knhor/trunk/libs/curl/lib/sockaddr.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/sockaddr.h freeswitch/branches/knhor/trunk/libs/curl/lib/socks.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/socks.c freeswitch/branches/knhor/trunk/libs/curl/lib/socks.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/socks.h freeswitch/branches/knhor/trunk/libs/curl/lib/speedcheck.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/speedcheck.c freeswitch/branches/knhor/trunk/libs/curl/lib/speedcheck.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/speedcheck.h freeswitch/branches/knhor/trunk/libs/curl/lib/splay.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/splay.c freeswitch/branches/knhor/trunk/libs/curl/lib/splay.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/splay.h freeswitch/branches/knhor/trunk/libs/curl/lib/sslgen.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/sslgen.c freeswitch/branches/knhor/trunk/libs/curl/lib/sslgen.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/sslgen.h freeswitch/branches/knhor/trunk/libs/curl/lib/ssluse.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ssluse.c freeswitch/branches/knhor/trunk/libs/curl/lib/ssluse.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/ssluse.h freeswitch/branches/knhor/trunk/libs/curl/lib/strdup.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strdup.c freeswitch/branches/knhor/trunk/libs/curl/lib/strdup.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strdup.h freeswitch/branches/knhor/trunk/libs/curl/lib/strequal.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strequal.c freeswitch/branches/knhor/trunk/libs/curl/lib/strequal.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strequal.h freeswitch/branches/knhor/trunk/libs/curl/lib/strerror.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strerror.c freeswitch/branches/knhor/trunk/libs/curl/lib/strerror.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strerror.h freeswitch/branches/knhor/trunk/libs/curl/lib/strtok.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strtok.c freeswitch/branches/knhor/trunk/libs/curl/lib/strtok.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strtok.h freeswitch/branches/knhor/trunk/libs/curl/lib/strtoofft.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strtoofft.c freeswitch/branches/knhor/trunk/libs/curl/lib/strtoofft.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/strtoofft.h freeswitch/branches/knhor/trunk/libs/curl/lib/telnet.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/telnet.c freeswitch/branches/knhor/trunk/libs/curl/lib/telnet.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/telnet.h freeswitch/branches/knhor/trunk/libs/curl/lib/tftp.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/tftp.c freeswitch/branches/knhor/trunk/libs/curl/lib/tftp.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/tftp.h freeswitch/branches/knhor/trunk/libs/curl/lib/timeval.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/timeval.c freeswitch/branches/knhor/trunk/libs/curl/lib/timeval.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/timeval.h freeswitch/branches/knhor/trunk/libs/curl/lib/transfer.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/transfer.c freeswitch/branches/knhor/trunk/libs/curl/lib/transfer.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/transfer.h freeswitch/branches/knhor/trunk/libs/curl/lib/url.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/url.c freeswitch/branches/knhor/trunk/libs/curl/lib/url.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/url.h freeswitch/branches/knhor/trunk/libs/curl/lib/urldata.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/urldata.h freeswitch/branches/knhor/trunk/libs/curl/lib/version.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/lib/version.c freeswitch/branches/knhor/trunk/libs/curl/libcurl.pc.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/libcurl.pc.in freeswitch/branches/knhor/trunk/libs/curl/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/curl/ltmain.sh freeswitch/branches/knhor/trunk/libs/curl/maketgz - copied unchanged from r3792, /freeswitch/trunk/libs/curl/maketgz freeswitch/branches/knhor/trunk/libs/curl/missing - copied unchanged from r3792, /freeswitch/trunk/libs/curl/missing freeswitch/branches/knhor/trunk/libs/curl/mkinstalldirs - copied unchanged from r3792, /freeswitch/trunk/libs/curl/mkinstalldirs freeswitch/branches/knhor/trunk/libs/curl/packages/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/ freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/AIX/ freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/AIX/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/AIX/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/RPM/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/AIX/RPM/ freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/RPM/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/AIX/RPM/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/RPM/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/AIX/RPM/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/RPM/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/AIX/RPM/README freeswitch/branches/knhor/trunk/libs/curl/packages/AIX/RPM/curl.spec.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/AIX/RPM/curl.spec.in freeswitch/branches/knhor/trunk/libs/curl/packages/DOS/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/DOS/ freeswitch/branches/knhor/trunk/libs/curl/packages/DOS/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/DOS/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/DOS/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/DOS/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/DOS/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/DOS/README freeswitch/branches/knhor/trunk/libs/curl/packages/DOS/common.dj - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/DOS/common.dj freeswitch/branches/knhor/trunk/libs/curl/packages/EPM/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/EPM/ freeswitch/branches/knhor/trunk/libs/curl/packages/EPM/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/EPM/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/EPM/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/EPM/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/EPM/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/EPM/README freeswitch/branches/knhor/trunk/libs/curl/packages/EPM/curl.list.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/EPM/curl.list.in freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/Linux/ freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/ freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/README freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/curl-ssl.spec.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/curl-ssl.spec.in freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/curl.spec.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/curl.spec.in freeswitch/branches/knhor/trunk/libs/curl/packages/Linux/RPM/make_curl_rpm - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Linux/RPM/make_curl_rpm freeswitch/branches/knhor/trunk/libs/curl/packages/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/NetWare/ - copied from r3792, /freeswitch/trunk/libs/curl/packages/NetWare/ freeswitch/branches/knhor/trunk/libs/curl/packages/NetWare/get_ver.awk - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/NetWare/get_ver.awk freeswitch/branches/knhor/trunk/libs/curl/packages/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/README freeswitch/branches/knhor/trunk/libs/curl/packages/Solaris/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/Solaris/ freeswitch/branches/knhor/trunk/libs/curl/packages/Solaris/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Solaris/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/Solaris/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Solaris/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/Win32/ freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Win32/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Win32/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Win32/README freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/cygwin/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/Win32/cygwin/ freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/cygwin/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Win32/cygwin/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/cygwin/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Win32/cygwin/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/Win32/cygwin/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/Win32/cygwin/README freeswitch/branches/knhor/trunk/libs/curl/packages/vms/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/packages/vms/ freeswitch/branches/knhor/trunk/libs/curl/packages/vms/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/packages/vms/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/packages/vms/axp/ - copied from r3792, /freeswitch/trunk/libs/curl/packages/vms/axp/ freeswitch/branches/knhor/trunk/libs/curl/packages/vms/axp/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/axp/README freeswitch/branches/knhor/trunk/libs/curl/packages/vms/batch_compile.com - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/batch_compile.com freeswitch/branches/knhor/trunk/libs/curl/packages/vms/build_vms.com - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/build_vms.com freeswitch/branches/knhor/trunk/libs/curl/packages/vms/config-vms.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/config-vms.h freeswitch/branches/knhor/trunk/libs/curl/packages/vms/curlmsg.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/curlmsg.h freeswitch/branches/knhor/trunk/libs/curl/packages/vms/curlmsg.msg - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/curlmsg.msg freeswitch/branches/knhor/trunk/libs/curl/packages/vms/curlmsg.sdl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/curlmsg.sdl freeswitch/branches/knhor/trunk/libs/curl/packages/vms/curlmsg_vms.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/curlmsg_vms.h freeswitch/branches/knhor/trunk/libs/curl/packages/vms/defines.com - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/defines.com freeswitch/branches/knhor/trunk/libs/curl/packages/vms/hpssl_alpha.opt - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/hpssl_alpha.opt freeswitch/branches/knhor/trunk/libs/curl/packages/vms/hpssl_ia64.opt - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/hpssl_ia64.opt freeswitch/branches/knhor/trunk/libs/curl/packages/vms/hpssl_vax.opt - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/hpssl_vax.opt freeswitch/branches/knhor/trunk/libs/curl/packages/vms/ia64/ - copied from r3792, /freeswitch/trunk/libs/curl/packages/vms/ia64/ freeswitch/branches/knhor/trunk/libs/curl/packages/vms/ia64/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/ia64/README freeswitch/branches/knhor/trunk/libs/curl/packages/vms/readme - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/readme freeswitch/branches/knhor/trunk/libs/curl/packages/vms/vax/ - copied from r3792, /freeswitch/trunk/libs/curl/packages/vms/vax/ freeswitch/branches/knhor/trunk/libs/curl/packages/vms/vax/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/packages/vms/vax/README freeswitch/branches/knhor/trunk/libs/curl/reconf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/reconf freeswitch/branches/knhor/trunk/libs/curl/sample.emacs - copied unchanged from r3792, /freeswitch/trunk/libs/curl/sample.emacs freeswitch/branches/knhor/trunk/libs/curl/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/src/ freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.Watcom - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.Watcom freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.b32 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.b32 freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.inc - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.inc freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.m32 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.m32 freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.netware - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.netware freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.riscos - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.riscos freeswitch/branches/knhor/trunk/libs/curl/src/Makefile.vc6 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/Makefile.vc6 freeswitch/branches/knhor/trunk/libs/curl/src/config-amigaos.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/config-amigaos.h freeswitch/branches/knhor/trunk/libs/curl/src/config-mac.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/config-mac.h freeswitch/branches/knhor/trunk/libs/curl/src/config-riscos.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/config-riscos.h freeswitch/branches/knhor/trunk/libs/curl/src/config-win32.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/config-win32.h freeswitch/branches/knhor/trunk/libs/curl/src/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/config.h.in freeswitch/branches/knhor/trunk/libs/curl/src/curl.rc - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/curl.rc freeswitch/branches/knhor/trunk/libs/curl/src/getpass.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/getpass.c freeswitch/branches/knhor/trunk/libs/curl/src/getpass.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/getpass.h freeswitch/branches/knhor/trunk/libs/curl/src/homedir.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/homedir.c freeswitch/branches/knhor/trunk/libs/curl/src/homedir.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/homedir.h freeswitch/branches/knhor/trunk/libs/curl/src/hugehelp.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/hugehelp.h freeswitch/branches/knhor/trunk/libs/curl/src/macos/ - copied from r3792, /freeswitch/trunk/libs/curl/src/macos/ freeswitch/branches/knhor/trunk/libs/curl/src/macos/MACINSTALL.TXT - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/macos/MACINSTALL.TXT freeswitch/branches/knhor/trunk/libs/curl/src/macos/curl.mcp.xml.sit.hqx - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/macos/curl.mcp.xml.sit.hqx freeswitch/branches/knhor/trunk/libs/curl/src/macos/src/ - copied from r3792, /freeswitch/trunk/libs/curl/src/macos/src/ freeswitch/branches/knhor/trunk/libs/curl/src/macos/src/curl_GUSIConfig.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/macos/src/curl_GUSIConfig.cpp freeswitch/branches/knhor/trunk/libs/curl/src/macos/src/macos_main.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/macos/src/macos_main.cpp freeswitch/branches/knhor/trunk/libs/curl/src/main.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/main.c freeswitch/branches/knhor/trunk/libs/curl/src/makefile.amiga - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/makefile.amiga freeswitch/branches/knhor/trunk/libs/curl/src/makefile.dj - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/makefile.dj freeswitch/branches/knhor/trunk/libs/curl/src/mkhelp.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/mkhelp.pl freeswitch/branches/knhor/trunk/libs/curl/src/setup.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/setup.h freeswitch/branches/knhor/trunk/libs/curl/src/urlglob.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/urlglob.c freeswitch/branches/knhor/trunk/libs/curl/src/urlglob.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/urlglob.h freeswitch/branches/knhor/trunk/libs/curl/src/version.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/version.h freeswitch/branches/knhor/trunk/libs/curl/src/writeenv.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/writeenv.c freeswitch/branches/knhor/trunk/libs/curl/src/writeenv.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/writeenv.h freeswitch/branches/knhor/trunk/libs/curl/src/writeout.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/writeout.c freeswitch/branches/knhor/trunk/libs/curl/src/writeout.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/src/writeout.h freeswitch/branches/knhor/trunk/libs/curl/tests/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/tests/ freeswitch/branches/knhor/trunk/libs/curl/tests/FILEFORMAT - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/FILEFORMAT freeswitch/branches/knhor/trunk/libs/curl/tests/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/tests/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/tests/README - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/README freeswitch/branches/knhor/trunk/libs/curl/tests/data/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/tests/data/ freeswitch/branches/knhor/trunk/libs/curl/tests/data/DISABLED - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/DISABLED freeswitch/branches/knhor/trunk/libs/curl/tests/data/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/tests/data/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/tests/data/test1 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test1 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test10 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test10 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test100 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test100 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test101 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test101 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test102 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test102 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test103 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test103 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test104 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test104 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test105 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test105 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test106 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test106 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test107 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test107 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test108 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test108 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test109 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test109 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test11 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test11 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test110 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test110 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test111 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test111 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test112 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test112 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test113 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test113 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test114 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test114 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test115 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test115 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test116 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test116 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test117 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test117 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test118 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test118 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test119 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test119 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test12 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test12 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test120 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test120 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test121 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test121 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test122 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test122 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test123 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test123 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test124 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test124 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test125 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test125 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test126 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test126 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test127 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test127 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test128 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test128 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test13 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test13 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test130 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test130 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test131 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test131 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test132 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test132 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test133 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test133 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test134 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test134 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test135 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test135 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test136 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test136 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test137 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test137 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test138 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test138 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test139 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test139 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test14 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test14 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test140 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test140 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test141 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test141 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test142 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test142 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test143 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test143 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test144 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test144 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test145 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test145 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test146 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test146 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test147 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test147 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test148 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test148 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test149 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test149 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test15 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test15 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test150 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test150 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test151 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test151 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test152 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test152 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test153 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test153 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test154 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test154 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test155 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test155 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test156 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test156 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test157 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test157 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test158 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test158 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test159 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test159 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test16 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test16 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test160 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test160 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test161 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test161 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test162 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test162 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test163 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test163 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test164 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test164 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test165 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test165 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test166 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test166 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test167 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test167 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test168 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test168 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test169 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test169 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test17 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test17 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test170 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test170 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test171 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test171 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test172 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test172 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test173 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test173 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test174 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test174 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test175 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test175 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test176 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test176 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test177 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test177 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test178 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test178 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test179 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test179 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test18 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test18 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test180 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test180 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test181 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test181 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test182 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test182 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test183 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test183 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test184 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test184 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test185 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test185 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test186 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test186 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test187 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test187 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test188 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test188 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test189 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test189 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test19 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test19 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test190 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test190 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test191 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test191 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test192 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test192 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test193 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test193 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test194 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test194 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test195 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test195 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test196 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test196 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test197 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test197 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test198 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test198 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test199 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test199 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test2 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test2 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test20 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test20 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test200 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test200 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test201 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test201 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test202 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test202 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test203 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test203 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test204 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test204 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test205 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test205 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test206 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test206 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test207 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test207 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test208 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test208 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test209 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test209 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test21 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test21 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test210 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test210 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test211 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test211 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test212 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test212 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test213 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test213 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test214 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test214 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test215 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test215 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test216 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test216 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test217 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test217 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test218 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test218 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test22 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test22 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test220 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test220 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test221 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test221 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test222 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test222 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test223 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test223 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test224 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test224 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test225 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test225 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test226 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test226 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test227 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test227 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test228 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test228 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test229 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test229 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test23 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test23 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test233 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test233 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test234 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test234 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test235 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test235 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test236 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test236 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test237 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test237 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test238 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test238 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test239 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test239 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test24 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test24 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test240 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test240 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test241 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test241 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test242 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test242 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test243 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test243 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test245 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test245 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test246 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test246 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test247 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test247 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test248 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test248 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test249 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test249 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test25 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test25 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test250 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test250 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test251 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test251 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test252 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test252 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test253 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test253 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test254 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test254 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test255 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test255 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test256 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test256 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test257 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test257 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test258 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test258 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test259 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test259 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test26 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test26 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test260 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test260 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test261 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test261 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test262 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test262 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test263 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test263 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test264 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test264 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test265 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test265 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test266 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test266 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test267 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test267 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test268 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test268 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test269 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test269 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test27 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test27 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test270 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test270 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test271 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test271 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test272 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test272 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test273 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test273 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test274 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test274 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test275 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test275 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test276 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test276 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test277 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test277 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test278 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test278 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test279 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test279 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test28 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test28 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test280 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test280 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test281 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test281 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test29 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test29 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test3 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test3 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test30 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test30 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test300 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test300 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test301 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test301 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test302 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test302 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test303 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test303 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test304 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test304 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test305 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test305 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test306 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test306 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test31 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test31 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test32 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test32 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test33 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test33 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test34 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test34 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test36 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test36 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test37 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test37 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test38 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test38 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test39 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test39 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test4 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test4 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test40 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test40 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test41 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test41 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test42 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test42 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test43 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test43 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test44 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test44 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test45 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test45 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test46 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test46 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test47 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test47 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test48 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test48 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test49 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test49 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test5 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test5 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test50 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test50 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test500 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test500 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test501 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test501 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test502 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test502 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test503 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test503 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test504 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test504 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test505 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test505 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test506 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test506 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test507 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test507 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test508 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test508 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test509 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test509 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test51 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test51 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test510 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test510 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test511 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test511 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test512 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test512 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test513 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test513 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test514 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test514 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test515 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test515 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test516 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test516 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test517 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test517 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test518 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test518 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test519 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test519 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test52 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test52 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test520 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test520 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test521 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test521 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test522 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test522 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test523 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test523 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test524 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test524 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test525 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test525 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test526 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test526 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test527 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test527 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test528 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test528 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test529 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test529 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test53 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test53 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test530 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test530 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test531 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test531 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test532 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test532 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test533 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test533 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test534 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test534 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test535 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test535 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test54 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test54 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test55 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test55 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test56 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test56 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test57 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test57 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test58 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test58 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test59 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test59 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test6 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test6 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test60 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test60 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test61 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test61 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test62 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test62 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test63 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test63 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test64 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test64 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test65 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test65 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test66 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test66 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test67 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test67 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test68 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test68 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test69 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test69 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test7 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test7 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test70 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test70 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test71 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test71 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test72 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test72 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test73 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test73 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test74 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test74 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test75 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test75 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test76 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test76 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test77 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test77 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test78 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test78 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test79 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test79 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test8 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test8 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test80 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test80 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test81 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test81 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test82 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test82 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test83 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test83 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test84 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test84 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test85 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test85 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test86 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test86 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test87 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test87 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test88 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test88 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test89 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test89 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test9 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test9 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test90 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test90 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test91 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test91 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test92 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test92 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test93 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test93 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test94 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test94 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test95 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test95 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test97 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test97 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test98 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test98 freeswitch/branches/knhor/trunk/libs/curl/tests/data/test99 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/data/test99 freeswitch/branches/knhor/trunk/libs/curl/tests/ftp.pm - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/ftp.pm freeswitch/branches/knhor/trunk/libs/curl/tests/ftpserver.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/ftpserver.pl freeswitch/branches/knhor/trunk/libs/curl/tests/getpart.pm - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/getpart.pm freeswitch/branches/knhor/trunk/libs/curl/tests/httpserver.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/httpserver.pl freeswitch/branches/knhor/trunk/libs/curl/tests/httpsserver.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/httpsserver.pl freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/tests/libtest/ freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/first.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/first.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib500.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib500.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib501.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib501.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib502.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib502.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib503.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib503.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib504.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib504.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib505.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib505.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib506.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib506.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib507.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib507.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib508.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib508.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib509.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib509.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib510.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib510.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib511.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib511.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib512.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib512.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib513.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib513.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib514.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib514.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib515.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib515.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib516.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib516.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib517.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib517.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib518.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib518.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib519.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib519.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib520.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib520.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib521.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib521.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib523.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib523.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib524.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib524.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib525.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib525.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib526.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib526.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib530.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib530.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib533.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib533.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/lib536.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/lib536.c freeswitch/branches/knhor/trunk/libs/curl/tests/libtest/test.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/libtest/test.h freeswitch/branches/knhor/trunk/libs/curl/tests/memanalyze.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/memanalyze.pl freeswitch/branches/knhor/trunk/libs/curl/tests/runtests.1 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/runtests.1 freeswitch/branches/knhor/trunk/libs/curl/tests/runtests.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/runtests.html freeswitch/branches/knhor/trunk/libs/curl/tests/runtests.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/runtests.pdf freeswitch/branches/knhor/trunk/libs/curl/tests/runtests.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/runtests.pl freeswitch/branches/knhor/trunk/libs/curl/tests/server/ (props changed) - copied from r3792, /freeswitch/trunk/libs/curl/tests/server/ freeswitch/branches/knhor/trunk/libs/curl/tests/server/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/Makefile.am freeswitch/branches/knhor/trunk/libs/curl/tests/server/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/Makefile.in freeswitch/branches/knhor/trunk/libs/curl/tests/server/getpart.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/getpart.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/getpart.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/getpart.h freeswitch/branches/knhor/trunk/libs/curl/tests/server/resolve.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/resolve.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/sockfilt.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/sockfilt.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/sws.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/sws.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/testpart.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/testpart.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/tftp.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/tftp.h freeswitch/branches/knhor/trunk/libs/curl/tests/server/tftpd.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/tftpd.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/util.c - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/util.c freeswitch/branches/knhor/trunk/libs/curl/tests/server/util.h - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/server/util.h freeswitch/branches/knhor/trunk/libs/curl/tests/stunnel.pem - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/stunnel.pem freeswitch/branches/knhor/trunk/libs/curl/tests/testcurl.1 - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/testcurl.1 freeswitch/branches/knhor/trunk/libs/curl/tests/testcurl.html - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/testcurl.html freeswitch/branches/knhor/trunk/libs/curl/tests/testcurl.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/testcurl.pdf freeswitch/branches/knhor/trunk/libs/curl/tests/testcurl.pl - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/testcurl.pl freeswitch/branches/knhor/trunk/libs/curl/tests/valgrind.pm - copied unchanged from r3792, /freeswitch/trunk/libs/curl/tests/valgrind.pm freeswitch/branches/knhor/trunk/libs/iksemel/ (props changed) - copied from r3792, /freeswitch/trunk/libs/iksemel/ freeswitch/branches/knhor/trunk/libs/iksemel/AUTHORS - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/AUTHORS freeswitch/branches/knhor/trunk/libs/iksemel/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/COPYING freeswitch/branches/knhor/trunk/libs/iksemel/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/ChangeLog freeswitch/branches/knhor/trunk/libs/iksemel/HACKING - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/HACKING freeswitch/branches/knhor/trunk/libs/iksemel/INSTALL - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/INSTALL freeswitch/branches/knhor/trunk/libs/iksemel/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/Makefile.am freeswitch/branches/knhor/trunk/libs/iksemel/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/Makefile.in freeswitch/branches/knhor/trunk/libs/iksemel/NEWS - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/NEWS freeswitch/branches/knhor/trunk/libs/iksemel/README - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/README freeswitch/branches/knhor/trunk/libs/iksemel/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/TODO freeswitch/branches/knhor/trunk/libs/iksemel/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/aclocal.m4 freeswitch/branches/knhor/trunk/libs/iksemel/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/config.guess freeswitch/branches/knhor/trunk/libs/iksemel/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/config.sub freeswitch/branches/knhor/trunk/libs/iksemel/configure - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/configure freeswitch/branches/knhor/trunk/libs/iksemel/configure.ac - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/configure.ac freeswitch/branches/knhor/trunk/libs/iksemel/doc/ (props changed) - copied from r3792, /freeswitch/trunk/libs/iksemel/doc/ freeswitch/branches/knhor/trunk/libs/iksemel/doc/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/doc/Makefile.am freeswitch/branches/knhor/trunk/libs/iksemel/doc/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/doc/Makefile.in freeswitch/branches/knhor/trunk/libs/iksemel/doc/iksemel - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/doc/iksemel freeswitch/branches/knhor/trunk/libs/iksemel/doc/iksemel.texi - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/doc/iksemel.texi freeswitch/branches/knhor/trunk/libs/iksemel/doc/texinfo.tex - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/doc/texinfo.tex freeswitch/branches/knhor/trunk/libs/iksemel/iksemel.pc.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/iksemel.pc.in freeswitch/branches/knhor/trunk/libs/iksemel/include/ (props changed) - copied from r3792, /freeswitch/trunk/libs/iksemel/include/ freeswitch/branches/knhor/trunk/libs/iksemel/include/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/Makefile.am freeswitch/branches/knhor/trunk/libs/iksemel/include/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/Makefile.in freeswitch/branches/knhor/trunk/libs/iksemel/include/common.h - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/common.h freeswitch/branches/knhor/trunk/libs/iksemel/include/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/config.h.in freeswitch/branches/knhor/trunk/libs/iksemel/include/finetune.h - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/finetune.h freeswitch/branches/knhor/trunk/libs/iksemel/include/iksemel.h - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/iksemel.h freeswitch/branches/knhor/trunk/libs/iksemel/include/stamp-h.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/include/stamp-h.in freeswitch/branches/knhor/trunk/libs/iksemel/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/install-sh freeswitch/branches/knhor/trunk/libs/iksemel/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/ltmain.sh freeswitch/branches/knhor/trunk/libs/iksemel/missing - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/missing freeswitch/branches/knhor/trunk/libs/iksemel/mkinstalldirs - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/mkinstalldirs freeswitch/branches/knhor/trunk/libs/iksemel/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/iksemel/src/ freeswitch/branches/knhor/trunk/libs/iksemel/src/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/Makefile.am freeswitch/branches/knhor/trunk/libs/iksemel/src/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/Makefile.in freeswitch/branches/knhor/trunk/libs/iksemel/src/base64.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/base64.c freeswitch/branches/knhor/trunk/libs/iksemel/src/dom.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/dom.c freeswitch/branches/knhor/trunk/libs/iksemel/src/filter.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/filter.c freeswitch/branches/knhor/trunk/libs/iksemel/src/iks.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/iks.c freeswitch/branches/knhor/trunk/libs/iksemel/src/ikstack.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/ikstack.c freeswitch/branches/knhor/trunk/libs/iksemel/src/io-posix.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/io-posix.c freeswitch/branches/knhor/trunk/libs/iksemel/src/jabber.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/jabber.c freeswitch/branches/knhor/trunk/libs/iksemel/src/md5.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/md5.c freeswitch/branches/knhor/trunk/libs/iksemel/src/sax.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/sax.c freeswitch/branches/knhor/trunk/libs/iksemel/src/sha.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/sha.c freeswitch/branches/knhor/trunk/libs/iksemel/src/stream.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/stream.c freeswitch/branches/knhor/trunk/libs/iksemel/src/utility.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/src/utility.c freeswitch/branches/knhor/trunk/libs/iksemel/test/ (props changed) - copied from r3792, /freeswitch/trunk/libs/iksemel/test/ freeswitch/branches/knhor/trunk/libs/iksemel/test/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/Makefile.am freeswitch/branches/knhor/trunk/libs/iksemel/test/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/Makefile.in freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-dom.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-dom.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-filter.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-filter.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-iks.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-iks.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-ikstack.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-ikstack.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-jid.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-jid.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-md5.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-md5.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-sax.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-sax.c freeswitch/branches/knhor/trunk/libs/iksemel/test/tst-sha.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/test/tst-sha.c freeswitch/branches/knhor/trunk/libs/iksemel/tools/ (props changed) - copied from r3792, /freeswitch/trunk/libs/iksemel/tools/ freeswitch/branches/knhor/trunk/libs/iksemel/tools/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/Makefile.am freeswitch/branches/knhor/trunk/libs/iksemel/tools/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/Makefile.in freeswitch/branches/knhor/trunk/libs/iksemel/tools/hash.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/hash.c freeswitch/branches/knhor/trunk/libs/iksemel/tools/ikslint.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/ikslint.c freeswitch/branches/knhor/trunk/libs/iksemel/tools/iksperf.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/iksperf.c freeswitch/branches/knhor/trunk/libs/iksemel/tools/iksroster.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/iksroster.c freeswitch/branches/knhor/trunk/libs/iksemel/tools/perf.c - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/perf.c freeswitch/branches/knhor/trunk/libs/iksemel/tools/perf.h - copied unchanged from r3792, /freeswitch/trunk/libs/iksemel/tools/perf.h freeswitch/branches/knhor/trunk/libs/libetpan/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/ freeswitch/branches/knhor/trunk/libs/libetpan/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/COPYRIGHT - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/COPYRIGHT freeswitch/branches/knhor/trunk/libs/libetpan/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/ChangeLog freeswitch/branches/knhor/trunk/libs/libetpan/INSTALL - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/INSTALL freeswitch/branches/knhor/trunk/libs/libetpan/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/Makefile.in freeswitch/branches/knhor/trunk/libs/libetpan/NEWS - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/NEWS freeswitch/branches/knhor/trunk/libs/libetpan/Rules.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/Rules.in freeswitch/branches/knhor/trunk/libs/libetpan/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/TODO freeswitch/branches/knhor/trunk/libs/libetpan/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/aclocal.m4 freeswitch/branches/knhor/trunk/libs/libetpan/autogen.sh - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/autogen.sh freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/ - copied from r3792, /freeswitch/trunk/libs/libetpan/build-windows/ freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/README.txt - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/README.txt freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/StdAfx.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/StdAfx.h freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/build_headers.bat - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/build_headers.bat freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/build_headers.list - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/build_headers.list freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/libetpan/ - copied from r3792, /freeswitch/trunk/libs/libetpan/build-windows/libetpan/ freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/libetpan-config.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/libetpan-config.h freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/libetpan.sln - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/libetpan.sln freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/libetpan/libetpan.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/libetpan/libetpan.vcproj freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/libetpan_version.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/libetpan_version.h freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/readmsg/ - copied from r3792, /freeswitch/trunk/libs/libetpan/build-windows/readmsg/ freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/readmsg/readmsg.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/readmsg/readmsg.vcproj freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/smtpsend/ - copied from r3792, /freeswitch/trunk/libs/libetpan/build-windows/smtpsend/ freeswitch/branches/knhor/trunk/libs/libetpan/build-windows/smtpsend/smtpsend.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/build-windows/smtpsend/smtpsend.vcproj freeswitch/branches/knhor/trunk/libs/libetpan/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/config.guess freeswitch/branches/knhor/trunk/libs/libetpan/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/config.h.in freeswitch/branches/knhor/trunk/libs/libetpan/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/config.sub freeswitch/branches/knhor/trunk/libs/libetpan/configure - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/configure freeswitch/branches/knhor/trunk/libs/libetpan/configure.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/configure.in freeswitch/branches/knhor/trunk/libs/libetpan/doc/ - copied from r3792, /freeswitch/trunk/libs/libetpan/doc/ freeswitch/branches/knhor/trunk/libs/libetpan/doc/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/ - copied from r3792, /freeswitch/trunk/libs/libetpan/doc/API/ freeswitch/branches/knhor/trunk/libs/libetpan/doc/API.html - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API.html freeswitch/branches/knhor/trunk/libs/libetpan/doc/API.sgml - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API.sgml freeswitch/branches/knhor/trunk/libs/libetpan/doc/API.txt - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API.txt freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/book1.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/book1.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/c13.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/c13.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/c1586.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/c1586.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/c16.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/c16.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/c2988.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/c2988.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/c385.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/c385.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x1094.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x1094.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x1381.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x1381.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x1556.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x1556.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x161.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x161.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x1614.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x1614.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x2180.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x2180.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x229.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x229.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x2583.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x2583.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x2669.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x2669.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x289.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x289.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x2946.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x2946.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x3011.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x3011.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x3015.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x3015.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x3082.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x3082.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x312.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x312.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x3198.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x3198.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x3472.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x3472.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x425.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x425.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/API/x88.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/API/x88.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/DOCUMENTATION - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/DOCUMENTATION freeswitch/branches/knhor/trunk/libs/libetpan/doc/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/ - copied from r3792, /freeswitch/trunk/libs/libetpan/doc/README/ freeswitch/branches/knhor/trunk/libs/libetpan/doc/README.html - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README.html freeswitch/branches/knhor/trunk/libs/libetpan/doc/README.sgml - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README.sgml freeswitch/branches/knhor/trunk/libs/libetpan/doc/README.txt - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README.txt freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/book1.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/book1.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/c13.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/c13.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/c157.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/c157.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/c53.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/c53.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/x19.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/x19.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/x82.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/x82.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/README/x94.htm - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/README/x94.htm freeswitch/branches/knhor/trunk/libs/libetpan/doc/depend.dot - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/depend.dot freeswitch/branches/knhor/trunk/libs/libetpan/doc/layer.fig - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/doc/layer.fig freeswitch/branches/knhor/trunk/libs/libetpan/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/install-sh freeswitch/branches/knhor/trunk/libs/libetpan/libetpan-config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/libetpan-config.h.in freeswitch/branches/knhor/trunk/libs/libetpan/libetpan-config.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/libetpan-config.in freeswitch/branches/knhor/trunk/libs/libetpan/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/ltmain.sh freeswitch/branches/knhor/trunk/libs/libetpan/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/ freeswitch/branches/knhor/trunk/libs/libetpan/src/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/Makefile.in freeswitch/branches/knhor/trunk/libs/libetpan/src/bsd/ - copied from r3792, /freeswitch/trunk/libs/libetpan/src/bsd/ freeswitch/branches/knhor/trunk/libs/libetpan/src/bsd/getopt.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/bsd/getopt.c freeswitch/branches/knhor/trunk/libs/libetpan/src/bsd/getopt.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/bsd/getopt.h freeswitch/branches/knhor/trunk/libs/libetpan/src/bsd/getopt_long.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/bsd/getopt_long.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/ freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/base64.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/base64.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/base64.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/base64.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/carray.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/carray.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/carray.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/carray.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/charconv.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/charconv.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/charconv.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/charconv.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/chash.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/chash.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/chash.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/chash.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/cinthash.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/cinthash.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/cinthash.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/cinthash.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/clist.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/clist.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/clist.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/clist.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/connect.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/connect.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/connect.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/connect.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/hmac-md5.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/hmac-md5.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mail.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mail.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mail_cache_db.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mail_cache_db.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mail_cache_db.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mail_cache_db.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mail_cache_db_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mail_cache_db_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/maillock.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/maillock.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/maillock.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/maillock.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailsasl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailsasl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailsasl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailsasl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailsem.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailsem.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailsem.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailsem.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_low.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_low.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_low.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_low.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_socket.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_socket.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_socket.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_socket.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_ssl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_ssl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_ssl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_ssl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mailstream_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mailstream_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mapping.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mapping.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mapping.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mapping.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/md5.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/md5.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/md5.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/md5.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/md5global.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/md5global.h freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mmapstring.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mmapstring.c freeswitch/branches/knhor/trunk/libs/libetpan/src/data-types/mmapstring.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/data-types/mmapstring.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/TODO freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/data-message/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/data-message/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/data-message/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/data-message/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/data-message/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/data-message/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/data-message/data_message_driver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/data-message/data_message_driver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/data-message/data_message_driver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/data-message/data_message_driver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbdriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbdriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbdriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbdriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbdriver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbdriver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbdriver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbdriver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbdriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbdriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/db/dbstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/db/dbstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/hotmail/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/hotmail/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/hotmail/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/hotmail/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/hotmail/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/hotmail/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/hotmail/hotmailstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/hotmail/hotmailstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/hotmail/hotmailstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/hotmail/hotmailstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_cached_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapdriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/imap/imapstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/imap/imapstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_cached_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirdriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/maildir/maildirstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/maildir/maildirstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_cached_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxdriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mbox/mboxstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mbox/mboxstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_cached_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhdriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mh/mhstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mh/mhstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mime-message/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mime-message/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mime-message/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mime-message/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mime-message/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mime-message/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_cached_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpdriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/nntp/nntpstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/nntp/nntpstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_cached_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_message.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_message.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_message.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3driver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3storage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3storage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/implementation/pop3/pop3storage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/implementation/pop3/pop3storage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_errors.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_errors.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_types_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_types_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/maildriver_types_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/maildriver_types_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailfolder.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailfolder.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailfolder.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailfolder.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailmessage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailmessage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailmessage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailmessage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailmessage_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailmessage_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailmessage_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailmessage_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailmessage_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailmessage_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailmessage_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailmessage_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailstorage.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailstorage.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailstorage.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailstorage.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailstorage_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailstorage_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailstorage_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailstorage_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/interface/mailstorage_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/interface/mailstorage_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/ freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/generic_cache.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/generic_cache.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/generic_cache.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/generic_cache.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/generic_cache_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/generic_cache_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/imfcache.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/imfcache.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/imfcache.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/imfcache.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/mailthread.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/mailthread.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/mailthread.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/mailthread.h freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/mailthread_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/mailthread_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/driver/tools/mailthread_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/driver/tools/mailthread_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/engine/ freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailengine.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailengine.c freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailengine.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailengine.h freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy.c freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy.h freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_gnupg.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_gnupg.c freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_gnupg.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_gnupg.h freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_smime.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_smime.c freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_smime.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_smime.h freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_tools.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_tools.c freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_tools.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_tools.h freeswitch/branches/knhor/trunk/libs/libetpan/src/engine/mailprivacy_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/engine/mailprivacy_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/TODO freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl_parser.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl_parser.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl_sender.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl_sender.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl_sender.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl_sender.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/acl_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/acl_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore_parser.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore_parser.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore_sender.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore_sender.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore_sender.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore_sender.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/annotatemore_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/annotatemore_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_extension.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_extension.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_extension.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_extension.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_extension_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_extension_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_keywords.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_keywords.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_keywords.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_keywords.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_parser.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_parser.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_print.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_print.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_print.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_print.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_sender.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_sender.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_sender.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_sender.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_socket.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_socket.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_socket.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_socket.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_ssl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_ssl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_ssl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_ssl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_types_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_types_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/mailimap_types_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/mailimap_types_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus_parser.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus_parser.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus_sender.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus_sender.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus_sender.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus_sender.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imap/uidplus_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imap/uidplus_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/TODO freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_types_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_types_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_types_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_types_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write_file.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write_file.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write_file.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write_file.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write_generic.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write_generic.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write_generic.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write_generic.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write_mem.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write_mem.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/imf/mailimf_write_mem.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/imf/mailimf_write_mem.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/maildir/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/maildir/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/maildir/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/maildir/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/maildir/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/maildir/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/maildir/maildir.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/maildir/maildir.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/maildir/maildir.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/maildir/maildir.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/maildir/maildir_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/maildir/maildir_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/TODO freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/mailmbox.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/mailmbox.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/mailmbox.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/mailmbox.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/mailmbox_parse.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/mailmbox_parse.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/mailmbox_parse.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/mailmbox_parse.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/mailmbox_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/mailmbox_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mbox/mailmbox_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mbox/mailmbox_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mh/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mh/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mh/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mh/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mh/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mh/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mh/mailmh.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mh/mailmh.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mh/mailmh.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mh/mailmh.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/TODO freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_content.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_content.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_content.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_content.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_decode.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_decode.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_decode.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_decode.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_disposition.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_disposition.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_disposition.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_disposition.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_types.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_types.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_types_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_types_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_types_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_types_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write_file.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write_file.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write_file.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write_file.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write_generic.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write_generic.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write_generic.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write_generic.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write_mem.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write_mem.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/mime/mailmime_write_mem.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/mime/mailmime_write_mem.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp_socket.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp_socket.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp_socket.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp_socket.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp_ssl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp_ssl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp_ssl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp_ssl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/nntp/newsnntp_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/nntp/newsnntp_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_socket.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_socket.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_socket.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_socket.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_ssl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_ssl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_ssl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_ssl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/pop3/mailpop3_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/pop3/mailpop3_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/ freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/TODO freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_helper.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_helper.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_helper.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_helper.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_socket.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_socket.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_socket.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_socket.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.c freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.h freeswitch/branches/knhor/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/low-level/smtp/mailsmtp_types.h freeswitch/branches/knhor/trunk/libs/libetpan/src/main/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libetpan/src/main/ freeswitch/branches/knhor/trunk/libs/libetpan/src/main/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/main/.cvsignore freeswitch/branches/knhor/trunk/libs/libetpan/src/main/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/main/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/src/main/libetpan.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/main/libetpan.h freeswitch/branches/knhor/trunk/libs/libetpan/src/main/libetpan_version.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/main/libetpan_version.c freeswitch/branches/knhor/trunk/libs/libetpan/src/main/libetpan_version.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/main/libetpan_version.h.in freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/ - copied from r3792, /freeswitch/trunk/libs/libetpan/src/windows/ freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/dirent.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/windows/dirent.c freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/misc.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/windows/misc.c freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/mmap.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/windows/mmap.c freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/time_r.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/windows/time_r.c freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/win_etpan.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/windows/win_etpan.h freeswitch/branches/knhor/trunk/libs/libetpan/src/windows/wsocket.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/src/windows/wsocket.cpp freeswitch/branches/knhor/trunk/libs/libetpan/tests/ - copied from r3792, /freeswitch/trunk/libs/libetpan/tests/ freeswitch/branches/knhor/trunk/libs/libetpan/tests/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/Makefile freeswitch/branches/knhor/trunk/libs/libetpan/tests/README - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/README freeswitch/branches/knhor/trunk/libs/libetpan/tests/compose-msg.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/compose-msg.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/decrypt.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/decrypt.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/fetch-attachment.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/fetch-attachment.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/frm-common.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/frm-common.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/frm-common.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/frm-common.h freeswitch/branches/knhor/trunk/libs/libetpan/tests/frm-simple.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/frm-simple.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/frm-tree.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/frm-tree.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/frm.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/frm.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/option-parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/option-parser.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/option-parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/option-parser.h freeswitch/branches/knhor/trunk/libs/libetpan/tests/pgp.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/pgp.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/readmsg-common.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/readmsg-common.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/readmsg-common.h - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/readmsg-common.h freeswitch/branches/knhor/trunk/libs/libetpan/tests/readmsg-simple.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/readmsg-simple.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/readmsg-uid.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/readmsg-uid.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/readmsg.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/readmsg.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/smime.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/smime.c freeswitch/branches/knhor/trunk/libs/libetpan/tests/smtpsend.c - copied unchanged from r3792, /freeswitch/trunk/libs/libetpan/tests/smtpsend.c freeswitch/branches/knhor/trunk/libs/libsndfile/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/ freeswitch/branches/knhor/trunk/libs/libsndfile/AUTHORS - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/AUTHORS freeswitch/branches/knhor/trunk/libs/libsndfile/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/COPYING freeswitch/branches/knhor/trunk/libs/libsndfile/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/ChangeLog freeswitch/branches/knhor/trunk/libs/libsndfile/INSTALL - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/INSTALL freeswitch/branches/knhor/trunk/libs/libsndfile/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/Mingw-make-dist.sh - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Mingw-make-dist.sh freeswitch/branches/knhor/trunk/libs/libsndfile/NEWS - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/NEWS freeswitch/branches/knhor/trunk/libs/libsndfile/Octave/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/Octave/ freeswitch/branches/knhor/trunk/libs/libsndfile/Octave/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Octave/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/Octave/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Octave/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/Octave/sndfile_load.m - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Octave/sndfile_load.m freeswitch/branches/knhor/trunk/libs/libsndfile/Octave/sndfile_play.m - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Octave/sndfile_play.m freeswitch/branches/knhor/trunk/libs/libsndfile/Octave/sndfile_save.m - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Octave/sndfile_save.m freeswitch/branches/knhor/trunk/libs/libsndfile/README - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/README freeswitch/branches/knhor/trunk/libs/libsndfile/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/TODO freeswitch/branches/knhor/trunk/libs/libsndfile/Win32/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/Win32/ freeswitch/branches/knhor/trunk/libs/libsndfile/Win32/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Win32/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/Win32/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Win32/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/Win32/README-precompiled-dll.txt - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Win32/README-precompiled-dll.txt freeswitch/branches/knhor/trunk/libs/libsndfile/Win32/testprog.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/Win32/testprog.c freeswitch/branches/knhor/trunk/libs/libsndfile/acinclude.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/acinclude.m4 freeswitch/branches/knhor/trunk/libs/libsndfile/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/aclocal.m4 freeswitch/branches/knhor/trunk/libs/libsndfile/compile - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/compile freeswitch/branches/knhor/trunk/libs/libsndfile/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/config.guess freeswitch/branches/knhor/trunk/libs/libsndfile/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/config.sub freeswitch/branches/knhor/trunk/libs/libsndfile/configure - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/configure freeswitch/branches/knhor/trunk/libs/libsndfile/configure.ac - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/configure.ac freeswitch/branches/knhor/trunk/libs/libsndfile/depcomp - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/depcomp freeswitch/branches/knhor/trunk/libs/libsndfile/doc/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/doc/ freeswitch/branches/knhor/trunk/libs/libsndfile/doc/FAQ.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/FAQ.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/doc/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/doc/api.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/api.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/bugs.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/bugs.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/command.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/command.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/dither.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/dither.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/embedded_files.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/embedded_files.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/index.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/index.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/libsndfile.css - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/libsndfile.css freeswitch/branches/knhor/trunk/libs/libsndfile/doc/libsndfile.css.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/libsndfile.css.in freeswitch/branches/knhor/trunk/libs/libsndfile/doc/libsndfile.jpg - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/libsndfile.jpg freeswitch/branches/knhor/trunk/libs/libsndfile/doc/lists.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/lists.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/new_file_type.HOWTO - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/new_file_type.HOWTO freeswitch/branches/knhor/trunk/libs/libsndfile/doc/octave.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/octave.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/pkgconfig.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/pkgconfig.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/sndfile_info.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/sndfile_info.html freeswitch/branches/knhor/trunk/libs/libsndfile/doc/win32.html - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/doc/win32.html freeswitch/branches/knhor/trunk/libs/libsndfile/examples/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/examples/ freeswitch/branches/knhor/trunk/libs/libsndfile/examples/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/examples/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/examples/cooledit-fixer.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/cooledit-fixer.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/generate.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/generate.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/list_formats.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/list_formats.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/make_sine.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/make_sine.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/sfprocess.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/sfprocess.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/sndfile-convert.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/sndfile-convert.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/sndfile-info.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/sndfile-info.c freeswitch/branches/knhor/trunk/libs/libsndfile/examples/sndfile-play-beos.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/sndfile-play-beos.cpp freeswitch/branches/knhor/trunk/libs/libsndfile/examples/sndfile-play.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/examples/sndfile-play.c freeswitch/branches/knhor/trunk/libs/libsndfile/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/install-sh freeswitch/branches/knhor/trunk/libs/libsndfile/libsndfile.spec.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/libsndfile.spec.in freeswitch/branches/knhor/trunk/libs/libsndfile/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/ltmain.sh freeswitch/branches/knhor/trunk/libs/libsndfile/man/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/man/ freeswitch/branches/knhor/trunk/libs/libsndfile/man/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/man/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/man/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/man/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/man/sndfile-convert.1 - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/man/sndfile-convert.1 freeswitch/branches/knhor/trunk/libs/libsndfile/man/sndfile-info.1 - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/man/sndfile-info.1 freeswitch/branches/knhor/trunk/libs/libsndfile/man/sndfile-play.1 - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/man/sndfile-play.1 freeswitch/branches/knhor/trunk/libs/libsndfile/missing - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/missing freeswitch/branches/knhor/trunk/libs/libsndfile/reconfigure.mk - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/reconfigure.mk freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/regtest/ freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/regtest/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/regtest/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/checksum.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/regtest/checksum.c freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/database.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/regtest/database.c freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/regtest.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/regtest/regtest.h freeswitch/branches/knhor/trunk/libs/libsndfile/regtest/sndfile-regtest.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/regtest/sndfile-regtest.c freeswitch/branches/knhor/trunk/libs/libsndfile/sndfile.pc.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/sndfile.pc.in freeswitch/branches/knhor/trunk/libs/libsndfile/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/src/ freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/ freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/ChangeLog freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/README - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/README freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/README.original - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/README.original freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g721.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g721.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g723_16.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g723_16.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g723_24.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g723_24.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g723_40.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g723_40.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g72x.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g72x.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g72x.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g72x.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g72x_priv.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g72x_priv.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/G72x/g72x_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/G72x/g72x_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/ freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/COPYRIGHT - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/COPYRIGHT freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/ChangeLog freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/README - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/README freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/add.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/add.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/code.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/code.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/config.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/config.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/decode.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/decode.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm610_priv.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm610_priv.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm_create.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm_create.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm_decode.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm_decode.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm_destroy.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm_destroy.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm_encode.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm_encode.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/gsm_option.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/gsm_option.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/long_term.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/long_term.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/lpc.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/lpc.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/preprocess.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/preprocess.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/rpe.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/rpe.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/short_term.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/short_term.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/GSM610/table.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/GSM610/table.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/src/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/src/Symbols.darwin - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/Symbols.darwin freeswitch/branches/knhor/trunk/libs/libsndfile/src/Symbols.linux - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/Symbols.linux freeswitch/branches/knhor/trunk/libs/libsndfile/src/aiff.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/aiff.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/alaw.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/alaw.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/au.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/au.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/avr.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/avr.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/binheader_writef_check.py - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/binheader_writef_check.py freeswitch/branches/knhor/trunk/libs/libsndfile/src/broadcast.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/broadcast.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/caf.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/caf.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/command.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/command.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/common.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/common.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/common.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/common.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/config.h.in freeswitch/branches/knhor/trunk/libs/libsndfile/src/create_symbols_file.py - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/create_symbols_file.py freeswitch/branches/knhor/trunk/libs/libsndfile/src/cygsndfile.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/cygsndfile.def freeswitch/branches/knhor/trunk/libs/libsndfile/src/dither.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/dither.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/double64.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/double64.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/dwd.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/dwd.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/dwvw.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/dwvw.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/file_io.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/file_io.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/flac.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/flac.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/float32.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/float32.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/float_cast.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/float_cast.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/g72x.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/g72x.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/gsm610.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/gsm610.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/htk.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/htk.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/ima_adpcm.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/ima_adpcm.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/interleave.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/interleave.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/ircam.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/ircam.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/libsndfile.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/libsndfile.def freeswitch/branches/knhor/trunk/libs/libsndfile/src/macbinary3.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/macbinary3.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/macos.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/macos.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/mat4.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/mat4.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/mat5.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/mat5.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/ms_adpcm.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/ms_adpcm.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/nist.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/nist.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/ogg.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/ogg.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/paf.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/paf.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/pcm.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/pcm.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/pvf.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/pvf.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/raw.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/raw.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/rx2.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/rx2.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/sd2.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sd2.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/sds.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sds.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/sf_unistd.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sf_unistd.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/sfconfig.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sfconfig.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/sfendian.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sfendian.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/sndfile.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sndfile.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/sndfile.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sndfile.h.in freeswitch/branches/knhor/trunk/libs/libsndfile/src/sndfile.hh - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/sndfile.hh freeswitch/branches/knhor/trunk/libs/libsndfile/src/strings.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/strings.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/svx.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/svx.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/test_endswap.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/test_endswap.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/test_endswap.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/test_endswap.def freeswitch/branches/knhor/trunk/libs/libsndfile/src/test_endswap.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/test_endswap.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/src/test_file_io.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/test_file_io.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/test_log_printf.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/test_log_printf.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/txw.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/txw.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/ulaw.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/ulaw.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/voc.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/voc.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/vox_adpcm.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/vox_adpcm.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/w64.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/w64.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/wav.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/wav.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/wav_w64.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/wav_w64.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/wav_w64.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/wav_w64.h freeswitch/branches/knhor/trunk/libs/libsndfile/src/wve.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/wve.c freeswitch/branches/knhor/trunk/libs/libsndfile/src/xi.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/src/xi.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/ (props changed) - copied from r3792, /freeswitch/trunk/libs/libsndfile/tests/ freeswitch/branches/knhor/trunk/libs/libsndfile/tests/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/Makefile.am freeswitch/branches/knhor/trunk/libs/libsndfile/tests/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/Makefile.in freeswitch/branches/knhor/trunk/libs/libsndfile/tests/aiff_rw_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/aiff_rw_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/alaw_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/alaw_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/benchmark.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/benchmark.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/benchmark.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/benchmark.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/benchmark.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/benchmark.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/command_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/command_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/cpp_test.cc - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/cpp_test.cc freeswitch/branches/knhor/trunk/libs/libsndfile/tests/dft_cmp.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/dft_cmp.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/dft_cmp.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/dft_cmp.h freeswitch/branches/knhor/trunk/libs/libsndfile/tests/dither_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/dither_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/dwvw_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/dwvw_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/error_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/error_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/fix_this.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/fix_this.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/floating_point_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/floating_point_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/floating_point_test.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/floating_point_test.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/floating_point_test.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/floating_point_test.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/header_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/header_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/header_test.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/header_test.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/header_test.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/header_test.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/headerless_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/headerless_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/largefile_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/largefile_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/locale_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/locale_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/lossy_comp_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/lossy_comp_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/misc_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/misc_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/multi_file_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/multi_file_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/open_fail_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/open_fail_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/pcm_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/pcm_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/pcm_test.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/pcm_test.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/pcm_test.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/pcm_test.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/peak_chunk_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/peak_chunk_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/pipe_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/pipe_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/pipe_test.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/pipe_test.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/pipe_test.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/pipe_test.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/raw_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/raw_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/scale_clip_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/scale_clip_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/scale_clip_test.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/scale_clip_test.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/scale_clip_test.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/scale_clip_test.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/sfversion.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/sfversion.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/stdin_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/stdin_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/stdio_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/stdio_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/stdout_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/stdout_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/string_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/string_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/ulaw_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/ulaw_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/utils.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/utils.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/utils.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/utils.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/utils.h - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/utils.h freeswitch/branches/knhor/trunk/libs/libsndfile/tests/utils.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/utils.tpl freeswitch/branches/knhor/trunk/libs/libsndfile/tests/virtual_io_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/virtual_io_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/win32_ordinal_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/win32_ordinal_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/win32_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/win32_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/write_read_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/write_read_test.c freeswitch/branches/knhor/trunk/libs/libsndfile/tests/write_read_test.def - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/write_read_test.def freeswitch/branches/knhor/trunk/libs/libsndfile/tests/write_read_test.tpl - copied unchanged from r3792, /freeswitch/trunk/libs/libsndfile/tests/write_read_test.tpl freeswitch/branches/knhor/trunk/libs/sofia-sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/AUTHORS - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/AUTHORS freeswitch/branches/knhor/trunk/libs/sofia-sip/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/COPYING freeswitch/branches/knhor/trunk/libs/sofia-sip/COPYRIGHTS - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/COPYRIGHTS freeswitch/branches/knhor/trunk/libs/sofia-sip/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/ChangeLog.ext-trees - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/ChangeLog.ext-trees freeswitch/branches/knhor/trunk/libs/sofia-sip/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/README - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/README freeswitch/branches/knhor/trunk/libs/sofia-sip/README.developers - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/README.developers freeswitch/branches/knhor/trunk/libs/sofia-sip/RELEASE - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/RELEASE freeswitch/branches/knhor/trunk/libs/sofia-sip/RELEASE.template - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/RELEASE.template freeswitch/branches/knhor/trunk/libs/sofia-sip/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/TODO freeswitch/branches/knhor/trunk/libs/sofia-sip/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/aclocal.m4 freeswitch/branches/knhor/trunk/libs/sofia-sip/autogen.sh - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/autogen.sh freeswitch/branches/knhor/trunk/libs/sofia-sip/compile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/compile freeswitch/branches/knhor/trunk/libs/sofia-sip/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/config.guess freeswitch/branches/knhor/trunk/libs/sofia-sip/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/config.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/config.sub freeswitch/branches/knhor/trunk/libs/sofia-sip/configure - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/configure freeswitch/branches/knhor/trunk/libs/sofia-sip/configure.ac - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/configure.ac freeswitch/branches/knhor/trunk/libs/sofia-sip/depcomp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/depcomp freeswitch/branches/knhor/trunk/libs/sofia-sip/docs/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/docs/ freeswitch/branches/knhor/trunk/libs/sofia-sip/docs/build_system.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/docs/build_system.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/docs/devel_platform_notes.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/docs/devel_platform_notes.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/docs/release_management.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/docs/release_management.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/install-sh freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/Doxyfile.aliases - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/Doxyfile.aliases freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/Doxyfile.conf - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/Doxyfile.conf freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/Doxyfile.version - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/docs/Doxyfile.version freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/sofia-sip/su_glib.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/sofia-sip/su_glib.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/sofia-sip/su_source.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/sofia-sip/su_source.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_glib.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_glib.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source_test.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/sofia-sip/bnf.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/sofia-sip/bnf.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/sofia-sip/hostdomain.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/sofia-sip/hostdomain.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/torture_bnf.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/torture_bnf.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/conformance.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/conformance.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/docguide.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/docguide.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/mainpage.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/mainpage.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_incoming_operation.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_incoming_operation.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_incoming_operation.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_incoming_operation.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_incoming_operation.vsd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_incoming_operation.vsd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_outgoing_operation.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_outgoing_operation.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_outgoing_operation.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_outgoing_operation.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_outgoing_operation.vsd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_basic_outgoing_operation.vsd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_incoming_call.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_incoming_call.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_incoming_call.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_incoming_call.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_incoming_call.vsd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_incoming_call.vsd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_call.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_call.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_call.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_call.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_call.vsd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_call.vsd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_operation_with_auth.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_operation_with_auth.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_operation_with_auth.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_operation_with_auth.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_operation_with_auth.vsd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/SIP_outgoing_operation_with_auth.vsd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/autotools.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/autotools.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/autotools.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/autotools.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/autotools.vsd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/autotools.vsd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/nta-receiving-message.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/nta-receiving-message.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/nta-receiving-message.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/pictures/nta-receiving-message.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/docs/sofia-footer.html.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/sofia-footer.html.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/features.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/features.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/features.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/features.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/sofia-sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/features/sofia-sip/sofia_features.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/sofia-sip/sofia_features.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/headers - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/headers freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http.def.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http.def.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_basic.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_basic.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_extra.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_extra.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_header.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_header.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser_table.c.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser_table.c.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_status.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_status.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag.c.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag.c.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_hclasses.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_hclasses.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_header.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_header.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_parser.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_protos.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_protos.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_status.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_status.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_tag.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_tag.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_tag_class.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/sofia-sip/http_tag_class.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/http/test_http.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/test_http.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/base64.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/base64.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ipt.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ipt.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/rc4.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/rc4.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/base64.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/base64.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/rc4.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/rc4.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/string0.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/string0.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/token64.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/token64.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/uniqueid.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/uniqueid.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/utf8.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/sofia-sip/utf8.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/string0.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/string0.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/token64.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/token64.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/torture_base64.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/torture_base64.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ucs2.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ucs2.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ucs4.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ucs4.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/utf8.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/utf8.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/utf8internal.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/utf8internal.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/utf8test.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/utf8test.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client_ntlm.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client_ntlm.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_common.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_common.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_digest.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_digest.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module_http.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module_http.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module_sip.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module_sip.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_ntlm.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_ntlm.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_plugin.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_plugin.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_plugin_delayed.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_plugin_delayed.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_plugin_ntlm.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_plugin_ntlm.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/iptsec.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/iptsec.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/iptsec_debug.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/iptsec_debug.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/iptsec_debug.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/iptsec_debug.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_common.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_common.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_digest.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_digest.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_module.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_module.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_ntlm.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_ntlm.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_plugin.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_plugin.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/testpasswd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/testpasswd freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_auth.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_auth.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_date.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_date.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_generic.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_generic.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_copy.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_copy.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_make.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_make.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_internal.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_internal.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mclass.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mclass.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime_table.c.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime_table.c.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_name_hash.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_name_hash.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.awk - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.awk freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_addr.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_addr.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_buffer.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_buffer.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_date.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_date.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mclass.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mclass.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mclass_hash.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mclass_hash.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime_protos.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime_protos.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_parser.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_protos.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_protos.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_tag_class.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_tag_class.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_types.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_protos.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_protos.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_table.c.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_table.c.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_debug.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_debug.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_debug.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_debug.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_event.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_event.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/sofia-sip/nea.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/sofia-sip/nea.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nea/sofia-sip/nea_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/sofia-sip/nea_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/agent.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/agent.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/cafile.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/cafile.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/invite.msc - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/invite.msc freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_check.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_check.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_compat.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_compat.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_compat.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_compat.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/portbind.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/portbind.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta_api - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta_api freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_read_payload.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_read_payload.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_log.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_log.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_stateless.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_stateless.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tport.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tport.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/sl_utils.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/sl_utils.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta_api.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta_api.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/agent.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/agent.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/cafile.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/cafile.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/http-client.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/http-client.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/http-server.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/http-server.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/sofia-sip/nth.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/sofia-sip/nth.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/sofia-sip/nth_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/sofia-sip/nth_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_extension.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_extension.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_message.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_message.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_options.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_options.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_registrar.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_registrar.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_100rel.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_100rel.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_basic_call.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_basic_call.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_hold.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_hold.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_reject.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_reject.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_extension.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_extension.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_init.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_init.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nat.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nat.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nat.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nat.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nat_tags.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nat_tags.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua_api.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua_api.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua_params.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua_params.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_refer.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_refer.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_register.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_register.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_session_timer.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_session_timer.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_simple.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_simple.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_sip_events.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_sip_events.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/README - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/README freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/errata - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/errata freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/rfc2327.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/rfc2327.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/run_test_sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/run_test_sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.bnf - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.bnf freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/test_sdp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/test_sdp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-1.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-1.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-10.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-10.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-2.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-2.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-3.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-3.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-4.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-4.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-5.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-5.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-6.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-6.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-7.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-7.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-8.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-8.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-9.sdp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-9.sdp freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/torture_sdp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/torture_sdp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ADD-A-HEADER - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ADD-A-HEADER freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/GRAMMAR - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/GRAMMAR freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/date_test.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/date_test.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser2.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser2.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser2.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser2.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser3.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser3.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser3.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser3.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser4.eps - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser4.eps freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser4.gif - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/images/sip-parser4.gif freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/rfc2543.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/rfc2543.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/run-tests - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/run-tests freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/run_date_test - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/run_date_test freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip.doxyaliases - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip.doxyaliases freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_caller_prefs.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_caller_prefs.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_event.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_event.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_extra.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_extra.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_extra_headers.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_extra_headers.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_feature.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_feature.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_header.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_header.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser_table.c.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser_table.c.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_prack.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_prack.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_pref_util.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_pref_util.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_reason.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_reason.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_refer.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_refer.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_security.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_security.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_session.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_session.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_status.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_status.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag.c.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag.c.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_time.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_time.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_extra.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_extra.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_header.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_header.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_parser.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_protos.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_protos.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_status.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_status.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_tag.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_tag.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_tag_class.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_tag_class.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_util.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip_util.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/test_sip_msg.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/test_sip_msg.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own0.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own0.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own1.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own1.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own2.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own2.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own3.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own3.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own4.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own4.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own5.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own5.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own6.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own6.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own8.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/own8.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test-ack-1.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test-ack-1.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test1.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test1.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test10.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test10.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test10b.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test10b.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test10c.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test10c.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test11.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test11.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test12.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test12.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test13.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test13.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test14-req.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test14-req.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test14.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test14.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test15.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test15.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test16.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test16.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test17.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test17.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test18.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test18.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test19.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test19.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test1a.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test1a.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test2.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test2.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test20.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test20.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test21.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test21.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test22.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test22.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test23.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test23.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test24.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test24.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test25.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test25.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test26.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test26.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test27.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test27.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test28.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test28.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test29.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test29.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test3.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test3.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test30.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test30.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test31.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test31.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test32.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test32.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test33.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test33.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test34.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test34.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test35.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test35.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test36.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test36.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test37.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test37.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test38.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test38.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test39.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test39.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test4.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test4.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test40.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test40.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test41.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test41.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test42.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test42.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test5.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test5.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test6.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test6.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test7.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test7.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test8.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test8.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test9.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/tests/test9.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sip/validator.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/validator.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_asynch.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_asynch.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa_add.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa_add.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa_session.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa_session.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/sofia-sip/soa_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/127.zone - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/127.zone freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/194.2.188 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/194.2.188 freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/3.f.f.e.1.2.0.0.3.0.1.2.c.0.0.0 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/3.f.f.e.1.2.0.0.3.0.1.2.c.0.0.0 freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/3.f.f.e.1.2.0.0.3.0.1.2.c.0.0.0.arpa - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/3.f.f.e.1.2.0.0.3.0.1.2.c.0.0.0.arpa freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/exam… - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/example.com freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/named.conf - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/named.conf freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolv_timeout.conf - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolv_timeout.conf freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rfc1034.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rfc1034.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rfc1035.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rfc1035.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rfc2671.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rfc2671.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rndc.conf - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/rndc.conf freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/root.zone - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/root.zone freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/run_test_sresolv - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/run_test_sresolv freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_async.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_async.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_config.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_config.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-sip/sresolv.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-sip/sresolv.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sresolv.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sresolv.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sresolv.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sresolv.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/cert.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/cert.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/key.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/key.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/lookup_stun_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/lookup_stun_server.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/rfc3489.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/rfc3489.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_common.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_common.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_dns.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_dns.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_internal.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_internal.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/getopt.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/getopt.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/memccpy.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memccpy.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/memcspn.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memcspn.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/memmem.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memmem.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/memspn.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memspn.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/run_addrinfo - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/run_addrinfo freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/run_localinfo - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/run_localinfo freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/run_test_su - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/run_test_su freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable2.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable2.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/rbtree.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/rbtree.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_addrinfo.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_addrinfo.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc_stat.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc_stat.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_bm.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_bm.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_configure.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_configure.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_debug.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_debug.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_errno.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_errno.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_localinfo.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_localinfo.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_log.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_log.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_md5.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_md5.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_osx_runloop.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_osx_runloop.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_strlst.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_strlst.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_class.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_class.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_inline.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_inline.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_io.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_io.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tagarg.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tagarg.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_types.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_vector.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_vector.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/tstdef.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/tstdef.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/strcasestr.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/strcasestr.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/strtoull.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/strtoull.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_bm.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_bm.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_default_log.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_default_log.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_errno.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_errno.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_module_debug.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_module_debug.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_os_nw.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_os_nw.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_osx_runloop.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_osx_runloop.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_perf.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_perf.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_sprintf.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_sprintf.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_strdup.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_strdup.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_strlst.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_strlst.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_tag_io.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_tag_io.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/tag_dll.awk - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/tag_dll.awk freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_poll.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_poll.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_rbtree.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_rbtree.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_bm.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_bm.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_port.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_port.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_time.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_time.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_timer.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_timer.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/agent.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/agent.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/cafile.pem - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/cafile.pem freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/certificates.html - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/certificates.html freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/make_node_cert.pl - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/make_node_cert.pl freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/make_root_cert.pl - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/make_root_cert.pl freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/make_test_certs.sh - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/make_test_certs.sh freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_plugins.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_plugins.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tls_test_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tls_test_client.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tls_test_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tls_test_server.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_rand.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_rand.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_sigcomp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_sigcomp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_sigcomp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_sigcomp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_stun.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_stun.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_threadpool.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_threadpool.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls_test.sh - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls_test.sh freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_connect.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_connect.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url_tag.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url_tag.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url_tag_class.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url_tag_class.h freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/torture_url.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/torture_url.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.docs - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.docs freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/url_tag.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url_tag.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/urlmap.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/urlmap.c freeswitch/branches/knhor/trunk/libs/sofia-sip/libsofia-sip-ua/url/urlmap.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/urlmap.h freeswitch/branches/knhor/trunk/libs/sofia-sip/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/ltmain.sh freeswitch/branches/knhor/trunk/libs/sofia-sip/m4/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/m4/ freeswitch/branches/knhor/trunk/libs/sofia-sip/m4/sac-general.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 freeswitch/branches/knhor/trunk/libs/sofia-sip/m4/sac-openssl.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/m4/sac-openssl.m4 freeswitch/branches/knhor/trunk/libs/sofia-sip/m4/sac-su.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/m4/sac-su.m4 freeswitch/branches/knhor/trunk/libs/sofia-sip/m4/sac-su2.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 freeswitch/branches/knhor/trunk/libs/sofia-sip/m4/sac-tport.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/m4/sac-tport.m4 freeswitch/branches/knhor/trunk/libs/sofia-sip/missing - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/missing freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/packages/ freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/packages/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/packages/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/packages/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/sofia-sip-ua-glib.pc.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua-glib.pc.in freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in freeswitch/branches/knhor/trunk/libs/sofia-sip/packages/sofia-sip.spec.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/packages/sofia-sip.spec.in freeswitch/branches/knhor/trunk/libs/sofia-sip/scripts/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/scripts/ freeswitch/branches/knhor/trunk/libs/sofia-sip/scripts/coverage - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/scripts/coverage freeswitch/branches/knhor/trunk/libs/sofia-sip/scripts/fix-include-sofia-sip - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/scripts/fix-include-sofia-sip freeswitch/branches/knhor/trunk/libs/sofia-sip/scripts/rpmbuild-snaphot - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/scripts/rpmbuild-snaphot freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/utils/ freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/Doxyfile - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/Doxyfile freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/Doxyfile.build.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/Doxyfile.build.in freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/apps_utils.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/apps_utils.h freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/sip-date.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/sip-date.c freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/sip-dig.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c freeswitch/branches/knhor/trunk/libs/sofia-sip/utils/sip-options.c - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/utils/sip-options.c freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/ (props changed) - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/ChangeLog freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/Makefile.am freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/Makefile.in freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/README.txt - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/README.txt freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/SofiaSIP.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/SofiaSIP.dsw freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/autogen.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/autogen.cmd freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/build_sources.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/check.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/check.cmd freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/config.h.in freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/install.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/install.cmd freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/libsofia-sip-ua/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/libsofia-sip-ua/sofia-sip-ua.def - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/sofia-sip-ua.def freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/sofia-sip/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/sofia-sip/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_htable/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_htable/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_htable/test_htable.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_htable/test_htable.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_memmem/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_memmem/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_memmem/test_memmem.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_memmem/test_memmem.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_nta/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_nta/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_nta/test_nta.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_nta/test_nta.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_nua/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_nua/test_nat_tags.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nat_tags.cpp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_su/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_su/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_su/test_su.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_su/test_su.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_tport/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_tport/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_tport/test_class.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_tport/test_class.cpp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_tport/test_table.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_tport/test_table.cpp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/test_tport/test_tport.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/test_tport/test_tport.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_rbtree/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_rbtree/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_rbtree/torture_rbtree.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_rbtree/torture_rbtree.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su/torture_su.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su/torture_su.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_alloc/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_alloc/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_alloc/torture_su_alloc.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_alloc/torture_su_alloc.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_bm/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_bm/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_bm/torture_su_bm.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_bm/torture_su_bm.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_port/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_port/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_port/torture_su_port.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_port/torture_su_port.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_root/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_tag/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_tag/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_tag/torture_su_tag.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_tag/torture_su_tag.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_time/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_time/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_time/torture_su_time.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_time/torture_su_time.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_timer/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_timer/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/tests/torture_su_timer/torture_su_timer.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_timer/torture_su_timer.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/unistd.h - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/unistd.h freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/localinfo/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/localinfo/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/localinfo/localinfo.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/localinfo/localinfo.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/sip_dig/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/sip_dig/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/sip_dig/sip_dig.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/sip_dig/sip_dig.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/sip_options/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/sip_options/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/sip_options/sip_options.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/sip_options/sip_options.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/sip_options_static/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/sip_options_static/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/sip_options_static/sip_options_static.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/sip_options_static/sip_options_static.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/stunc/ - copied from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/ freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/utils/stunc/stunc.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.dsp freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/version.awk - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/version.awk freeswitch/branches/knhor/trunk/libs/sofia-sip/win32/version_files.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/sofia-sip/win32/version_files.cmd freeswitch/branches/knhor/trunk/libs/speex/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/ freeswitch/branches/knhor/trunk/libs/speex/AUTHORS - copied unchanged from r3792, /freeswitch/trunk/libs/speex/AUTHORS freeswitch/branches/knhor/trunk/libs/speex/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/speex/COPYING freeswitch/branches/knhor/trunk/libs/speex/ChangeLog - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ChangeLog freeswitch/branches/knhor/trunk/libs/speex/INSTALL - copied unchanged from r3792, /freeswitch/trunk/libs/speex/INSTALL freeswitch/branches/knhor/trunk/libs/speex/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/NEWS - copied unchanged from r3792, /freeswitch/trunk/libs/speex/NEWS freeswitch/branches/knhor/trunk/libs/speex/README - copied unchanged from r3792, /freeswitch/trunk/libs/speex/README freeswitch/branches/knhor/trunk/libs/speex/README.TI-DSP - copied unchanged from r3792, /freeswitch/trunk/libs/speex/README.TI-DSP freeswitch/branches/knhor/trunk/libs/speex/README.blackfin - copied unchanged from r3792, /freeswitch/trunk/libs/speex/README.blackfin freeswitch/branches/knhor/trunk/libs/speex/README.symbian - copied unchanged from r3792, /freeswitch/trunk/libs/speex/README.symbian freeswitch/branches/knhor/trunk/libs/speex/Speex.kdevelop - copied unchanged from r3792, /freeswitch/trunk/libs/speex/Speex.kdevelop freeswitch/branches/knhor/trunk/libs/speex/Speex.spec - copied unchanged from r3792, /freeswitch/trunk/libs/speex/Speex.spec freeswitch/branches/knhor/trunk/libs/speex/Speex.spec.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/Speex.spec.in freeswitch/branches/knhor/trunk/libs/speex/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/speex/TODO freeswitch/branches/knhor/trunk/libs/speex/acinclude.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/speex/acinclude.m4 freeswitch/branches/knhor/trunk/libs/speex/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/speex/aclocal.m4 freeswitch/branches/knhor/trunk/libs/speex/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/speex/config.guess freeswitch/branches/knhor/trunk/libs/speex/config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/config.h.in freeswitch/branches/knhor/trunk/libs/speex/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/speex/config.sub freeswitch/branches/knhor/trunk/libs/speex/configure - copied unchanged from r3792, /freeswitch/trunk/libs/speex/configure freeswitch/branches/knhor/trunk/libs/speex/configure.ac - copied unchanged from r3792, /freeswitch/trunk/libs/speex/configure.ac freeswitch/branches/knhor/trunk/libs/speex/depcomp - copied unchanged from r3792, /freeswitch/trunk/libs/speex/depcomp freeswitch/branches/knhor/trunk/libs/speex/doc/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/doc/ freeswitch/branches/knhor/trunk/libs/speex/doc/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/doc/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/doc/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/doc/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/doc/manual.pdf - copied unchanged from r3792, /freeswitch/trunk/libs/speex/doc/manual.pdf freeswitch/branches/knhor/trunk/libs/speex/include/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/include/ freeswitch/branches/knhor/trunk/libs/speex/include/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/include/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/include/speex/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/include/speex/ freeswitch/branches/knhor/trunk/libs/speex/include/speex/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/include/speex/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_bits.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_bits.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_callbacks.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_callbacks.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_config_types.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_config_types.h.in freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_echo.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_echo.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_header.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_header.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_jitter.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_jitter.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_preprocess.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_preprocess.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_stereo.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_stereo.h freeswitch/branches/knhor/trunk/libs/speex/include/speex/speex_types.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/include/speex/speex_types.h freeswitch/branches/knhor/trunk/libs/speex/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/speex/install-sh freeswitch/branches/knhor/trunk/libs/speex/libspeex/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/libspeex/ freeswitch/branches/knhor/trunk/libs/speex/libspeex/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/libspeex/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/libspeex/_kiss_fft_guts.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/_kiss_fft_guts.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/arch.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/arch.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/bits.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/bits.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/cb_search.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/cb_search.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/cb_search.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/cb_search.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/cb_search_arm4.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/cb_search_arm4.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/cb_search_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/cb_search_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/cb_search_sse.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/cb_search_sse.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/exc_10_16_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/exc_10_16_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/exc_10_32_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/exc_10_32_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/exc_20_32_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/exc_20_32_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/exc_5_256_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/exc_5_256_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/exc_5_64_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/exc_5_64_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/exc_8_128_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/exc_8_128_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/fftwrap.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fftwrap.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/fftwrap.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fftwrap.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/filters.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/filters.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/filters.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/filters.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/filters_arm4.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/filters_arm4.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/filters_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/filters_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/filters_sse.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/filters_sse.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/fixed_arm4.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fixed_arm4.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/fixed_arm5e.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fixed_arm5e.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/fixed_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fixed_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/fixed_debug.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fixed_debug.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/fixed_generic.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/fixed_generic.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/gain_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/gain_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/gain_table_lbr.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/gain_table_lbr.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/hexc_10_32_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/hexc_10_32_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/hexc_table.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/hexc_table.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/high_lsp_tables.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/high_lsp_tables.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/jitter.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/jitter.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/kiss_fft.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/kiss_fft.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/kiss_fft.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/kiss_fft.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/kiss_fftr.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/kiss_fftr.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/kiss_fftr.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/kiss_fftr.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/lbr_48k_tables.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lbr_48k_tables.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/lpc.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lpc.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/lpc.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lpc.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/lpc_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lpc_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/lsp.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lsp.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/lsp.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lsp.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/lsp_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lsp_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/lsp_tables_nb.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/lsp_tables_nb.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/ltp.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/ltp.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/ltp.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/ltp.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/ltp_arm4.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/ltp_arm4.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/ltp_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/ltp_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/ltp_sse.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/ltp_sse.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/math_approx.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/math_approx.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/math_approx.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/math_approx.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/mdf.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/mdf.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/misc.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/misc.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/misc.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/misc.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/misc_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/misc_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/modes.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/modes.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/modes.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/modes.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/nb_celp.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/nb_celp.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/nb_celp.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/nb_celp.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/preprocess.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/preprocess.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/pseudofloat.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/pseudofloat.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/quant_lsp.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/quant_lsp.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/quant_lsp.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/quant_lsp.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/quant_lsp_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/quant_lsp_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/sb_celp.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/sb_celp.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/sb_celp.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/sb_celp.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/smallft.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/smallft.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/smallft.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/smallft.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/speex.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/speex.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/speex_callbacks.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/speex_callbacks.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/speex_header.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/speex_header.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/stack_alloc.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/stack_alloc.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/stereo.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/stereo.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/testdenoise.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/testdenoise.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/testecho.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/testecho.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/testenc.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/testenc.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/testenc_uwb.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/testenc_uwb.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/testenc_wb.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/testenc_wb.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/vbr.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vbr.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/vbr.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vbr.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/vorbis_psy.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vorbis_psy.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/vorbis_psy.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vorbis_psy.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/vq.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vq.c freeswitch/branches/knhor/trunk/libs/speex/libspeex/vq.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vq.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/vq_arm4.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vq_arm4.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/vq_bfin.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vq_bfin.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/vq_sse.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/vq_sse.h freeswitch/branches/knhor/trunk/libs/speex/libspeex/window.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/libspeex/window.c freeswitch/branches/knhor/trunk/libs/speex/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ltmain.sh freeswitch/branches/knhor/trunk/libs/speex/missing - copied unchanged from r3792, /freeswitch/trunk/libs/speex/missing freeswitch/branches/knhor/trunk/libs/speex/speex.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/speex/speex.m4 freeswitch/branches/knhor/trunk/libs/speex/speex.pc.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/speex.pc.in freeswitch/branches/knhor/trunk/libs/speex/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/src/ freeswitch/branches/knhor/trunk/libs/speex/src/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/src/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/src/getopt.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/getopt.c freeswitch/branches/knhor/trunk/libs/speex/src/getopt1.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/getopt1.c freeswitch/branches/knhor/trunk/libs/speex/src/getopt_win.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/getopt_win.h freeswitch/branches/knhor/trunk/libs/speex/src/skeleton.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/skeleton.c freeswitch/branches/knhor/trunk/libs/speex/src/skeleton.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/skeleton.h freeswitch/branches/knhor/trunk/libs/speex/src/speexdec.1 - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/speexdec.1 freeswitch/branches/knhor/trunk/libs/speex/src/speexdec.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/speexdec.c freeswitch/branches/knhor/trunk/libs/speex/src/speexenc.1 - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/speexenc.1 freeswitch/branches/knhor/trunk/libs/speex/src/speexenc.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/speexenc.c freeswitch/branches/knhor/trunk/libs/speex/src/wav_io.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/wav_io.c freeswitch/branches/knhor/trunk/libs/speex/src/wav_io.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/wav_io.h freeswitch/branches/knhor/trunk/libs/speex/src/wave_out.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/wave_out.c freeswitch/branches/knhor/trunk/libs/speex/src/wave_out.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/src/wave_out.h freeswitch/branches/knhor/trunk/libs/speex/symbian/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/symbian/ freeswitch/branches/knhor/trunk/libs/speex/symbian/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/symbian/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/symbian/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/symbian/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/symbian/bld.inf - copied unchanged from r3792, /freeswitch/trunk/libs/speex/symbian/bld.inf freeswitch/branches/knhor/trunk/libs/speex/symbian/config.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/symbian/config.h freeswitch/branches/knhor/trunk/libs/speex/symbian/speex.mmp - copied unchanged from r3792, /freeswitch/trunk/libs/speex/symbian/speex.mmp freeswitch/branches/knhor/trunk/libs/speex/ti/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/ti/ freeswitch/branches/knhor/trunk/libs/speex/ti/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/ti/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/ti/config.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/config.h freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C54_test/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/ti/speex_C54_test/ freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C54_test/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C54_test/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C54_test/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C54_test/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C54_test/speex_C54_test.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C54_test/speex_C54_test.cmd freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C54_test/speex_C54_test.pjt - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C54_test/speex_C54_test.pjt freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C55_test/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/ti/speex_C55_test/ freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C55_test/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C55_test/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C55_test/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C55_test/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C55_test/speex_C55_test.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C55_test/speex_C55_test.cmd freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C55_test/speex_C55_test.pjt - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C55_test/speex_C55_test.pjt freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C64_test/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/ti/speex_C64_test/ freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C64_test/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C64_test/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C64_test/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C64_test/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C64_test/speex_C64_test.cmd - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C64_test/speex_C64_test.cmd freeswitch/branches/knhor/trunk/libs/speex/ti/speex_C64_test/speex_C64_test.pjt - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/speex_C64_test/speex_C64_test.pjt freeswitch/branches/knhor/trunk/libs/speex/ti/testenc-TI-C5x.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/testenc-TI-C5x.c freeswitch/branches/knhor/trunk/libs/speex/ti/testenc-TI-C64x.c - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/testenc-TI-C64x.c freeswitch/branches/knhor/trunk/libs/speex/ti/user_misc.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/ti/user_misc.h freeswitch/branches/knhor/trunk/libs/speex/win32/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/ freeswitch/branches/knhor/trunk/libs/speex/win32/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/libspeex/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/libspeex/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/libspeex/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/libspeex/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/libspeex/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/libspeex/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/libspeex/libspeex.def - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/libspeex/libspeex.def freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/libspeex/libspeex.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/libspeex/libspeex.vcproj freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexdec/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexdec/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexdec/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexdec/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexdec/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexdec/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexdec/speexdec.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexdec/speexdec.vcproj freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexenc/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexenc/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexenc/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexenc/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexenc/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexenc/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2003/speexenc/speexenc.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2003/speexenc/speexenc.vcproj freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/libspeex/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/libspeex/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/libspeex/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/libspeex/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/libspeex/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/libspeex/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/libspeex/libspeex.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/libspeex/libspeex.vcproj freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexdec/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexdec/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexdec/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexdec/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexdec/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexdec/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexdec/speexdec.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexdec/speexdec.vcproj freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexenc/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexenc/ freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexenc/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexenc/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexenc/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexenc/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/VS2005/speexenc/speexenc.vcproj - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/VS2005/speexenc/speexenc.vcproj freeswitch/branches/knhor/trunk/libs/speex/win32/config.h - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/config.h freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/ freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/libspeex.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/libspeex.dsp freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/libspeex.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/libspeex.dsw freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/libspeex_dynamic.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/libspeex_dynamic.dsp freeswitch/branches/knhor/trunk/libs/speex/win32/libspeex/speex.def - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/libspeex/speex.def freeswitch/branches/knhor/trunk/libs/speex/win32/speex.iss - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speex.iss freeswitch/branches/knhor/trunk/libs/speex/win32/speexdec/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/speexdec/ freeswitch/branches/knhor/trunk/libs/speex/win32/speexdec/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexdec/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/speexdec/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexdec/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/speexdec/speexdec.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexdec/speexdec.dsp freeswitch/branches/knhor/trunk/libs/speex/win32/speexdec/speexdec.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexdec/speexdec.dsw freeswitch/branches/knhor/trunk/libs/speex/win32/speexenc/ (props changed) - copied from r3792, /freeswitch/trunk/libs/speex/win32/speexenc/ freeswitch/branches/knhor/trunk/libs/speex/win32/speexenc/Makefile.am - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexenc/Makefile.am freeswitch/branches/knhor/trunk/libs/speex/win32/speexenc/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexenc/Makefile.in freeswitch/branches/knhor/trunk/libs/speex/win32/speexenc/speexenc.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexenc/speexenc.dsp freeswitch/branches/knhor/trunk/libs/speex/win32/speexenc/speexenc.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/speex/win32/speexenc/speexenc.dsw freeswitch/branches/knhor/trunk/libs/win32/curl/ca-bundle.h - copied unchanged from r3792, /freeswitch/trunk/libs/win32/curl/ca-bundle.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/GNUmakefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/GNUmakefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Makefile.common - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Makefile.common freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Makefile.config.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Makefile.config.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/README - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/README freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/ConfigureWin32.bat - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/ConfigureWin32.bat freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/ReadMeWin32.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/ReadMeWin32.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/UsingCURLinWin32.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/UsingCURLinWin32.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/cpptest.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/cpptest.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/query_meerkat.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/query_meerkat.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/rpctest.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/rpctest.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/transport_config_win32.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/transport_config_win32.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.dsw freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_asynch_client.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_asynch_client.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server_w32httpsys.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server_w32httpsys.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_sync_client.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_add_sync_client.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_auth_client.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_sample_auth_client.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/Windows/xmlrpc_win32_config.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_win32_config.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/aclocal.m4 - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/aclocal.m4 freeswitch/branches/knhor/trunk/libs/xmlrpc-c/autom4te.cache/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/autom4te.cache/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/autom4te.cache/output.0 - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/autom4te.cache/output.0 freeswitch/branches/knhor/trunk/libs/xmlrpc-c/autom4te.cache/requests - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/autom4te.cache/requests freeswitch/branches/knhor/trunk/libs/xmlrpc-c/autom4te.cache/traces.0 - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/autom4te.cache/traces.0 freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/conf/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/conf/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/conf/abyss.conf - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/conf/abyss.conf freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/conf/mime.types - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/conf/mime.types freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/htdocs/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/htdocs/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/htdocs/index.htm - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/htdocs/index.htm freeswitch/branches/knhor/trunk/libs/xmlrpc-c/conf/abyss_root/htdocs/pwrabyss.gif - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/conf/abyss_root/htdocs/pwrabyss.gif freeswitch/branches/knhor/trunk/libs/xmlrpc-c/config.guess - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/config.guess freeswitch/branches/knhor/trunk/libs/xmlrpc-c/config.sub - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/config.sub freeswitch/branches/knhor/trunk/libs/xmlrpc-c/configure - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/configure freeswitch/branches/knhor/trunk/libs/xmlrpc-c/configure.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/configure.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/README.Debian - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/README.Debian freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/changelog - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/changelog freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/control - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/control freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/copyright - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/copyright freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/postinst - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/postinst freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/postrm - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/postrm freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/rules - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/rules freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/xmlrpc-c-apps.files - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/xmlrpc-c-apps.files freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/xmlrpc-c-dev.files - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/xmlrpc-c-dev.files freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/xmlrpc-c0.docs - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/xmlrpc-c0.docs freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/xmlrpc-c0.examples - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/xmlrpc-c0.examples freeswitch/branches/knhor/trunk/libs/xmlrpc-c/debian/xmlrpc-c0.files - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/debian/xmlrpc-c0.files freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/COPYING freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/CREDITS - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/CREDITS freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/DEVELOPING - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/DEVELOPING freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/HISTORY - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/HISTORY freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/SECURITY - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/SECURITY freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/TESTING - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/TESTING freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/TODO - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/TODO freeswitch/branches/knhor/trunk/libs/xmlrpc-c/doc/configure_doc - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/doc/configure_doc freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/README - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/README freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/auth_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/auth_client.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/meerkat-app-list.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/meerkat-app-list.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/sample_add_client_complex.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/sample_add_client_complex.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_client.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_client.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_server.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_server.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/gen_sample_add_xml.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/gen_sample_add_xml.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/query-meerkat.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/query-meerkat.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/synch_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/synch_client.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_asynch_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_asynch_client.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_loop_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_loop_server.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_client.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_server.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_server.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_cgi.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_cgi.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_w32httpsys.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_w32httpsys.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/examples/xmlrpc_server_validatee.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_server_validatee.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/base.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/base.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/base.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/base.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/base_int.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/base_int.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/client.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/client.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/client.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/client.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/client_int.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/client_int.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/client_simple.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/client_simple.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/girerr.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/girerr.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/girmem.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/girmem.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/oldcppwrapper.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/oldcppwrapper.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/oldxmlrpc.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/oldxmlrpc.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/registry.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/registry.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/server.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/server.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_cgi.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_cgi.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_w32httpsys.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_w32httpsys.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/timeout.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/timeout.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/transport.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/transport.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/transport_int.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/transport_int.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/xml.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/xml.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/include/xmlrpc-c/xmlparser.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/xmlparser.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/install-sh - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/install-sh freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/README - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/README freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/change.log - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/change.log freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/conf/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/conf/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/conf/abyss.conf - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/conf/abyss.conf freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/conf/mime.types - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/conf/mime.types freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/htdocs/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/htdocs/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/htdocs/index.htm - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/htdocs/index.htm freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/htdocs/pwrabyss.gif - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/htdocs/pwrabyss.gif freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/license.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/license.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/patch_notes.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/patch_notes.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/readme.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/readme.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/Abyss.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/Abyss.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/Abyss.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/Abyss.dsw freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/conf.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/conf.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/conn.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/conn.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/data.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/data.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/file.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/file.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/http.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/http.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/main.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/main.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/server.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/socket.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/thread.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/thread.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/token.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/token.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/token.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/token.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/src/trace.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/trace.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/abyss/version.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/version.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/curl_transport/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/curl_transport/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/curl_transport/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/curl_transport/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/curl_transport/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/curl_transport/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/Makefile.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/expat.dsw - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/expat.dsw freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/expat.html - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/expat.html freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/gennmtab/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/gennmtab/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/gennmtab/gennmtab.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/gennmtab.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/gennmtab/gennmtab.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/gennmtab.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/sample/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/sample/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/sample/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/sample/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/sample/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/sample/Makefile.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/sample/build.bat - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/sample/build.bat freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/sample/elements.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/sample/elements.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlparse/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlparse/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/ascii.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/ascii.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/asciitab.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/asciitab.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/dllmain.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/dllmain.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/iasciitab.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/iasciitab.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/latin1tab.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/latin1tab.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/utf8tab.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/utf8tab.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmldef.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmldef.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok_impl.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok_impl.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok_impl.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok_impl.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok_ns.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/xmltok_ns.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/Makefile.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/Makefile.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/codepage.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/codepage.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/codepage.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/codepage.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/filemap.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/filemap.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/readfilemap.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/readfilemap.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/unixfilemap.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/unixfilemap.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/win32filemap.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/win32filemap.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlfile.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlfile.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlfile.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlfile.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmltchar.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmltchar.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlwf.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlwf.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlwf.dsp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlwf/xmlwf.dsp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/libwww_transport/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/libwww_transport/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/libwww_transport/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/libwww_transport/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/libwww_transport/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/libwww_transport/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/libwww_transport/xmlrpc_libwww_transport.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/libwww_transport/xmlrpc_libwww_transport.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/libwww_transport/xmlrpc_libwww_transport.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/libwww_transport/xmlrpc_libwww_transport.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/casprintf.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/cmdline_parser.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/cmdline_parser.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/getoptx.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/getoptx.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/getoptx.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/getoptx.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/bool.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/bool.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/casprintf.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/casprintf.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/cmdline_parser.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/cmdline_parser.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/inline.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/inline.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/linklist.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/linklist.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/mallocvar.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/mallocvar.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/pthreadx.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/pthreadx.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/include/sstring.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/sstring.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/util/pthreadx_win32.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/util/pthreadx_win32.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/wininet_transport/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/wininet_transport/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/wininet_transport/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/wininet_transport/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/wininet_transport/xmlrpc_wininet_transport.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/wininet_transport/xmlrpc_wininet_transport.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/lib/wininet_transport/xmlrpc_wininet_transport.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/lib/wininet_transport/xmlrpc_wininet_transport.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/ltconfig - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/ltconfig freeswitch/branches/knhor/trunk/libs/xmlrpc-c/ltmain.sh - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/ltmain.sh freeswitch/branches/knhor/trunk/libs/xmlrpc-c/missing - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/missing freeswitch/branches/knhor/trunk/libs/xmlrpc-c/mkinstalldirs - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/mkinstalldirs freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/ (props changed) - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/XmlRpcCpp.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/XmlRpcCpp.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/client.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/client.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/client_simple.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/client_simple.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/cpptest.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/cpptest.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/fault.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/fault.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/girmem.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/girmem.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/outcome.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/outcome.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/param_list.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/param_list.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/registry.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/registry.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/server_abyss.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/server_abyss.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/value.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/value.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/cpp/xml.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/xml.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/cgi.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/cgi.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/cgi.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/cgi.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/cgitest1.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/cgitest1.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/client.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/client.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/client.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/client.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/eftest_wrapper.sh - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/eftest_wrapper.sh freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/http-req-simple.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/http-req-simple.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/parse_xml.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/parse_xml.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/parse_xml.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/parse_xml.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/req_no_params.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/req_no_params.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/req_out_of_order.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/req_out_of_order.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/req_value_name.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/req_value_name.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/sample_add_call.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/sample_add_call.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/serialize.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/serialize.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/serialize.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/serialize.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/server_abyss.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/server_abyss.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/server_abyss.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/server_abyss.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/test.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/test.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/test.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/test.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/value.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/value.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/value.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/value.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/xml_data.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/xml_data.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/test/xml_data.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/test/xml_data.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_array.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_array.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_authcookie.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_authcookie.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_base64.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_base64.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_builddecomp.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_builddecomp.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_client.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_client.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_data.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_data.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_datetime.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_datetime.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_expat.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_expat.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_libxml2.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_libxml2.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_parse.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_parse.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_registry.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_registry.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_serialize.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_serialize.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_server_abyss.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_server_abyss.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_server_cgi.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_server_cgi.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_server_w32httpsys.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_server_w32httpsys.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_struct.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_struct.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_strutil.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_strutil.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_support.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_support.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_transport.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_transport.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/src/xmlrpc_utf8.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_utf8.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/stamp-h.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/stamp-h.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/Makefile.common - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/Makefile.common freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/COPYING - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/COPYING freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/README - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/README freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/binmode-rpc-rfc.txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/binmode-rpc-rfc.txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/binmode-rpc2xml-rpc - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/binmode-rpc2xml-rpc freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-1.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-1.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-1.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-1.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-2.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-2.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-2.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-2.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-3.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-3.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-3.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-3.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-4.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-4.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-4.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-4.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-5.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-5.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-5.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-5.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-6.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-6.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-6.xml - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/good-6.xml freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-1.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-1.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-2.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-2.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-3.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-3.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-4.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-4.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-5.binmode - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/examples/invalid-5.binmode freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/oct2bin - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/binmode-rpc-kit/oct2bin freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/interop-server/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/interop-server/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/interop-server/interop-cgi.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/interop-server/interop-cgi.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/turbocharger/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/turbocharger/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/turbocharger/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/turbocharger/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/turbocharger/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/turbocharger/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/turbocharger/README - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/turbocharger/README freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/turbocharger/mod_gzip.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/turbocharger/mod_gzip.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/turbocharger/mod_gzip.c.diff - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/turbocharger/mod_gzip.c.diff freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/DataType.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/DataType.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/DataType.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/DataType.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/README - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/README freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/SystemProxy.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/SystemProxy.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/SystemProxy.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/SystemProxy.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcClass.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcClass.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcClass.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcClass.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcFunction.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcFunction.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcFunction.hpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcFunction.hpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.1 - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.1 freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2txt - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2txt freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xml-rpc-api2txt.1 - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xml-rpc-api2txt.1 freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.html - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.html freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/ - copied from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/ freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/.cvsignore - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/.cvsignore freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/Makefile - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/Makefile freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/Makefile.depend - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/Makefile.depend freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c freeswitch/branches/knhor/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.html - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.html freeswitch/branches/knhor/trunk/libs/xmlrpc-c/version.h - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/version.h freeswitch/branches/knhor/trunk/libs/xmlrpc-c/xmlrpc-c-config.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc-c-config.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/xmlrpc-c-config.test.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc-c-config.test.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in freeswitch/branches/knhor/trunk/libs/xmlrpc-c/xmlrpc_config.h.in - copied unchanged from r3792, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc_config.h.in freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch_python.cpp - copied unchanged from r3792, /freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch_python.h - copied unchanged from r3792, /freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python.i - copied unchanged from r3792, /freeswitch/trunk/src/mod/languages/mod_python/mod_python.i freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp - copied unchanged from r3792, /freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/switch_swig_wrap.c.bkp - copied unchanged from r3792, /freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c.bkp freeswitch/branches/knhor/trunk/src/mod/say/ - copied from r3792, /freeswitch/trunk/src/mod/say/ freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/ - copied from r3792, /freeswitch/trunk/src/mod/say/mod_say_en/ freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.c - copied unchanged from r3792, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/branches/knhor/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj - copied unchanged from r3792, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj Removed: freeswitch/branches/knhor/trunk/libs/sqlite/doc/ Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/Freeswitch.sln freeswitch/branches/knhor/trunk/conf/freeswitch.xml freeswitch/branches/knhor/trunk/libs/js/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/linux/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/linking/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/malloc/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ (props changed) freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/ (props changed) freeswitch/branches/knhor/trunk/libs/js/src/ (props changed) freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/ (props changed) freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/ (props changed) freeswitch/branches/knhor/trunk/libs/udns/ (props changed) freeswitch/branches/knhor/trunk/libs/win32/curl/curllib.vcproj freeswitch/branches/knhor/trunk/libs/win32/etpan/libetpan.vcproj freeswitch/branches/knhor/trunk/libs/win32/iksemel/iksemel.vcproj freeswitch/branches/knhor/trunk/libs/win32/libsndfile/libsndfile.vcproj freeswitch/branches/knhor/trunk/libs/win32/speex/libspeex.vcproj freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/Abyss.vcproj freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/xmlrpc.vcproj freeswitch/branches/knhor/trunk/src/include/switch_ivr.h freeswitch/branches/knhor/trunk/src/include/switch_loadable_module.h freeswitch/branches/knhor/trunk/src/include/switch_module_interfaces.h freeswitch/branches/knhor/trunk/src/include/switch_types.h freeswitch/branches/knhor/trunk/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_echo/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_enum/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/ (props changed) freeswitch/branches/knhor/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g711/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_gsm/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_l16/ (props changed) freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/Makefile freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj freeswitch/branches/knhor/trunk/src/mod/dialplans/ (props changed) freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/branches/knhor/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/Makefile freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile freeswitch/branches/knhor/trunk/src/mod/formats/mod_native_file/ (props changed) freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/Makefile freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/branches/knhor/trunk/src/mod/languages/ (props changed) freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/switch_swig_wrap.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/ (props changed) freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/ (props changed) freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj freeswitch/branches/knhor/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/branches/knhor/trunk/src/mod/loggers/mod_syslog/ (props changed) freeswitch/branches/knhor/trunk/src/mod/timers/mod_softtimer/ (props changed) freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/ (props changed) freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/Makefile freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile freeswitch/branches/knhor/trunk/src/switch_core.c freeswitch/branches/knhor/trunk/src/switch_ivr.c freeswitch/branches/knhor/trunk/src/switch_loadable_module.c freeswitch/branches/knhor/trunk/src/switch_xml.c Log: Merged revisions 3744-3792 via svnmerge from trunk Modified: freeswitch/branches/knhor/trunk/Freeswitch.sln ============================================================================== --- freeswitch/branches/knhor/trunk/Freeswitch.sln (original) +++ freeswitch/branches/knhor/trunk/Freeswitch.sln Fri Dec 22 00:27:56 2006 @@ -365,19 +365,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.vcproj", "{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.vcproj", "{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}" - ProjectSection(ProjectDependencies) = postProject - {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} - EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download IKSEMEL", "libs\win32\Download IKSEMEL.vcproj", "{F8C28DF9-D76A-449E-A621-D97D869974DA}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.vcproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}" - ProjectSection(ProjectDependencies) = postProject - {F8C28DF9-D76A-449E-A621-D97D869974DA} = {F8C28DF9-D76A-449E-A621-D97D869974DA} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PORTAUDIO", "libs\win32\Download PORTAUDIO.vcproj", "{985135DA-BBE1-42D2-8A85-1F7DF0609B3D}" EndProject @@ -399,31 +389,15 @@ {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}" - ProjectSection(ProjectDependencies) = postProject - {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} - EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CURL", "libs\win32\Download CURL.vcproj", "{831F76E8-D288-4C54-9B6D-281D9436CCC7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}" - ProjectSection(ProjectDependencies) = postProject - {831F76E8-D288-4C54-9B6D-281D9436CCC7} = {831F76E8-D288-4C54-9B6D-281D9436CCC7} - EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download XMLRPC", "libs\win32\Download XMLRPC.vcproj", "{EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "libs\win32\xmlrpc\xmlrpc.vcproj", "{A3FE0076-B366-429D-A238-D7304DA7D3C1}" - ProjectSection(ProjectDependencies) = postProject - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}" ProjectSection(ProjectDependencies) = postProject {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}" @@ -556,12 +530,7 @@ {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download ETPAN", "libs\win32\Download ETPAN.vcproj", "{EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetpan", "libs\win32\etpan\libetpan.vcproj", "{BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}" - ProjectSection(ProjectDependencies) = postProject - {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} = {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject @@ -573,6 +542,14 @@ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -777,18 +754,10 @@ {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32 - {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.Build.0 = Debug|Win32 - {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.ActiveCfg = Release|Win32 - {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.Build.0 = Release|Win32 {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.ActiveCfg = Debug|Win32 {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.Build.0 = Debug|Win32 {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.ActiveCfg = Release|Win32 {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.Build.0 = Release|Win32 - {F8C28DF9-D76A-449E-A621-D97D869974DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8C28DF9-D76A-449E-A621-D97D869974DA}.Debug|Win32.Build.0 = Debug|Win32 - {F8C28DF9-D76A-449E-A621-D97D869974DA}.Release|Win32.ActiveCfg = Release|Win32 - {F8C28DF9-D76A-449E-A621-D97D869974DA}.Release|Win32.Build.0 = Release|Win32 {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.ActiveCfg = Debug|Win32 {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.Build.0 = Debug|Win32 {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.ActiveCfg = Release|Win32 @@ -813,26 +782,14 @@ {49C34584-B6DA-448F-83CF-27584DC9FC90}.Debug|Win32.Build.0 = Debug|Win32 {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.ActiveCfg = Release|Win32 {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.Build.0 = Release|Win32 - {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Debug|Win32.ActiveCfg = Debug|Win32 - {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Debug|Win32.Build.0 = Debug|Win32 - {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Release|Win32.ActiveCfg = Release|Win32 - {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Release|Win32.Build.0 = Release|Win32 {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.ActiveCfg = Debug|Win32 {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.Build.0 = Debug|Win32 {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.ActiveCfg = Release|Win32 {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.Build.0 = Release|Win32 - {831F76E8-D288-4C54-9B6D-281D9436CCC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {831F76E8-D288-4C54-9B6D-281D9436CCC7}.Debug|Win32.Build.0 = Debug|Win32 - {831F76E8-D288-4C54-9B6D-281D9436CCC7}.Release|Win32.ActiveCfg = Release|Win32 - {831F76E8-D288-4C54-9B6D-281D9436CCC7}.Release|Win32.Build.0 = Release|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.ActiveCfg = Debug|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.Build.0 = Debug|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.ActiveCfg = Release|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32 - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}.Debug|Win32.ActiveCfg = Debug|Win32 - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}.Debug|Win32.Build.0 = Debug|Win32 - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}.Release|Win32.ActiveCfg = Release|Win32 - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}.Release|Win32.Build.0 = Release|Win32 {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.ActiveCfg = Debug|Win32 {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.Build.0 = Debug|Win32 {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.ActiveCfg = Release|Win32 @@ -923,10 +880,6 @@ {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32 {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32 {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32 - {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}.Debug|Win32.ActiveCfg = Debug|Win32 - {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}.Debug|Win32.Build.0 = Debug|Win32 - {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}.Release|Win32.ActiveCfg = Release|Win32 - {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}.Release|Win32.Build.0 = Release|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Debug|Win32.ActiveCfg = Debug|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Debug|Win32.Build.0 = Debug|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Release|Win32.ActiveCfg = Release|Win32 @@ -935,6 +888,10 @@ {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.Build.0 = Release|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|Win32.ActiveCfg = Debug|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|Win32.Build.0 = Debug|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.ActiveCfg = Release|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1018,15 +975,10 @@ {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} - {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {F8C28DF9-D76A-449E-A621-D97D869974DA} = {C120A020-773F-4EA3-923F-B67AF28B750D} {985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {831F76E8-D288-4C54-9B6D-281D9436CCC7} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B2CE7D1-77EF-45ED-927D-82147805440B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} EndGlobalSection EndGlobal Modified: freeswitch/branches/knhor/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/branches/knhor/trunk/conf/freeswitch.xml (original) +++ freeswitch/branches/knhor/trunk/conf/freeswitch.xml Fri Dec 22 00:27:56 2006 @@ -632,6 +632,43 @@ </user> </domain> </section> + +  + <section name="phrases" description="Speech Phrase Management"> + <macros> + <language name="en" sound_path="/snds" tts_engine="cepstral" tts_voice="david"> + <macro name="msgcount"> + <input pattern="(.*)"> + <action function="execute" data="sleep(1000)"/> + <action function="play-file" data="vm-youhave.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="vm-messages.wav"/> +  +  + </input> + </macro> + <macro name="timeleft"> + <input pattern="(\d+):(\d+)"> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining"/> + </input> + </macro> + </language> + <language name="fr" sound_path="/var/sounds/lang/fr/jean" tts_engine="cepstral" tts_voice="jean-pierre"> + <macro name="msgcount"> + <input pattern="(.*)"> + <action function="play-file" data="tuas.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="messages.wav"/> + </input> + </macro> + <macro name="timeleft"> + <input pattern="(\d+):(\d+)"> + <action function="speak-text" data="il y a $1 minutes et de $2 secondes de restant"/> + </input> + </macro> + </language> + </macros> + </section> </document> Modified: freeswitch/branches/knhor/trunk/libs/win32/curl/curllib.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/curl/curllib.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/curl/curllib.vcproj Fri Dec 22 00:27:56 2006 @@ -4,6 +4,7 @@ Version="8.00" Name="curllib" ProjectGUID="{87EE9DA4-DE1E-4448-8324-183C98DCA588}" + RootNamespace="curllib" > <Platforms> <Platform @@ -48,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\curl-7.15.2\lib\,..\..\curl-7.15.2\include" + AdditionalIncludeDirectories="..\..\curl\lib\;..\..\curl\include;." PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" StringPooling="true" RuntimeLibrary="2" @@ -128,7 +129,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\curl-7.15.2\lib\,..\..\curl-7.15.2\include" + AdditionalIncludeDirectories="..\..\curl\lib\;..\..\curl\include;." PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -182,451 +183,459 @@ Name="Source Files" > <File - RelativePath="..\..\curl-7.15.2\lib\base64.c" + RelativePath="..\..\curl\lib\base64.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\connect.c" + RelativePath="..\..\curl\lib\connect.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\content_encoding.c" + RelativePath="..\..\curl\lib\content_encoding.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\cookie.c" + RelativePath="..\..\curl\lib\cookie.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\dict.c" + RelativePath="..\..\curl\lib\dict.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\easy.c" + RelativePath="..\..\curl\lib\easy.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\escape.c" + RelativePath="..\..\curl\lib\escape.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\file.c" + RelativePath="..\..\curl\lib\file.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\formdata.c" + RelativePath="..\..\curl\lib\formdata.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ftp.c" + RelativePath="..\..\curl\lib\ftp.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\getenv.c" + RelativePath="..\..\curl\lib\getenv.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\getinfo.c" + RelativePath="..\..\curl\lib\getinfo.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\gtls.c" + RelativePath="..\..\curl\lib\gtls.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hash.c" + RelativePath="..\..\curl\lib\hash.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostares.c" + RelativePath="..\..\curl\lib\hostares.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostasyn.c" + RelativePath="..\..\curl\lib\hostasyn.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostip.c" + RelativePath="..\..\curl\lib\hostip.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostip4.c" + RelativePath="..\..\curl\lib\hostip4.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostip6.c" + RelativePath="..\..\curl\lib\hostip6.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostsyn.c" + RelativePath="..\..\curl\lib\hostsyn.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostthre.c" + RelativePath="..\..\curl\lib\hostthre.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http.c" + RelativePath="..\..\curl\lib\http.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_chunks.c" + RelativePath="..\..\curl\lib\http_chunks.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_digest.c" + RelativePath="..\..\curl\lib\http_digest.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_negotiate.c" + RelativePath="..\..\curl\lib\http_negotiate.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_ntlm.c" + RelativePath="..\..\curl\lib\http_ntlm.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\if2ip.c" + RelativePath="..\..\curl\lib\if2ip.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\inet_ntop.c" + RelativePath="..\..\curl\lib\inet_ntop.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\inet_pton.c" + RelativePath="..\..\curl\lib\inet_pton.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\krb4.c" + RelativePath="..\..\curl\lib\krb4.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ldap.c" + RelativePath="..\..\curl\lib\ldap.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\llist.c" + RelativePath="..\..\curl\lib\llist.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\md5.c" + RelativePath="..\..\curl\lib\md5.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\memdebug.c" + RelativePath="..\..\curl\lib\memdebug.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\mprintf.c" + RelativePath="..\..\curl\lib\mprintf.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\multi.c" + RelativePath="..\..\curl\lib\multi.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\netrc.c" + RelativePath="..\..\curl\lib\netrc.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\parsedate.c" + RelativePath="..\..\curl\lib\parsedate.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\progress.c" + RelativePath="..\..\curl\lib\progress.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\security.c" + RelativePath="..\..\curl\lib\security.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\select.c" + RelativePath="..\..\curl\lib\select.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\sendf.c" + RelativePath="..\..\curl\lib\sendf.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\share.c" + RelativePath="..\..\curl\lib\share.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\speedcheck.c" + RelativePath="..\..\curl\lib\socks.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\sslgen.c" + RelativePath="..\..\curl\lib\speedcheck.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ssluse.c" + RelativePath="..\..\curl\lib\splay.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strequal.c" + RelativePath="..\..\curl\lib\sslgen.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strerror.c" + RelativePath="..\..\curl\lib\ssluse.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strtok.c" + RelativePath="..\..\curl\lib\strequal.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strtoofft.c" + RelativePath="..\..\curl\lib\strerror.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\telnet.c" + RelativePath="..\..\curl\lib\strtok.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\tftp.c" + RelativePath="..\..\curl\lib\strtoofft.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\timeval.c" + RelativePath="..\..\curl\lib\telnet.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\transfer.c" + RelativePath="..\..\curl\lib\tftp.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\url.c" + RelativePath="..\..\curl\lib\timeval.c" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\version.c" + RelativePath="..\..\curl\lib\transfer.c" > </File> + <File + RelativePath="..\..\curl\lib\url.c" + > + </File> + <File + RelativePath="..\..\curl\lib\version.c" + > + </File> </Filter> <Filter Name="Header Files" > <File - RelativePath="..\..\curl-7.15.2\lib\arpa_telnet.h" + RelativePath="..\..\curl\lib\arpa_telnet.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\base64.h" + RelativePath="..\..\curl\lib\base64.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ca-bundle.h" + RelativePath="..\..\curl\lib\ca-bundle.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\config-win32.h" + RelativePath="..\..\curl\lib\config-win32.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\connect.h" + RelativePath="..\..\curl\lib\connect.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\content_encoding.h" + RelativePath="..\..\curl\lib\content_encoding.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\cookie.h" + RelativePath="..\..\curl\lib\cookie.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\curlx.h" + RelativePath="..\..\curl\lib\curlx.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\dict.h" + RelativePath="..\..\curl\lib\dict.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\easyif.h" + RelativePath="..\..\curl\lib\easyif.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\escape.h" + RelativePath="..\..\curl\lib\escape.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\file.h" + RelativePath="..\..\curl\lib\file.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\formdata.h" + RelativePath="..\..\curl\lib\formdata.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ftp.h" + RelativePath="..\..\curl\lib\ftp.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\getinfo.h" + RelativePath="..\..\curl\lib\getinfo.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\gtls.h" + RelativePath="..\..\curl\lib\gtls.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hash.h" + RelativePath="..\..\curl\lib\hash.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\hostip.h" + RelativePath="..\..\curl\lib\hostip.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http.h" + RelativePath="..\..\curl\lib\http.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_chunks.h" + RelativePath="..\..\curl\lib\http_chunks.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_digest.h" + RelativePath="..\..\curl\lib\http_digest.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_negotiate.h" + RelativePath="..\..\curl\lib\http_negotiate.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\http_ntlm.h" + RelativePath="..\..\curl\lib\http_ntlm.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\if2ip.h" + RelativePath="..\..\curl\lib\if2ip.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\inet_ntoa_r.h" + RelativePath="..\..\curl\lib\inet_ntoa_r.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\inet_ntop.h" + RelativePath="..\..\curl\lib\inet_ntop.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\inet_pton.h" + RelativePath="..\..\curl\lib\inet_pton.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\krb4.h" + RelativePath="..\..\curl\lib\krb4.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ldap.h" + RelativePath="..\..\curl\lib\ldap.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\llist.h" + RelativePath="..\..\curl\lib\llist.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\md5.h" + RelativePath="..\..\curl\lib\md5.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\memdebug.h" + RelativePath="..\..\curl\lib\memdebug.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\memory.h" + RelativePath="..\..\curl\lib\memory.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\multiif.h" + RelativePath="..\..\curl\lib\multiif.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\netrc.h" + RelativePath="..\..\curl\lib\netrc.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\parsedate.h" + RelativePath="..\..\curl\lib\parsedate.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\progress.h" + RelativePath="..\..\curl\lib\progress.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\select.h" + RelativePath="..\..\curl\lib\select.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\sendf.h" + RelativePath="..\..\curl\lib\sendf.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\setup.h" + RelativePath="..\..\curl\lib\setup.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\share.h" + RelativePath="..\..\curl\lib\share.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\sockaddr.h" + RelativePath="..\..\curl\lib\sockaddr.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\speedcheck.h" + RelativePath="..\..\curl\lib\speedcheck.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\sslgen.h" + RelativePath="..\..\curl\lib\sslgen.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\ssluse.h" + RelativePath="..\..\curl\lib\ssluse.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strequal.h" + RelativePath="..\..\curl\lib\strequal.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strerror.h" + RelativePath="..\..\curl\lib\strerror.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strtok.h" + RelativePath="..\..\curl\lib\strtok.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\strtoofft.h" + RelativePath="..\..\curl\lib\strtoofft.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\telnet.h" + RelativePath="..\..\curl\lib\telnet.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\tftp.h" + RelativePath="..\..\curl\lib\tftp.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\timeval.h" + RelativePath="..\..\curl\lib\timeval.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\transfer.h" + RelativePath="..\..\curl\lib\transfer.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\url.h" + RelativePath="..\..\curl\lib\url.h" > </File> <File - RelativePath="..\..\curl-7.15.2\lib\urldata.h" + RelativePath="..\..\curl\lib\urldata.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/etpan/libetpan.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/etpan/libetpan.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/etpan/libetpan.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" InlineFunctionExpansion="0" - AdditionalIncludeDirectories="../../libetpan-0.46/build-windows/include;../../libetpan-0.46/build-windows/include/libetpan" + AdditionalIncludeDirectories="../../libetpan/build-windows/include;../../libetpan/build-windows/include/libetpan" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBETPAN_DLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -52,7 +52,7 @@ Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CompileAs="1" - ForcedIncludeFiles="$(ProjectDir)../../libetpan-0.46/build-windows/StdAfx.h" + ForcedIncludeFiles="$(ProjectDir)../../libetpan/build-windows/StdAfx.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -129,7 +129,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../libetpan-0.46/build-windows/include;../../libetpan-0.46/build-windows/include/libetpan" + AdditionalIncludeDirectories="../../libetpan/build-windows/include;../../libetpan/build-windows/include/libetpan" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBETPAN_DLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -137,7 +137,7 @@ Detect64BitPortabilityProblems="false" DebugInformationFormat="0" CompileAs="1" - ForcedIncludeFiles="$(ProjectDir)../../libetpan-0.46/build-windows/StdAfx.h" + ForcedIncludeFiles="$(ProjectDir)../../libetpan/build-windows/StdAfx.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -197,14 +197,14 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\build_headers.list" + RelativePath="..\..\libetpan\build-windows\build_headers.list" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - CommandLine="cd ..\..\libetpan-0.46\build-windows
build_headers.bat
" + CommandLine="cd ..\..\libetpan\build-windows
build_headers.bat
" Outputs="$(InputDir)\_headers_depends" /> </FileConfiguration> @@ -213,7 +213,7 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="cd ..\..\libetpan-0.46\build-windows
build_headers.bat
" + CommandLine="cd ..\..\libetpan\build-windows
build_headers.bat
" Outputs="$(InputDir)\_headers_depends" /> </FileConfiguration> @@ -222,7 +222,7 @@ Name="engine" > <File - RelativePath="..\..\libetpan-0.46\src\engine\mailengine.c" + RelativePath="..\..\libetpan\src\engine\mailengine.c" > <FileConfiguration Name="Debug|Win32" @@ -242,7 +242,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy.c" + RelativePath="..\..\libetpan\src\engine\mailprivacy.c" > <FileConfiguration Name="Debug|Win32" @@ -262,7 +262,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy_gnupg.c" + RelativePath="..\..\libetpan\src\engine\mailprivacy_gnupg.c" > <FileConfiguration Name="Debug|Win32" @@ -282,7 +282,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy_smime.c" + RelativePath="..\..\libetpan\src\engine\mailprivacy_smime.c" > <FileConfiguration Name="Debug|Win32" @@ -302,7 +302,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy_tools.c" + RelativePath="..\..\libetpan\src\engine\mailprivacy_tools.c" > <FileConfiguration Name="Debug|Win32" @@ -326,43 +326,43 @@ Name="datatypes" > <File - RelativePath="..\..\libetpan-0.46\src\data-types\base64.c" + RelativePath="..\..\libetpan\src\data-types\base64.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\carray.c" + RelativePath="..\..\libetpan\src\data-types\carray.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\charconv.c" + RelativePath="..\..\libetpan\src\data-types\charconv.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\chash.c" + RelativePath="..\..\libetpan\src\data-types\chash.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\cinthash.c" + RelativePath="..\..\libetpan\src\data-types\cinthash.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\clist.c" + RelativePath="..\..\libetpan\src\data-types\clist.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\connect.c" + RelativePath="..\..\libetpan\src\data-types\connect.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mail_cache_db.c" + RelativePath="..\..\libetpan\src\data-types\mail_cache_db.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\maillock.c" + RelativePath="..\..\libetpan\src\data-types\maillock.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mailsem.c" + RelativePath="..\..\libetpan\src\data-types\mailsem.c" > <FileConfiguration Name="Debug|Win32" @@ -382,27 +382,27 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mailstream.c" + RelativePath="..\..\libetpan\src\data-types\mailstream.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_helper.c" + RelativePath="..\..\libetpan\src\data-types\mailstream_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_low.c" + RelativePath="..\..\libetpan\src\data-types\mailstream_low.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_socket.c" + RelativePath="..\..\libetpan\src\data-types\mailstream_socket.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_ssl.c" + RelativePath="..\..\libetpan\src\data-types\mailstream_ssl.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mapping.c" + RelativePath="..\..\libetpan\src\data-types\mapping.c" > <FileConfiguration Name="Debug|Win32" @@ -422,11 +422,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\md5.c" + RelativePath="..\..\libetpan\src\data-types\md5.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\data-types\mmapstring.c" + RelativePath="..\..\libetpan\src\data-types\mmapstring.c" > </File> </Filter> @@ -437,99 +437,115 @@ Name="imap" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl.c" + RelativePath="..\..\libetpan\src\low-level\imap\acl.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl_parser.c" + RelativePath="..\..\libetpan\src\low-level\imap\acl_parser.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl_sender.c" + RelativePath="..\..\libetpan\src\low-level\imap\acl_sender.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl_types.c" + RelativePath="..\..\libetpan\src\low-level\imap\acl_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore.c" + RelativePath="..\..\libetpan\src\low-level\imap\annotatemore.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore_parser.c" + RelativePath="..\..\libetpan\src\low-level\imap\annotatemore_parser.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore_sender.c" + RelativePath="..\..\libetpan\src\low-level\imap\annotatemore_sender.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore_types.c" + RelativePath="..\..\libetpan\src\low-level\imap\annotatemore_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_extension.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_extension.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_helper.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_keywords.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_keywords.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_parser.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_parser.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_print.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_print.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_sender.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_sender.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_socket.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_socket.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_ssl.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_ssl.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_types.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_types_helper.c" + RelativePath="..\..\libetpan\src\low-level\imap\mailimap_types_helper.c" > </File> + <File + RelativePath="..\..\libetpan\src\low-level\imap\uidplus.c" + > + </File> + <File + RelativePath="..\..\libetpan\src\low-level\imap\uidplus_parser.c" + > + </File> + <File + RelativePath="..\..\libetpan\src\low-level\imap\uidplus_sender.c" + > + </File> + <File + RelativePath="..\..\libetpan\src\low-level\imap\uidplus_types.c" + > + </File> </Filter> <Filter Name="pop3" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3.c" + RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3_helper.c" + RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3_socket.c" + RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3_socket.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3_ssl.c" + RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3_ssl.c" > </File> </Filter> @@ -537,31 +553,31 @@ Name="mime" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_content.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_content.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_decode.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_decode.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_disposition.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_disposition.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_types.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_types_helper.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_types_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write.c" > <FileConfiguration Name="Debug|Win32" @@ -581,15 +597,15 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write_file.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write_file.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write_generic.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write_generic.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write_mem.c" + RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write_mem.c" > </File> </Filter> @@ -597,19 +613,19 @@ Name="imf" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_types.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_types_helper.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf_types_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write.c" > <FileConfiguration Name="Debug|Win32" @@ -629,15 +645,15 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write_file.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write_file.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write_generic.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write_generic.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write_mem.c" + RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write_mem.c" > </File> </Filter> @@ -645,7 +661,7 @@ Name="maildir" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\maildir\maildir.c" + RelativePath="..\..\libetpan\src\low-level\maildir\maildir.c" > </File> </Filter> @@ -653,15 +669,15 @@ Name="mbox" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\mbox\mailmbox.c" + RelativePath="..\..\libetpan\src\low-level\mbox\mailmbox.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mbox\mailmbox_parse.c" + RelativePath="..\..\libetpan\src\low-level\mbox\mailmbox_parse.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\mbox\mailmbox_types.c" + RelativePath="..\..\libetpan\src\low-level\mbox\mailmbox_types.c" > </File> </Filter> @@ -669,7 +685,7 @@ Name="mh" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\mh\mailmh.c" + RelativePath="..\..\libetpan\src\low-level\mh\mailmh.c" > </File> </Filter> @@ -677,15 +693,15 @@ Name="nntp" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\nntp\newsnntp.c" + RelativePath="..\..\libetpan\src\low-level\nntp\newsnntp.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\nntp\newsnntp_socket.c" + RelativePath="..\..\libetpan\src\low-level\nntp\newsnntp_socket.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\nntp\newsnntp_ssl.c" + RelativePath="..\..\libetpan\src\low-level\nntp\newsnntp_ssl.c" > </File> </Filter> @@ -693,19 +709,19 @@ Name="smtp" > <File - RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp.c" + RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp_helper.c" + RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp_socket.c" + RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp_socket.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp_ssl.c" + RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp_ssl.c" > </File> </Filter> @@ -717,43 +733,43 @@ Name="interface" > <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver.c" + RelativePath="..\..\libetpan\src\driver\interface\maildriver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver_tools.c" + RelativePath="..\..\libetpan\src\driver\interface\maildriver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver_types.c" + RelativePath="..\..\libetpan\src\driver\interface\maildriver_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver_types_helper.c" + RelativePath="..\..\libetpan\src\driver\interface\maildriver_types_helper.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\mailfolder.c" + RelativePath="..\..\libetpan\src\driver\interface\mailfolder.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\mailmessage.c" + RelativePath="..\..\libetpan\src\driver\interface\mailmessage.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\mailmessage_tools.c" + RelativePath="..\..\libetpan\src\driver\interface\mailmessage_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\mailmessage_types.c" + RelativePath="..\..\libetpan\src\driver\interface\mailmessage_types.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\mailstorage.c" + RelativePath="..\..\libetpan\src\driver\interface\mailstorage.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\interface\mailstorage_tools.c" + RelativePath="..\..\libetpan\src\driver\interface\mailstorage_tools.c" > </File> </Filter> @@ -764,7 +780,7 @@ Name="data-message" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\data-message\data_message_driver.c" + RelativePath="..\..\libetpan\src\driver\implementation\data-message\data_message_driver.c" > </File> </Filter> @@ -772,7 +788,7 @@ Name="db" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\db\dbdriver.c" + RelativePath="..\..\libetpan\src\driver\implementation\db\dbdriver.c" > <FileConfiguration Name="Debug|Win32" @@ -792,7 +808,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\db\dbdriver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\db\dbdriver_message.c" > <FileConfiguration Name="Debug|Win32" @@ -812,7 +828,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\db\dbstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\db\dbstorage.c" > <FileConfiguration Name="Debug|Win32" @@ -836,7 +852,7 @@ Name="hotmail" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\hotmail\hotmailstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\hotmail\hotmailstorage.c" > </File> </Filter> @@ -844,27 +860,27 @@ Name="imap" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver.c" + RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_cached.c" + RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_cached.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_cached_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_cached_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_tools.c" + RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\imap\imapstorage.c" > </File> </Filter> @@ -872,27 +888,27 @@ Name="maildir" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver.c" + RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_cached.c" + RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_cached.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_cached_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_cached_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_tools.c" + RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirstorage.c" > </File> </Filter> @@ -900,27 +916,27 @@ Name="mbox" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver.c" + RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_cached.c" + RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_cached.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_cached_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_cached_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_tools.c" + RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxstorage.c" > </File> </Filter> @@ -928,27 +944,27 @@ Name="mh" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver.c" + RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_cached.c" + RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_cached.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_cached_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_cached_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_tools.c" + RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\mh\mhstorage.c" > </File> </Filter> @@ -956,7 +972,7 @@ Name="mime-message" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\mime-message\mime_message_driver.c" + RelativePath="..\..\libetpan\src\driver\implementation\mime-message\mime_message_driver.c" > </File> </Filter> @@ -964,27 +980,27 @@ Name="nntp" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver.c" + RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_cached.c" + RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_cached.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_cached_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_cached_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_tools.c" + RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpstorage.c" + RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpstorage.c" > </File> </Filter> @@ -992,27 +1008,27 @@ Name="pop3" > <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver.c" + RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_cached.c" + RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_cached.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_cached_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_cached_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_message.c" + RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_message.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_tools.c" + RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_tools.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3storage.c" + RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3storage.c" > </File> </Filter> @@ -1021,19 +1037,19 @@ Name="tools" > <File - RelativePath="..\..\libetpan-0.46\src\driver\tools\generic_cache.c" + RelativePath="..\..\libetpan\src\driver\tools\generic_cache.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\tools\imfcache.c" + RelativePath="..\..\libetpan\src\driver\tools\imfcache.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\tools\mailthread.c" + RelativePath="..\..\libetpan\src\driver\tools\mailthread.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\driver\tools\mailthread_types.c" + RelativePath="..\..\libetpan\src\driver\tools\mailthread_types.c" > </File> </Filter> @@ -1042,23 +1058,23 @@ Name="Windows" > <File - RelativePath="..\..\libetpan-0.46\src\windows\dirent.c" + RelativePath="..\..\libetpan\src\windows\dirent.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\windows\misc.c" + RelativePath="..\..\libetpan\src\windows\misc.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\windows\mmap.c" + RelativePath="..\..\libetpan\src\windows\mmap.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\windows\time_r.c" + RelativePath="..\..\libetpan\src\windows\time_r.c" > </File> <File - RelativePath="..\..\libetpan-0.46\src\windows\wsocket.cpp" + RelativePath="..\..\libetpan\src\windows\wsocket.cpp" > <FileConfiguration Name="Debug|Win32" Modified: freeswitch/branches/knhor/trunk/libs/win32/iksemel/iksemel.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/iksemel/iksemel.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/iksemel/iksemel.vcproj Fri Dec 22 00:27:56 2006 @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\iksemel-1.2\include;." + AdditionalIncludeDirectories="..\..\iksemel\include;." PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -103,7 +103,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\iksemel-1.2\include;." + AdditionalIncludeDirectories="..\..\iksemel\include;." PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -149,51 +149,51 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\iksemel-1.2\src\base64.c" + RelativePath="..\..\iksemel\src\base64.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\dom.c" + RelativePath="..\..\iksemel\src\dom.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\filter.c" + RelativePath="..\..\iksemel\src\filter.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\iks.c" + RelativePath="..\..\iksemel\src\iks.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\ikstack.c" + RelativePath="..\..\iksemel\src\ikstack.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\io-posix.c" + RelativePath="..\..\iksemel\src\io-posix.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\jabber.c" + RelativePath="..\..\iksemel\src\jabber.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\md5.c" + RelativePath="..\..\iksemel\src\md5.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\sax.c" + RelativePath="..\..\iksemel\src\sax.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\sha.c" + RelativePath="..\..\iksemel\src\sha.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\stream.c" + RelativePath="..\..\iksemel\src\stream.c" > </File> <File - RelativePath="..\..\iksemel-1.2\src\utility.c" + RelativePath="..\..\iksemel\src\utility.c" > </File> </Filter> @@ -203,19 +203,19 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath="..\..\iksemel-1.2\include\common.h" + RelativePath="..\..\iksemel\include\common.h" > </File> <File - RelativePath="..\..\iksemel-1.2\include\config.h" + RelativePath="..\..\iksemel\include\config.h" > </File> <File - RelativePath="..\..\iksemel-1.2\include\finetune.h" + RelativePath="..\..\iksemel\include\finetune.h" > </File> <File - RelativePath="..\..\iksemel-1.2\include\iksemel.h" + RelativePath="..\..\iksemel\include\iksemel.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/libsndfile/libsndfile.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/libsndfile/libsndfile.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/libsndfile/libsndfile.vcproj Fri Dec 22 00:27:56 2006 @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" UseUnicodeResponseFiles="true" Optimization="0" - AdditionalIncludeDirectories="..\..\libsndfile-1.0.16\src;." + AdditionalIncludeDirectories="..\..\libsndfile\src;." PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -106,7 +106,7 @@ <Tool Name="VCCLCompilerTool" UseUnicodeResponseFiles="true" - AdditionalIncludeDirectories="..\..\libsndfile-1.0.16\src;." + AdditionalIncludeDirectories="..\..\libsndfile\src;." PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -153,31 +153,31 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\libsndfile-1.0.16\src\aiff.c" + RelativePath="..\..\libsndfile\src\aiff.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\alaw.c" + RelativePath="..\..\libsndfile\src\alaw.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\au.c" + RelativePath="..\..\libsndfile\src\au.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\avr.c" + RelativePath="..\..\libsndfile\src\avr.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\broadcast.c" + RelativePath="..\..\libsndfile\src\broadcast.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\caf.c" + RelativePath="..\..\libsndfile\src\caf.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\command.c" + RelativePath="..\..\libsndfile\src\command.c" > </File> <File @@ -185,35 +185,35 @@ > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\dither.c" + RelativePath="..\..\libsndfile\src\dither.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\double64.c" + RelativePath="..\..\libsndfile\src\double64.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\dwd.c" + RelativePath="..\..\libsndfile\src\dwd.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\dwvw.c" + RelativePath="..\..\libsndfile\src\dwvw.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\file_io.c" + RelativePath="..\..\libsndfile\src\file_io.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\flac.c" + RelativePath="..\..\libsndfile\src\flac.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\float32.c" + RelativePath="..\..\libsndfile\src\float32.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\g72x.c" + RelativePath="..\..\libsndfile\src\g72x.c" > <FileConfiguration Name="Debug|Win32" @@ -235,174 +235,174 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\gsm610.c" + RelativePath="..\..\libsndfile\src\gsm610.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\htk.c" + RelativePath="..\..\libsndfile\src\htk.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\ima_adpcm.c" + RelativePath="..\..\libsndfile\src\ima_adpcm.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\ircam.c" + RelativePath="..\..\libsndfile\src\ircam.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\mat4.c" + RelativePath="..\..\libsndfile\src\mat4.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\mat5.c" + RelativePath="..\..\libsndfile\src\mat5.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\ms_adpcm.c" + RelativePath="..\..\libsndfile\src\ms_adpcm.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\nist.c" + RelativePath="..\..\libsndfile\src\nist.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\ogg.c" + RelativePath="..\..\libsndfile\src\ogg.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\paf.c" + RelativePath="..\..\libsndfile\src\paf.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\pcm.c" + RelativePath="..\..\libsndfile\src\pcm.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\pvf.c" + RelativePath="..\..\libsndfile\src\pvf.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\raw.c" + RelativePath="..\..\libsndfile\src\raw.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\rx2.c" + RelativePath="..\..\libsndfile\src\rx2.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\sd2.c" + RelativePath="..\..\libsndfile\src\sd2.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\sds.c" + RelativePath="..\..\libsndfile\src\sds.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\sndfile.c" + RelativePath="..\..\libsndfile\src\sndfile.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\strings.c" + RelativePath="..\..\libsndfile\src\strings.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\svx.c" + RelativePath="..\..\libsndfile\src\svx.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\txw.c" + RelativePath="..\..\libsndfile\src\txw.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\ulaw.c" + RelativePath="..\..\libsndfile\src\ulaw.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\voc.c" + RelativePath="..\..\libsndfile\src\voc.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\vox_adpcm.c" + RelativePath="..\..\libsndfile\src\vox_adpcm.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\w64.c" + RelativePath="..\..\libsndfile\src\w64.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\wav.c" + RelativePath="..\..\libsndfile\src\wav.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\wav_w64.c" + RelativePath="..\..\libsndfile\src\wav_w64.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\wve.c" + RelativePath="..\..\libsndfile\src\wve.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\xi.c" + RelativePath="..\..\libsndfile\src\xi.c" > </File> <Filter Name="GSM Sources" > <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\add.c" + RelativePath="..\..\libsndfile\src\GSM610\add.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\code.c" + RelativePath="..\..\libsndfile\src\GSM610\code.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\decode.c" + RelativePath="..\..\libsndfile\src\GSM610\decode.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_create.c" + RelativePath="..\..\libsndfile\src\GSM610\gsm_create.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_decode.c" + RelativePath="..\..\libsndfile\src\GSM610\gsm_decode.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_destroy.c" + RelativePath="..\..\libsndfile\src\GSM610\gsm_destroy.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_encode.c" + RelativePath="..\..\libsndfile\src\GSM610\gsm_encode.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_option.c" + RelativePath="..\..\libsndfile\src\GSM610\gsm_option.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\long_term.c" + RelativePath="..\..\libsndfile\src\GSM610\long_term.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\lpc.c" + RelativePath="..\..\libsndfile\src\GSM610\lpc.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\preprocess.c" + RelativePath="..\..\libsndfile\src\GSM610\preprocess.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\rpe.c" + RelativePath="..\..\libsndfile\src\GSM610\rpe.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\short_term.c" + RelativePath="..\..\libsndfile\src\GSM610\short_term.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\GSM610\table.c" + RelativePath="..\..\libsndfile\src\GSM610\table.c" > </File> </Filter> @@ -410,23 +410,23 @@ Name="G72X Sources" > <File - RelativePath="..\..\libsndfile-1.0.16\src\G72x\g721.c" + RelativePath="..\..\libsndfile\src\G72x\g721.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_16.c" + RelativePath="..\..\libsndfile\src\G72x\g723_16.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_24.c" + RelativePath="..\..\libsndfile\src\G72x\g723_24.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_40.c" + RelativePath="..\..\libsndfile\src\G72x\g723_40.c" > </File> <File - RelativePath="..\..\libsndfile-1.0.16\src\G72x\g72x.c" + RelativePath="..\..\libsndfile\src\G72x\g72x.c" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/speex/libspeex.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/speex/libspeex.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/speex/libspeex.vcproj Fri Dec 22 00:27:56 2006 @@ -44,7 +44,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\..\speex-1.1.11.1\win32, ..\..\speex-1.1.11.1\include" + AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H" RuntimeLibrary="1" PrecompiledHeaderFile=".\Debug/libspeex.pch" @@ -118,7 +118,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\..\speex-1.1.11.1\win32, ..\..\speex-1.1.11.1\include" + AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include" PreprocessorDefinitions="inline=__inline;WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H" RuntimeLibrary="0" PrecompiledHeaderFile=".\Release/libspeex.pch" @@ -171,216 +171,220 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="..\..\speex-1.1.11.1\libspeex\bits.c" + RelativePath="..\..\speex\libspeex\bits.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\cb_search.c" + RelativePath="..\..\speex\libspeex\cb_search.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\exc_10_16_table.c" + RelativePath="..\..\speex\libspeex\exc_10_16_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\exc_10_32_table.c" + RelativePath="..\..\speex\libspeex\exc_10_32_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\exc_20_32_table.c" + RelativePath="..\..\speex\libspeex\exc_20_32_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\exc_5_256_table.c" + RelativePath="..\..\speex\libspeex\exc_5_256_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\exc_5_64_table.c" + RelativePath="..\..\speex\libspeex\exc_5_64_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\exc_8_128_table.c" + RelativePath="..\..\speex\libspeex\exc_8_128_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\filters.c" + RelativePath="..\..\speex\libspeex\filters.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\gain_table.c" + RelativePath="..\..\speex\libspeex\gain_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\gain_table_lbr.c" + RelativePath="..\..\speex\libspeex\gain_table_lbr.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\hexc_10_32_table.c" + RelativePath="..\..\speex\libspeex\hexc_10_32_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\hexc_table.c" + RelativePath="..\..\speex\libspeex\hexc_table.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\high_lsp_tables.c" + RelativePath="..\..\speex\libspeex\high_lsp_tables.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\lpc.c" + RelativePath="..\..\speex\libspeex\lpc.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\lsp.c" + RelativePath="..\..\speex\libspeex\lsp.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\lsp_tables_nb.c" + RelativePath="..\..\speex\libspeex\lsp_tables_nb.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\ltp.c" + RelativePath="..\..\speex\libspeex\ltp.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\math_approx.c" + RelativePath="..\..\speex\libspeex\math_approx.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\misc.c" + RelativePath="..\..\speex\libspeex\misc.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\modes.c" + RelativePath="..\..\speex\libspeex\modes.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\nb_celp.c" + RelativePath="..\..\speex\libspeex\nb_celp.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\preprocess.c" + RelativePath="..\..\speex\libspeex\preprocess.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\quant_lsp.c" + RelativePath="..\..\speex\libspeex\quant_lsp.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\sb_celp.c" + RelativePath="..\..\speex\libspeex\sb_celp.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\smallft.c" + RelativePath="..\..\speex\libspeex\smallft.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex.c" + RelativePath="..\..\speex\libspeex\speex.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_callbacks.c" + RelativePath="..\..\speex\libspeex\speex_callbacks.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_header.c" + RelativePath="..\..\speex\libspeex\speex_header.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\stereo.c" + RelativePath="..\..\speex\libspeex\stereo.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\vbr.c" + RelativePath="..\..\speex\libspeex\vbr.c" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\vq.c" + RelativePath="..\..\speex\libspeex\vq.c" > </File> + <File + RelativePath="..\..\speex\libspeex\window.c" + > + </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl" > <File - RelativePath="..\..\speex-1.1.11.1\libspeex\cb_search.h" + RelativePath="..\..\speex\libspeex\cb_search.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\filters.h" + RelativePath="..\..\speex\libspeex\filters.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\lpc.h" + RelativePath="..\..\speex\libspeex\lpc.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\lsp.h" + RelativePath="..\..\speex\libspeex\lsp.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\ltp.h" + RelativePath="..\..\speex\libspeex\ltp.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\misc.h" + RelativePath="..\..\speex\libspeex\misc.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\modes.h" + RelativePath="..\..\speex\libspeex\modes.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\nb_celp.h" + RelativePath="..\..\speex\libspeex\nb_celp.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\quant_lsp.h" + RelativePath="..\..\speex\libspeex\quant_lsp.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\sb_celp.h" + RelativePath="..\..\speex\libspeex\sb_celp.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\smallft.h" + RelativePath="..\..\speex\libspeex\smallft.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex.h" + RelativePath="..\..\speex\libspeex\speex.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_bits.h" + RelativePath="..\..\speex\libspeex\speex_bits.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_callbacks.h" + RelativePath="..\..\speex\libspeex\speex_callbacks.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_denoise.h" + RelativePath="..\..\speex\libspeex\speex_denoise.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_header.h" + RelativePath="..\..\speex\libspeex\speex_header.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\speex_stereo.h" + RelativePath="..\..\speex\libspeex\speex_stereo.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\stack_alloc.h" + RelativePath="..\..\speex\libspeex\stack_alloc.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\vbr.h" + RelativePath="..\..\speex\libspeex\vbr.h" > </File> <File - RelativePath="..\..\speex-1.1.11.1\libspeex\vq.h" + RelativePath="..\..\speex\libspeex\vq.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/Abyss.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/Abyss.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/Abyss.vcproj Fri Dec 22 00:27:56 2006 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c-1.03.14/";"$(ProjectDir)../../xmlrpc-c-1.03.14/include/";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/util/include/"" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/include/";"$(ProjectDir)../../xmlrpc-c/lib/util/include/"" PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;ABYSS_WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" RuntimeLibrary="3" @@ -119,7 +119,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c-1.03.14/";"$(ProjectDir)../../xmlrpc-c-1.03.14/include/";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/util/include/"" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/include/";"$(ProjectDir)../../xmlrpc-c/lib/util/include/"" PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;ABYSS_WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" @@ -172,7 +172,7 @@ Filter="c" > <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\conf.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\conf.c" > <FileConfiguration Name="Debug|Win32" @@ -194,7 +194,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\conn.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\conn.c" > <FileConfiguration Name="Debug|Win32" @@ -216,7 +216,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\data.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\data.c" > <FileConfiguration Name="Debug|Win32" @@ -238,7 +238,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\file.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\file.c" > <FileConfiguration Name="Debug|Win32" @@ -260,7 +260,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\http.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\http.c" > <FileConfiguration Name="Debug|Win32" @@ -282,7 +282,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\server.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\server.c" > <FileConfiguration Name="Debug|Win32" @@ -304,7 +304,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\socket.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\socket.c" > <FileConfiguration Name="Debug|Win32" @@ -326,7 +326,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\thread.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\thread.c" > <FileConfiguration Name="Debug|Win32" @@ -348,11 +348,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\.\token.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\.\token.c" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\trace.c" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\trace.c" > <FileConfiguration Name="Debug|Win32" @@ -379,7 +379,7 @@ Filter="h" > <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\abyss\src\abyss.h" + RelativePath="..\..\xmlrpc-c\lib\abyss\src\abyss.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/xmlrpc.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/xmlrpc.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/xmlrpc/xmlrpc.vcproj Fri Dec 22 00:27:56 2006 @@ -26,7 +26,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist $(ProjectDir)..\..\xmlrpc-c-1.03.14\transport_config.h copy "$(ProjectDir)..\..\xmlrpc-c-1.03.14\Windows\transport_config_win32.h" $(ProjectDir)..\..\xmlrpc-c-1.03.14\transport_config.h
if not exist $(ProjectDir)..\..\xmlrpc-c-1.03.14\config.h copy "$(ProjectDir)..\..\xmlrpc-c-1.03.14\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c-1.03.14\config.h
if not exist $(ProjectDir)..\..\xmlrpc-c-1.03.14\xmlrpc_config.h copy "$(ProjectDir)..\..\xmlrpc-c-1.03.14\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c-1.03.14\xmlrpc_config.h
" + CommandLine="if not exist $(ProjectDir)..\..\xmlrpc-c\transport_config.h copy "$(ProjectDir)..\..\xmlrpc-c\Windows\transport_config_win32.h" $(ProjectDir)..\..\xmlrpc-c\transport_config.h
if not exist $(ProjectDir)..\..\xmlrpc-c\config.h copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c\config.h
if not exist $(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h
" /> <Tool Name="VCCustomBuildTool" @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c-1.03.14/lib/";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/curl_transport";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/util/include";"$(ProjectDir)../../xmlrpc-c-1.03.14/include";"$(ProjectDir)../../xmlrpc-c-1.03.14/";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/expat/xmlparse";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/abyss/src";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/wininet_transport";"$(ProjectDir)../../include"" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/lib/";"$(ProjectDir)../../xmlrpc-c/lib/curl_transport";"$(ProjectDir)../../xmlrpc-c/lib/util/include";"$(ProjectDir)../../xmlrpc-c/include";"$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/lib/expat/xmlparse";"$(ProjectDir)../../xmlrpc-c/lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../../xmlrpc-c/lib/abyss/src";"$(ProjectDir)../../xmlrpc-c/lib/wininet_transport";"$(ProjectDir)../../include"" PreprocessorDefinitions="_DEBUG;WIN32;_LIB;ABYSS_WIN32;CURL_STATICLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -102,7 +102,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist $(ProjectDir)..\..\xmlrpc-c-1.03.14\transport_config.h copy "$(ProjectDir)..\..\xmlrpc-c-1.03.14\Windows\transport_config_win32.h" $(ProjectDir)..\..\xmlrpc-c-1.03.14\transport_config.h
if not exist $(ProjectDir)..\..\xmlrpc-c-1.03.14\config.h copy "$(ProjectDir)..\..\xmlrpc-c-1.03.14\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c-1.03.14\config.h
if not exist $(ProjectDir)..\..\xmlrpc-c-1.03.14\xmlrpc_config.h copy "$(ProjectDir)..\..\xmlrpc-c-1.03.14\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c-1.03.14\xmlrpc_config.h
" + CommandLine="if not exist $(ProjectDir)..\..\xmlrpc-c\transport_config.h copy "$(ProjectDir)..\..\xmlrpc-c\Windows\transport_config_win32.h" $(ProjectDir)..\..\xmlrpc-c\transport_config.h
if not exist $(ProjectDir)..\..\xmlrpc-c\config.h copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c\config.h
if not exist $(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" $(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h
" /> <Tool Name="VCCustomBuildTool" @@ -120,7 +120,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c-1.03.14/lib/";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/curl_transport";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/util/include";"$(ProjectDir)../../xmlrpc-c-1.03.14/include";"$(ProjectDir)../../xmlrpc-c-1.03.14/";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/expat/xmlparse";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/abyss/src";"$(ProjectDir)../../xmlrpc-c-1.03.14/lib/wininet_transport";"$(ProjectDir)../../include"" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/lib/";"$(ProjectDir)../../xmlrpc-c/lib/curl_transport";"$(ProjectDir)../../xmlrpc-c/lib/util/include";"$(ProjectDir)../../xmlrpc-c/include";"$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/lib/expat/xmlparse";"$(ProjectDir)../../xmlrpc-c/lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../../xmlrpc-c/lib/abyss/src";"$(ProjectDir)../../xmlrpc-c/lib/wininet_transport";"$(ProjectDir)../../include"" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;ABYSS_WIN32;CURL_STATICLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" @@ -176,7 +176,7 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc" > <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\util\casprintf.c" + RelativePath="..\..\xmlrpc-c\lib\util\casprintf.c" > <FileConfiguration Name="Debug|Win32" @@ -198,7 +198,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\util\pthreadx_win32.c" + RelativePath="..\..\xmlrpc-c\lib\util\pthreadx_win32.c" > <FileConfiguration Name="Debug|Win32" @@ -220,7 +220,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_array.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_array.c" > <FileConfiguration Name="Debug|Win32" @@ -242,7 +242,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_authcookie.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_authcookie.c" > <FileConfiguration Name="Debug|Win32" @@ -264,7 +264,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_base64.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_base64.c" > <FileConfiguration Name="Debug|Win32" @@ -286,7 +286,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_builddecomp.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_builddecomp.c" > <FileConfiguration Name="Debug|Win32" @@ -308,7 +308,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_client.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_client.c" > <FileConfiguration Name="Debug|Win32" @@ -330,7 +330,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\curl_transport\xmlrpc_curl_transport.c" + RelativePath="..\..\xmlrpc-c\lib\curl_transport\xmlrpc_curl_transport.c" > <FileConfiguration Name="Debug|Win32" @@ -354,7 +354,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_data.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_data.c" > <FileConfiguration Name="Debug|Win32" @@ -376,7 +376,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_datetime.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_datetime.c" > <FileConfiguration Name="Debug|Win32" @@ -398,7 +398,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_expat.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_expat.c" > <FileConfiguration Name="Debug|Win32" @@ -420,7 +420,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_libxml2.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_libxml2.c" > <FileConfiguration Name="Debug|Win32" @@ -444,7 +444,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_parse.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_parse.c" > <FileConfiguration Name="Debug|Win32" @@ -466,7 +466,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_registry.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_registry.c" > <FileConfiguration Name="Debug|Win32" @@ -488,7 +488,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_serialize.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_serialize.c" > <FileConfiguration Name="Debug|Win32" @@ -510,7 +510,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_server_abyss.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_server_abyss.c" > <FileConfiguration Name="Debug|Win32" @@ -532,7 +532,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_server_w32httpsys.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_server_w32httpsys.c" > <FileConfiguration Name="Debug|Win32" @@ -556,7 +556,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_struct.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_struct.c" > <FileConfiguration Name="Debug|Win32" @@ -578,7 +578,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_strutil.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_strutil.c" > <FileConfiguration Name="Debug|Win32" @@ -600,7 +600,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_support.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_support.c" > <FileConfiguration Name="Debug|Win32" @@ -622,7 +622,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\src\xmlrpc_utf8.c" + RelativePath="..\..\xmlrpc-c\src\xmlrpc_utf8.c" > <FileConfiguration Name="Debug|Win32" @@ -644,7 +644,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\wininet_transport\xmlrpc_wininet_transport.c" + RelativePath="..\..\xmlrpc-c\lib\wininet_transport\xmlrpc_wininet_transport.c" > <FileConfiguration Name="Debug|Win32" @@ -671,75 +671,75 @@ Filter="h;hpp;hxx;hm;inl" > <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\abyss.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\abyss.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\base.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\base.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\util\include\bool.h" + RelativePath="..\..\xmlrpc-c\lib\util\include\bool.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\client.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\client.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\client_int.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\client_int.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\util\include\mallocvar.h" + RelativePath="..\..\xmlrpc-c\lib\util\include\mallocvar.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\util\include\pthreadx.h" + RelativePath="..\..\xmlrpc-c\lib\util\include\pthreadx.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\server.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\server_abyss.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server_abyss.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\server_cgi.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server_cgi.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\server_w32httpsys.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server_w32httpsys.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\transport.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\transport.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\transport_config.h" + RelativePath="..\..\xmlrpc-c\transport_config.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\transport_int.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\transport_int.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\include\xmlrpc-c\xmlparser.h" + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\xmlparser.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\xmlrpc_config.h" + RelativePath="..\..\xmlrpc-c\xmlrpc_config.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\curl_transport\xmlrpc_curl_transport.h" + RelativePath="..\..\xmlrpc-c\lib\curl_transport\xmlrpc_curl_transport.h" > </File> <File - RelativePath="..\..\xmlrpc-c-1.03.14\lib\wininet_transport\xmlrpc_wininet_transport.h" + RelativePath="..\..\xmlrpc-c\lib\wininet_transport\xmlrpc_wininet_transport.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_ivr.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_ivr.h Fri Dec 22 00:27:56 2006 @@ -626,6 +626,13 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_init(switch_ivr_menu_xml_ctx_t **xml_menu_ctx, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, + char *macro_name, + char *data, + char *lang, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen); /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/branches/knhor/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_loadable_module.h Fri Dec 22 00:27:56 2006 @@ -75,6 +75,8 @@ const switch_directory_interface_t *directory_interface; /*! the table of chat interfaces the module has implmented */ const switch_chat_interface_t *chat_interface; + /*! the table of say interfaces the module has implmented */ + const switch_say_interface_t *say_interface; /*! the table of asr interfaces the module has implmented */ const switch_asr_interface_t *asr_interface; }; @@ -180,6 +182,13 @@ \return the desired chat interface */ SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name); + +/*! + \brief Retrieve the say interface by it's registered name + \param name the name of the say interface + \return the desired say interface + */ +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name); /*! Modified: freeswitch/branches/knhor/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_module_interfaces.h Fri Dec 22 00:27:56 2006 @@ -412,6 +412,14 @@ void *private_info; }; +/*! \brief Abstract interface to a say module */ +struct switch_say_interface { + /*! the name of the interface */ + const char *interface_name; + /*! function to pass down to the module */ + switch_say_callback_t say_function; + const struct switch_say_interface *next; +}; /*! \brief Abstract interface to a chat module */ struct switch_chat_interface { Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_types.h Fri Dec 22 00:27:56 2006 @@ -94,6 +94,33 @@ typedef uint8_t switch_byte_t; typedef enum { + SSM_NA, + SSM_PRONOUNCED, + SSM_ITERATED +} switch_say_method_t; + +typedef enum { + SST_NUMBER, + SST_ITEMS, + SST_PERSONS, + SST_MESSAGES, + SST_CURRENCY, + SST_TIME_MEASUREMENT, + SST_CURRENT_DATE, + SST_CURRENT_TIME, + SST_CURRENT_DATE_TIME, + SST_TELEPHONE_NUMBER, + SST_TELEPHONE_EXTENSION, + SST_URL, + SST_EMAIL_ADDRESS, + SST_POSTAL_ADDRESS, + SST_ACCOUNT_NUMBER, + SST_NAME_SPELLED, + SST_NAME_PHONETIC, +} switch_say_type_t; + + +typedef enum { SMF_NONE = 0, SMF_REBRIDGE = (1 << 0), SMF_ECHO_ALEG = (1 << 1), @@ -172,7 +199,8 @@ SWITCH_XML_SECTION_RESULT = 0, SWITCH_XML_SECTION_CONFIG = (1 << 0), SWITCH_XML_SECTION_DIRECTORY = (1 << 1), - SWITCH_XML_SECTION_DIALPLAN = (1 << 2) + SWITCH_XML_SECTION_DIALPLAN = (1 << 2), + SWITCH_XML_SECTION_PHRASES = (1 << 3) } switch_xml_section_t; /*! @@ -888,6 +916,14 @@ switch_input_type_t input_type, void *buf, unsigned int buflen); +typedef struct switch_say_interface switch_say_interface_t; +typedef switch_status_t (*switch_say_callback_t)(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen); typedef int (*switch_core_db_callback_func_t)(void *pArg, int argc, char **argv, char **columnNames); typedef switch_status_t (*switch_module_load_t) (switch_loadable_module_interface_t **, char *); typedef switch_status_t (*switch_module_reload_t) (void); Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Dec 22 00:27:56 2006 @@ -102,6 +102,32 @@ return; } +static void phrase_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + char *mydata = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if ((mydata = switch_core_session_strdup(session, data))) { + char *lang; + char *macro = mydata; + char *mdata = NULL; + + if ((mdata = strchr(macro, ','))) { + *mdata++ = '\0'; + } + if (!(lang = switch_channel_get_variable(channel, "language"))) { + lang = "en"; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, mdata, lang); + switch_ivr_phrase_macro(session, macro, mdata, lang, NULL, NULL, 0); + } + +} + static void answer_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; @@ -462,13 +488,23 @@ }; +static const switch_application_interface_t phrase_application_interface = { + /*.interface_name */ "phrase", + /*.application_function */ phrase_function, + /* long_desc */ "Say a Phrase", + /* short_desc */ "Say a Phrase", + /* syntax */ "<macro_name>,<data>", + /*.next */ &eval_application_interface + +}; + static const switch_application_interface_t strftime_application_interface = { /*.interface_name */ "strftime", /*.application_function */ strftime_function, /* long_desc */ NULL, /* short_desc */ NULL, /* syntax */ NULL, - /*.next */ &eval_application_interface + /*.next */ &phrase_application_interface }; Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_enum/mod_enum.c Fri Dec 22 00:27:56 2006 @@ -549,10 +549,7 @@ if (extension) { switch_channel_set_state(channel, CS_EXECUTE); - } else { - switch_channel_hangup(channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } - return extension; Modified: freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/Makefile Fri Dec 22 00:27:56 2006 @@ -1,7 +1,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.12.tar.gz --prefix=$(PREFIX) --disable-shared --with-pic + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex --prefix=$(PREFIX) --disable-shared --with-pic $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include\speex"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -124,7 +124,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include\speex"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" Modified: freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Fri Dec 22 00:27:56 2006 @@ -150,8 +150,6 @@ if (extension) { switch_channel_set_state(channel, CS_EXECUTE); - } else { - switch_channel_hangup(channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } return extension; Modified: freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Dec 22 00:27:56 2006 @@ -290,7 +290,6 @@ if (switch_xml_locate("dialplan", NULL, NULL, NULL, &xml, &cfg, stream.data) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of dialplan failed\n"); - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return NULL; } @@ -300,7 +299,6 @@ if (!(xcontext = switch_xml_find_child(cfg, "context", "name", context))) { if (!(xcontext = switch_xml_find_child(cfg, "context", "name", "global"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "context %s not found\n", context); - switch_channel_hangup(channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); switch_xml_free(xml); return NULL; } @@ -328,8 +326,6 @@ if (extension) { switch_channel_set_state(channel, CS_EXECUTE); - } else { - switch_channel_hangup(channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } return extension; Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/Makefile Fri Dec 22 00:27:56 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libdingaling --prefix=$(PREFIX) Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Dec 22 00:27:56 2006 @@ -1131,28 +1131,41 @@ switch_channel_t *channel = NULL; struct private_object *tech_pvt = NULL; - if ((channel = switch_core_session_get_channel(session))) { - if ((tech_pvt = switch_core_session_get_private(session))) { - switch_clear_flag_locked(tech_pvt, TFLAG_IO); - switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); + if (!(channel = switch_core_session_get_channel(session))) { + return SWITCH_STATUS_SUCCESS; + } - if (tech_pvt->dlsession) { - if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { - ldl_session_terminate(tech_pvt->dlsession); - switch_set_flag_locked(tech_pvt, TFLAG_TERM); - } - ldl_session_destroy(&tech_pvt->dlsession); + if (!(tech_pvt = switch_core_session_get_private(session))) { + return SWITCH_STATUS_SUCCESS; + } + - } + switch (sig) { + case SWITCH_SIG_KILL: + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); - if (switch_rtp_ready(tech_pvt->rtp_session)) { - switch_rtp_kill_socket(tech_pvt->rtp_session); - } + if (tech_pvt->dlsession) { + if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { + ldl_session_terminate(tech_pvt->dlsession); + switch_set_flag_locked(tech_pvt, TFLAG_TERM); + } + ldl_session_destroy(&tech_pvt->dlsession); + + } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); - } - } + if (switch_rtp_ready(tech_pvt->rtp_session)) { + switch_rtp_kill_socket(tech_pvt->rtp_session); + } + break; + case SWITCH_SIG_BREAK: + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); + break; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri Dec 22 00:27:56 2006 @@ -566,11 +566,16 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag_locked(tech_pvt, TFLAG_IO); - switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - //switch_thread_cond_signal(tech_pvt->cond); - + switch(sig) { + case SWITCH_SIG_KILL: + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + //switch_thread_cond_signal(tech_pvt->cond); + break; + default: + break; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Dec 22 00:27:56 2006 @@ -273,10 +273,15 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag_locked(tech_pvt, TFLAG_IO); - deactivate_audio_device(tech_pvt); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - + switch (sig) { + case SWITCH_SIG_KILL: + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + deactivate_audio_device(tech_pvt); + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + break; + default: + break; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/Makefile Fri Dec 22 00:27:56 2006 @@ -1,6 +1,5 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) VERSION = sofia-sip-1.12 -TARBALL = sofia-sip-1.12.4.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC) @@ -10,7 +9,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-glib=no + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install sofia-sip --prefix=$(PREFIX) --with-pic --with-glib=no %.o: %.c $(CC) -fPIC $(CFLAGS) -c -o $@ $< Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Fri Dec 22 00:27:56 2006 @@ -755,11 +755,16 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_mutex_lock(tech_pvt->flag_mutex); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_MEDIA); - switch_mutex_unlock(tech_pvt->flag_mutex); - + switch(sig) { + case SWITCH_SIG_KILL: + switch_mutex_lock(tech_pvt->flag_mutex); + switch_set_flag(tech_pvt, TFLAG_BYE); + switch_clear_flag(tech_pvt, TFLAG_MEDIA); + switch_mutex_unlock(tech_pvt->flag_mutex); + break; + default: + break; + } //sangoma_socket_close(&tech_pvt->wpsock->fd); //wp_close(tech_pvt); Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Dec 22 00:27:56 2006 @@ -327,11 +327,19 @@ return SWITCH_STATUS_FALSE; } - udp_socket_close(tech_pvt); - - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN KILL\n", switch_channel_get_name(channel)); - + switch(sig) { + case SWITCH_SIG_KILL: + udp_socket_close(tech_pvt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN KILL\n", switch_channel_get_name(channel)); + break; + case SWITCH_SIG_BREAK: + { + const char p = 0; + switch_size_t len = sizeof(p); + switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, &p, &len); + } + break; + } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile Fri Dec 22 00:27:56 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/Makefile Fri Dec 22 00:27:56 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.16.tar.gz --prefix=$(PREFIX) --disable-sqlite + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile --prefix=$(PREFIX) --disable-sqlite $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Fri Dec 22 00:27:56 2006 @@ -135,7 +135,7 @@ return SWITCH_STATUS_GENERR; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate); handle->samples = (unsigned int) context->sfinfo.frames; handle->samplerate = context->sfinfo.samplerate; handle->channels = (uint8_t)context->sfinfo.channels; Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_php/Makefile Fri Dec 22 00:27:56 2006 @@ -15,7 +15,7 @@ depends: MOD_CFLAGS="$(MOD_CFLAGS)" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install zlib-1.2.3.tar.gz --prefix=$(PREFIX) - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-zlib=$(PREFIX) --with-curl --enable-maintainer-zts --with-tsrm-pthreads --enable-debug %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/Makefile Fri Dec 22 00:27:56 2006 @@ -1,24 +1,32 @@ LCFLAGS=-fPIC CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/ PYMOD=freeswitch -LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ -lutil +LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++ SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i +CPPCC = g++ +OBJS=freeswitch_python.o mod_python_wrap.o -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) +#all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(OBJS) depends: MAKE=$(MAKE) PY_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads +%.o: %.cpp + $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $< + %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ -mod_python.c: +od_python.c: $(CC) $(LCFLAGS) $(CFLAGS) -c mod_python.c -o mod_python.o reswig: - rm -f switch_swig_wrap.c config.m4 CREDITS *${PYMOD}* - swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -python -module $(PYMOD) $(SWIGCFILE) + # rm -f switch_swig_wrap.c config.m4 CREDITS *${PYMOD}* + # swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -python -module $(PYMOD) $(SWIGCFILE) + swig -python -shadow -c++ -o mod_python_wrap.cpp mod_python.i + # patch -p0 -i fix.diff switch_swig_wrap.o: switch_swig_wrap.c Makefile $(CC) -w $(CFLAGS) -c $< -o $@ @@ -27,12 +35,14 @@ $(CC) -w $(CFLAGS) -c $< -o $@ -$(PYMOD).$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o Makefile - $(CC) $(SOLINK) -o py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) +# $(PYMOD).$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o Makefile +# $(CC) $(SOLINK) -o py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) +# $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) switch_swig_wrap.o switch_swig.o Makefile +# $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o switch_swig_wrap.o switch_swig.o $(OBJS) $(LDFLAGS) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) switch_swig_wrap.o switch_swig.o Makefile - $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o switch_swig_wrap.o switch_swig.o $(OBJS) $(LDFLAGS) +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) Makefile + $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ @@ -40,4 +50,5 @@ install: # cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod + cp -f freeswitch.py $(PREFIX)/lib/python2.4/site-packages/ Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/freeswitch.py Fri Dec 22 00:27:56 2006 @@ -1,10 +1,10 @@ -# This file was created automatically by SWIG. +# This file was created automatically by SWIG 1.3.27. # Don't modify this file, modify the SWIG interface instead. -# This file is compatible with both classic and new-style classes. import _freeswitch -def _swig_setattr(self,class_type,name,value): +# This file is compatible with both classic and new-style classes. +def _swig_setattr_nondynamic(self,class_type,name,value,static=1): if (name == "this"): if isinstance(value, class_type): self.__dict__[name] = value.this @@ -13,8 +13,14 @@ return method = class_type.__swig_setmethods__.get(name,None) if method: return method(self,value) - self.__dict__[name] = value + if (not static) or hasattr(self,name) or (name == "thisown"): + self.__dict__[name] = value + else: + raise AttributeError("You cannot add attributes to %s" % self) +def _swig_setattr(self,class_type,name,value): + return _swig_setattr_nondynamic(self,class_type,name,value,0) + def _swig_getattr(self,class_type,name): method = class_type.__swig_getmethods__.get(name,None) if method: return method(self) @@ -31,55 +37,45 @@ -fs_core_set_globals = _freeswitch.fs_core_set_globals +PythonDTMFCallback = _freeswitch.PythonDTMFCallback +class SessionContainer(_object): + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, SessionContainer, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, SessionContainer, name) + def __repr__(self): + return "<%s.%s; proxy of C++ SessionContainer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args): + _swig_setattr(self, SessionContainer, 'this', _freeswitch.new_SessionContainer(*args)) + _swig_setattr(self, SessionContainer, 'thisown', 1) + def __del__(self, destroy=_freeswitch.delete_SessionContainer): + try: + if self.thisown: destroy(self) + except: pass -fs_core_init = _freeswitch.fs_core_init + def console_log(*args): return _freeswitch.SessionContainer_console_log(*args) + def console_clean_log(*args): return _freeswitch.SessionContainer_console_clean_log(*args) + def answer(*args): return _freeswitch.SessionContainer_answer(*args) + def pre_answer(*args): return _freeswitch.SessionContainer_pre_answer(*args) + def hangup(*args): return _freeswitch.SessionContainer_hangup(*args) + def set_variable(*args): return _freeswitch.SessionContainer_set_variable(*args) + def get_variable(*args): return _freeswitch.SessionContainer_get_variable(*args) + def set_state(*args): return _freeswitch.SessionContainer_set_state(*args) + def play_file(*args): return _freeswitch.SessionContainer_play_file(*args) + def set_dtmf_callback(*args): return _freeswitch.SessionContainer_set_dtmf_callback(*args) + def speak_text(*args): return _freeswitch.SessionContainer_speak_text(*args) + def set_tts_parms(*args): return _freeswitch.SessionContainer_set_tts_parms(*args) + def get_digits(*args): return _freeswitch.SessionContainer_get_digits(*args) + def transfer(*args): return _freeswitch.SessionContainer_transfer(*args) + def play_and_get_digits(*args): return _freeswitch.SessionContainer_play_and_get_digits(*args) -fs_core_destroy = _freeswitch.fs_core_destroy +class SessionContainerPtr(SessionContainer): + def __init__(self, this): + _swig_setattr(self, SessionContainer, 'this', this) + if not hasattr(self,"thisown"): _swig_setattr(self, SessionContainer, 'thisown', 0) + self.__class__ = SessionContainer +_freeswitch.SessionContainer_swigregister(SessionContainerPtr) +cvar = _freeswitch.cvar -fs_loadable_module_init = _freeswitch.fs_loadable_module_init -fs_loadable_module_shutdown = _freeswitch.fs_loadable_module_shutdown - -fs_console_loop = _freeswitch.fs_console_loop - -fs_consol_log = _freeswitch.fs_consol_log - -fs_consol_clean = _freeswitch.fs_consol_clean - -fs_core_session_locate = _freeswitch.fs_core_session_locate - -fs_channel_answer = _freeswitch.fs_channel_answer - -fs_channel_pre_answer = _freeswitch.fs_channel_pre_answer - -fs_channel_hangup = _freeswitch.fs_channel_hangup - -fs_channel_set_variable = _freeswitch.fs_channel_set_variable - -fs_channel_get_variable = _freeswitch.fs_channel_get_variable - -fs_channel_set_state = _freeswitch.fs_channel_set_state - -fs_ivr_play_file = _freeswitch.fs_ivr_play_file - -fs_switch_ivr_record_file = _freeswitch.fs_switch_ivr_record_file - -fs_switch_ivr_sleep = _freeswitch.fs_switch_ivr_sleep - -fs_ivr_play_file2 = _freeswitch.fs_ivr_play_file2 - -fs_switch_ivr_collect_digits_callback = _freeswitch.fs_switch_ivr_collect_digits_callback - -fs_switch_ivr_collect_digits_count = _freeswitch.fs_switch_ivr_collect_digits_count - -fs_switch_ivr_originate = _freeswitch.fs_switch_ivr_originate - -fs_switch_ivr_session_transfer = _freeswitch.fs_switch_ivr_session_transfer - -fs_switch_ivr_speak_text = _freeswitch.fs_switch_ivr_speak_text - -fs_switch_channel_get_variable = _freeswitch.fs_switch_channel_get_variable - -fs_switch_channel_set_variable = _freeswitch.fs_switch_channel_set_variable Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/mod_python.c Fri Dec 22 00:27:56 2006 @@ -24,7 +24,7 @@ * Contributor(s): * * Brian Fertig <brian.fertig(a)convergencetek.com> - * Johny Kadarisman <jkr888 at gmail.com> + * Johny Kadarisman <jkr888(a)gmail.com> * * mod_python.c -- Python Module * @@ -43,6 +43,7 @@ #include <switch.h> void init_freeswitch(void); +static switch_api_interface_t python_run_interface; const char modname[] = "mod_python"; @@ -63,11 +64,39 @@ } +static switch_status_t launch_python(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + FILE* pythonfile; + + if (switch_strlen_zero(text)) { + stream->write_function(stream, "USAGE: %s\n", python_run_interface.syntax); + return SWITCH_STATUS_SUCCESS; + } + + pythonfile = fopen(text, "r"); + + Py_Initialize(); + init_freeswitch(); + PyRun_SimpleFile(pythonfile, ""); + Py_Finalize(); + + stream->write_function(stream, "OK\n"); + return SWITCH_STATUS_SUCCESS; +} + static const switch_application_interface_t python_application_interface = { /*.interface_name */ "python", /*.application_function */ python_function }; +static switch_api_interface_t python_run_interface = { + /*.interface_name */ "python", + /*.desc */ "run a python script", + /*.function */ launch_python, + /*.syntax */ "python </path/to/script>", + /*.next */ NULL +}; + static switch_loadable_module_interface_t python_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, @@ -75,7 +104,7 @@ /*.dialplan_interface */ NULL, /*.codec_interface */ NULL, /*.application_interface */ &python_application_interface, - /*.api_interface */ NULL, + /*.api_interface */ &python_run_interface, /*.file_interface */ NULL, /*.speech_interface */ NULL, /*.directory_interface */ NULL @@ -110,14 +139,3 @@ /* Return the number of arguments of the application command line */ - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:nil - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: - */ Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/switch_swig_wrap.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/switch_swig_wrap.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_python/switch_swig_wrap.c Fri Dec 22 00:27:56 2006 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.27 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -9,74 +9,116 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON - -#include "Python.h" - -/*************************************************************** -*- c -*- - * python/precommon.swg +/*********************************************************************** * - * Rename all exported symbols from common.swg, to avoid symbol - * clashes if multiple interpreters are included + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. * ************************************************************************/ -#define SWIG_TypeRegister SWIG_Python_TypeRegister -#define SWIG_TypeCheck SWIG_Python_TypeCheck -#define SWIG_TypeCast SWIG_Python_TypeCast -#define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast -#define SWIG_TypeName SWIG_Python_TypeName -#define SWIG_TypeQuery SWIG_Python_TypeQuery -#define SWIG_TypeClientData SWIG_Python_TypeClientData -#define SWIG_PackData SWIG_Python_PackData -#define SWIG_UnpackData SWIG_Python_UnpackData +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) || defined(__ICC) +# define SWIGUNUSED __attribute__ ((unused)) +# else +# define SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods for Windows DLLs */ +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# define SWIGEXPORT +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + + + +#include <Python.h> + /*********************************************************************** - * common.swg + * swigrun.swg * - * This file contains generic SWIG runtime support for pointer - * type checking as well as a few commonly used macros to control - * external linkage. + * This file contains generic CAPI SWIG runtime support for pointer + * type checking. * - * Author : David Beazley (beazley(a)cs.uchicago.edu) - * - * Copyright (c) 1999-2000, The University of Chicago - * - * This file may be freely redistributed without license or fee provided - * this copyright message remains intact. ************************************************************************/ -#include <string.h> +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "2" -#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(_MSC_VER) || defined(__GNUC__) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIG_TYPE_TABLE_NAME #endif -#ifdef SWIG_GLOBAL -# define SWIGRUNTIME(a) SWIGEXPORT(a) -#else -# define SWIGRUNTIME(a) static a +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. + + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN #endif +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +#include <string.h> + #ifdef __cplusplus extern "C" { #endif @@ -84,106 +126,141 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); +/* Structure to store inforomation on one type */ typedef struct swig_type_info { - const char *name; - swig_converter_func converter; - const char *str; - void *clientdata; - swig_dycast_func dcast; - struct swig_type_info *next; - struct swig_type_info *prev; + const char *name; /* mangled name of this type */ + const char *str; /* human readable name of this type */ + swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ + struct swig_cast_info *cast; /* linked list of types that can cast into this type */ + void *clientdata; /* language specific type data */ } swig_type_info; -#ifdef SWIG_NOINCLUDE +/* Structure to store a type and conversion function used for casting */ +typedef struct swig_cast_info { + swig_type_info *type; /* pointer to type that is equivalent to this type */ + swig_converter_func converter; /* function to cast the void pointers */ + struct swig_cast_info *next; /* pointer to next cast in linked list */ + struct swig_cast_info *prev; /* pointer to the previous cast */ +} swig_cast_info; -SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *); -SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); -SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); -SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); -SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); -SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); -SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); -SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); -SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); +/* Structure used to store module information + * Each module generates one structure like this, and the runtime collects + * all of these structures and stores them in a circularly linked list.*/ +typedef struct swig_module_info { + swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ + size_t size; /* Number of types in this module */ + struct swig_module_info *next; /* Pointer to next element in circularly linked list */ + swig_type_info **type_initial; /* Array of initially generated type structures */ + swig_cast_info **cast_initial; /* Array of initially generated casting structures */ + void *clientdata; /* Language specific module data */ +} swig_module_info; -#else -static swig_type_info *swig_type_list = 0; +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class<int>" == "Class<int >", etc. -/* Register a type mapping with the type-checking */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeRegister(swig_type_info *ti) { - swig_type_info *tc, *head, *ret, *next; - /* Check to see if this type has already been registered */ - tc = swig_type_list; - while (tc) { - if (strcmp(tc->name, ti->name) == 0) { - /* Already exists in the table. Just add additional types to the list */ - if (tc->clientdata) ti->clientdata = tc->clientdata; - head = tc; - next = tc->next; - goto l1; - } - tc = tc->prev; + Return 0 when the two name types are equivalent, as in + strncmp, but skipping ' '. +*/ +SWIGRUNTIME int +SWIG_TypeNameComp(const char *f1, const char *l1, + const char *f2, const char *l2) { + for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { + while ((*f1 == ' ') && (f1 != l1)) ++f1; + while ((*f2 == ' ') && (f2 != l2)) ++f2; + if (*f1 != *f2) return (int)(*f1 - *f2); } - head = ti; - next = 0; + return (l1 - f1) - (l2 - f2); +} - /* Place in list */ - ti->prev = swig_type_list; - swig_type_list = ti; - - /* Build linked lists */ - l1: - ret = head; - tc = ti + 1; - /* Patch up the rest of the links */ - while (tc->name) { - head->next = tc; - tc->prev = head; - head = tc; - tc++; +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if not equal, 1 if equal +*/ +SWIGRUNTIME int +SWIG_TypeEquiv(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; } - if (next) next->prev = head; - head->next = next; - return ret; + return equiv; } -/* Check the typename */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeCheck(char *c, swig_type_info *ty) { - swig_type_info *s; - if (!ty) return 0; /* Void pointer */ - s = ty->next; /* First element always just a name */ - do { - if (strcmp(s->name,c) == 0) { - if (s == ty->next) return s; - /* Move s to the top of the linked list */ - s->prev->next = s->next; - if (s->next) { - s->next->prev = s->prev; - } - /* Insert s as second element in the list */ - s->next = ty->next; - if (ty->next) ty->next->prev = s; - ty->next = s; - s->prev = ty; - return s; +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if equal, -1 if nb < tb, 1 if nb > tb +*/ +SWIGRUNTIME int +SWIG_TypeCompare(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; } - s = s->next; - } while (s && (s != ty->next)); - return 0; + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; } -/* Cast a pointer up an inheritance hierarchy */ -SWIGRUNTIME(void *) -SWIG_TypeCast(swig_type_info *ty, void *ptr) { - if ((!ty) || (!ty->converter)) return ptr; - return (*ty->converter)(ptr); + +/* think of this as a c++ template<> or a scheme macro */ +#define SWIG_TypeCheck_Template(comparison, ty) \ + if (ty) { \ + swig_cast_info *iter = ty->cast; \ + while (iter) { \ + if (comparison) { \ + if (iter == ty->cast) return iter; \ + /* Move iter to the top of the linked list */ \ + iter->prev->next = iter->next; \ + if (iter->next) \ + iter->next->prev = iter->prev; \ + iter->next = ty->cast; \ + iter->prev = 0; \ + if (ty->cast) ty->cast->prev = iter; \ + ty->cast = iter; \ + return iter; \ + } \ + iter = iter->next; \ + } \ + } \ + return 0 + +/* + Check the typename +*/ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheck(const char *c, swig_type_info *ty) { + SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); } -/* Dynamic pointer casting. Down an inheritance hierarchy */ -SWIGRUNTIME(swig_type_info *) +/* Same as previous function, except strcmp is replaced with a pointer comparison */ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { + SWIG_TypeCheck_Template(iter->type == from, into); +} + +/* + Cast a pointer up an inheritance hierarchy +*/ +SWIGRUNTIMEINLINE void * +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); +} + +/* + Dynamic pointer casting. Down an inheritance hierarchy +*/ +SWIGRUNTIME swig_type_info * SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { swig_type_info *lastty = ty; if (!ty || !ty->dcast) return ty; @@ -194,118 +271,285 @@ return lastty; } -/* Return the name associated with this type */ -SWIGRUNTIME(const char *) +/* + Return the name associated with this type +*/ +SWIGRUNTIMEINLINE const char * SWIG_TypeName(const swig_type_info *ty) { return ty->name; } -/* Search for a swig_type_info structure */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeQuery(const char *name) { - swig_type_info *ty = swig_type_list; - while (ty) { - if (ty->str && (strcmp(name,ty->str) == 0)) return ty; - if (ty->name && (strcmp(name,ty->name) == 0)) return ty; - ty = ty->prev; +/* + Return the pretty name associated with this type, + that is an unmangled type name in a form presentable to the user. +*/ +SWIGRUNTIME const char * +SWIG_TypePrettyName(const swig_type_info *type) { + /* The "str" field contains the equivalent pretty names of the + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ + if (type->str != NULL) { + const char *last_name = type->str; + const char *s; + for (s = type->str; *s; s++) + if (*s == '|') last_name = s+1; + return last_name; } - return 0; + else + return type->name; } -/* Set the clientdata field for a type */ -SWIGRUNTIME(void) +/* + Set the clientdata field for a type +*/ +SWIGRUNTIME void SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { - swig_type_info *tc, *equiv; - if (ti->clientdata == clientdata) return; + swig_cast_info *cast = ti->cast; + /* if (ti->clientdata == clientdata) return; */ ti->clientdata = clientdata; - equiv = ti->next; - while (equiv) { - if (!equiv->converter) { - tc = swig_type_list; - while (tc) { - if ((strcmp(tc->name, equiv->name) == 0)) - SWIG_TypeClientData(tc,clientdata); - tc = tc->prev; + + while (cast) { + if (!cast->converter) { + swig_type_info *tc = cast->type; + if (!tc->clientdata) { + SWIG_TypeClientData(tc, clientdata); } + } + cast = cast->next; + } +} + +/* + Search for a swig_type_info structure only by mangled name + Search is a O(log #types) + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + swig_module_info *iter = start; + do { + if (iter->size) { + register size_t l = 0; + register size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ + register size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { + register int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { + if (i) { + r = i - 1; + } else { + break; + } + } else if (compare > 0) { + l = i + 1; + } + } else { + break; /* should never happen */ + } + } while (l <= r); } - equiv = equiv->next; + iter = iter->next; + } while (iter != end); + return 0; +} + +/* + Search for a swig_type_info structure for either a mangled name or a human readable name. + It first searches the mangled names of the types, which is a O(log #types) + If a type is not found it then searches the human readable names, which is O(#types). + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + /* STEP 1: Search the name field using binary search */ + swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); + if (ret) { + return ret; + } else { + /* STEP 2: If the type hasn't been found, do a complete search + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { + register size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; + } + iter = iter->next; + } while (iter != end); } + + /* neither found a match */ + return 0; } -/* Pack binary data into a string */ -SWIGRUNTIME(char *) -SWIG_PackData(char *c, void *ptr, int sz) { - static char hex[17] = "0123456789abcdef"; - int i; - unsigned char *u = (unsigned char *) ptr; - register unsigned char uu; - for (i = 0; i < sz; i++,u++) { - uu = *u; + +/* + Pack binary data into a string +*/ +SWIGRUNTIME char * +SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; + register const unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register unsigned char uu = *u; *(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[uu & 0xf]; } return c; } -/* Unpack binary data from a string */ -SWIGRUNTIME(char *) -SWIG_UnpackData(char *c, void *ptr, int sz) { - register unsigned char uu = 0; - register int d; - unsigned char *u = (unsigned char *) ptr; - int i; - for (i = 0; i < sz; i++, u++) { - d = *(c++); +/* + Unpack binary data from a string +*/ +SWIGRUNTIME const char * +SWIG_UnpackData(const char *c, void *ptr, size_t sz) { + register unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register char d = *(c++); + register unsigned char uu = 0; if ((d >= '0') && (d <= '9')) uu = ((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) uu = ((d - ('a'-10)) << 4); + else + return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) uu |= (d - '0'); else if ((d >= 'a') && (d <= 'f')) uu |= (d - ('a'-10)); + else + return (char *) 0; *u = uu; } return c; } -#endif +/* + Pack 'void *' into a string buffer. +*/ +SWIGRUNTIME char * +SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { + char *r = buff; + if ((2*sizeof(void *) + 2) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + if (strlen(name) + 1 > (bsz - (r - buff))) return 0; + strcpy(r,name); + return buff; +} +SWIGRUNTIME const char * +SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + *ptr = (void *) 0; + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sizeof(void *)); +} + +SWIGRUNTIME char * +SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { + char *r = buff; + size_t lname = (name ? strlen(name) : 0); + if ((2*sz + 2 + lname) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + if (lname) { + strncpy(r,name,lname+1); + } else { + *r = 0; + } + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + memset(ptr,0,sz); + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sz); +} + #ifdef __cplusplus } #endif -/*********************************************************************** - * python.swg - * - * This file contains the runtime support for Python modules - * and includes code for managing global variables and pointer - * type checking. - * - * Author : David Beazley (beazley(a)cs.uchicago.edu) - ************************************************************************/ +/* ----------------------------------------------------------------------------- + * SWIG API. Portion that goes into the runtime + * ----------------------------------------------------------------------------- */ -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif +/* ----------------------------------------------------------------------------- + * for internal method declarations + * ----------------------------------------------------------------------------- */ + +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* + Exception handling in wrappers +*/ +#define SWIG_fail goto fail +#define SWIG_arg_fail(arg) SWIG_Python_ArgFail(arg) +#define SWIG_append_errmsg(msg) SWIG_Python_AddErrMesg(msg,0) +#define SWIG_preppend_errmsg(msg) SWIG_Python_AddErrMesg(msg,1) +#define SWIG_type_error(type,obj) SWIG_Python_TypeError(type,obj) +#define SWIG_null_ref(type) SWIG_Python_NullRef(type) + +/* + Contract support +*/ +#define SWIG_contract_assert(expr, msg) \ + if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else + +/* ----------------------------------------------------------------------------- + * Constant declarations + * ----------------------------------------------------------------------------- */ + +/* Constant Types */ #define SWIG_PY_INT 1 #define SWIG_PY_FLOAT 2 #define SWIG_PY_STRING 3 #define SWIG_PY_POINTER 4 #define SWIG_PY_BINARY 5 -/* Flags for pointer conversion */ - -#define SWIG_POINTER_EXCEPTION 0x1 -#define SWIG_POINTER_DISOWN 0x2 - -/* Exception handling in wrappers */ -#define SWIG_fail goto fail - /* Constant information structure */ typedef struct swig_const_info { int type; @@ -316,175 +560,618 @@ swig_type_info **ptype; } swig_const_info; + +/* ----------------------------------------------------------------------------- + * Alloc. memory flags + * ----------------------------------------------------------------------------- */ +#define SWIG_OLDOBJ 1 +#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 +#define SWIG_PYSTR SWIG_NEWOBJ + 1 + +#ifdef __cplusplus +} +#endif + + +/*********************************************************************** + * pyrun.swg + * + * This file contains the runtime support for Python modules + * and includes code for managing global variables and pointer + * type checking. + * + * Author : David Beazley (beazley(a)cs.uchicago.edu) + ************************************************************************/ + /* Common SWIG API */ -#define SWIG_ConvertPtr(obj, pp, type, flags) \ - SWIG_Python_ConvertPtr(obj, pp, type, flags) -#define SWIG_NewPointerObj(p, type, flags) \ - SWIG_Python_NewPointerObj(p, type, flags) -#define SWIG_MustGetPtr(p, type, argnum, flags) \ - SWIG_Python_MustGetPtr(p, type, argnum, flags) +#define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) +#define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) +#define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) + /* Python-specific SWIG API */ -#define SWIG_newvarlink() \ - SWIG_Python_newvarlink() -#define SWIG_addvarlink(p, name, get_attr, set_attr) \ - SWIG_Python_addvarlink(p, name, get_attr, set_attr) -#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ - SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_NewPackedObj(ptr, sz, type) \ - SWIG_Python_NewPackedObj(ptr, sz, type) -#define SWIG_InstallConstants(d, constants) \ - SWIG_Python_InstallConstants(d, constants) +#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) +#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type) -#ifdef SWIG_NOINCLUDE +/* Runtime API */ +#define SWIG_GetModule(clientdata) SWIG_Python_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer) -SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); -SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * Pointer declarations + * ----------------------------------------------------------------------------- */ +/* + Use SWIG_NO_COBJECT_TYPES to force the use of strings to represent + C/C++ pointers in the python side. Very useful for debugging, but + not always safe. +*/ +#if !defined(SWIG_NO_COBJECT_TYPES) && !defined(SWIG_COBJECT_TYPES) +# define SWIG_COBJECT_TYPES +#endif -#else +/* Flags for pointer conversion */ +#define SWIG_POINTER_EXCEPTION 0x1 +#define SWIG_POINTER_DISOWN 0x2 + +/* Add PyOS_snprintf for old Pythons */ +#if PY_VERSION_HEX < 0x02020000 +#define PyOS_snprintf snprintf +#endif + +#ifdef __cplusplus +extern "C" { +#endif + /* ----------------------------------------------------------------------------- - * global variable support code. + * Create a new pointer string * ----------------------------------------------------------------------------- */ +#ifndef SWIG_BUFFER_SIZE +#define SWIG_BUFFER_SIZE 1024 +#endif -typedef struct swig_globalvar { - char *name; /* Name of global variable */ - PyObject *(*get_attr)(void); /* Return the current value */ - int (*set_attr)(PyObject *); /* Set the value */ - struct swig_globalvar *next; -} swig_globalvar; +/* A crude PyString_FromFormat implementation for old Pythons */ +#if PY_VERSION_HEX < 0x02020000 +static PyObject * +PyString_FromFormat(const char *fmt, ...) { + va_list ap; + char buf[SWIG_BUFFER_SIZE * 2]; + int res; + va_start(ap, fmt); + res = vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + return (res < 0 || res >= sizeof(buf)) ? 0 : PyString_FromString(buf); +} +#endif -typedef struct swig_varlinkobject { +#if PY_VERSION_HEX < 0x01060000 +#define PyObject_Del(op) PyMem_DEL((op)) +#endif + +#if defined(SWIG_COBJECT_TYPES) +#if !defined(SWIG_COBJECT_PYTHON) +/* ----------------------------------------------------------------------------- + * Implements a simple Swig Object type, and use it instead of PyCObject + * ----------------------------------------------------------------------------- */ + +typedef struct { PyObject_HEAD - swig_globalvar *vars; -} swig_varlinkobject; + void *ptr; + const char *desc; +} PySwigObject; -static PyObject * -swig_varlink_repr(swig_varlinkobject *v) { - v = v; - return PyString_FromString("<Global variables>"); -} +/* Declarations for objects of type PySwigObject */ -static int -swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) { - swig_globalvar *var; +SWIGRUNTIME int +PySwigObject_print(PySwigObject *v, FILE *fp, int flags) +{ + char result[SWIG_BUFFER_SIZE]; flags = flags; - fprintf(fp,"Global variables { "); - for (var = v->vars; var; var=var->next) { - fprintf(fp,"%s", var->name); - if (var->next) fprintf(fp,", "); + if (SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result))) { + fputs("<Swig Object at ", fp); fputs(result, fp); fputs(">", fp); + return 0; + } else { + return 1; } - fprintf(fp," }\n"); - return 0; } + +SWIGRUNTIME PyObject * +PySwigObject_repr(PySwigObject *v) +{ + char result[SWIG_BUFFER_SIZE]; + return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ? + PyString_FromFormat("<Swig Object at %s>", result) : 0; +} -static PyObject * -swig_varlink_getattr(swig_varlinkobject *v, char *n) { - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - return (*var->get_attr)(); +SWIGRUNTIME PyObject * +PySwigObject_str(PySwigObject *v) +{ + char result[SWIG_BUFFER_SIZE]; + return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ? + PyString_FromString(result) : 0; +} + +SWIGRUNTIME PyObject * +PySwigObject_long(PySwigObject *v) +{ + return PyLong_FromVoidPtr(v->ptr); +} + +SWIGRUNTIME PyObject * +PySwigObject_format(const char* fmt, PySwigObject *v) +{ + PyObject *res = NULL; + PyObject *args = PyTuple_New(1); + if (args && (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0)) { + PyObject *ofmt = PyString_FromString(fmt); + if (ofmt) { + res = PyString_Format(ofmt,args); + Py_DECREF(ofmt); } - var = var->next; + Py_DECREF(args); + } + return res; +} + +SWIGRUNTIME PyObject * +PySwigObject_oct(PySwigObject *v) +{ + return PySwigObject_format("%o",v); +} + +SWIGRUNTIME PyObject * +PySwigObject_hex(PySwigObject *v) +{ + return PySwigObject_format("%x",v); +} + +SWIGRUNTIME int +PySwigObject_compare(PySwigObject *v, PySwigObject *w) +{ + int c = strcmp(v->desc, w->desc); + if (c) { + return (c > 0) ? 1 : -1; + } else { + void *i = v->ptr; + void *j = w->ptr; + return (i < j) ? -1 : ((i > j) ? 1 : 0); } - PyErr_SetString(PyExc_NameError,"Unknown C global variable"); - return NULL; } -static int -swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - return (*var->set_attr)(p); +SWIGRUNTIME void +PySwigObject_dealloc(PySwigObject *self) +{ + PyObject_Del(self); +} + +SWIGRUNTIME PyTypeObject* +PySwigObject_type(void) { + static char pyswigobject_type__doc__[] = + "Swig object carries a C/C++ instance pointer"; + + static PyNumberMethods PySwigObject_as_number = { + (binaryfunc)0, /*nb_add*/ + (binaryfunc)0, /*nb_subtract*/ + (binaryfunc)0, /*nb_multiply*/ + (binaryfunc)0, /*nb_divide*/ + (binaryfunc)0, /*nb_remainder*/ + (binaryfunc)0, /*nb_divmod*/ + (ternaryfunc)0,/*nb_power*/ + (unaryfunc)0, /*nb_negative*/ + (unaryfunc)0, /*nb_positive*/ + (unaryfunc)0, /*nb_absolute*/ + (inquiry)0, /*nb_nonzero*/ + 0, /*nb_invert*/ + 0, /*nb_lshift*/ + 0, /*nb_rshift*/ + 0, /*nb_and*/ + 0, /*nb_xor*/ + 0, /*nb_or*/ + (coercion)0, /*nb_coerce*/ + (unaryfunc)PySwigObject_long, /*nb_int*/ + (unaryfunc)PySwigObject_long, /*nb_long*/ + (unaryfunc)0, /*nb_float*/ + (unaryfunc)PySwigObject_oct, /*nb_oct*/ + (unaryfunc)PySwigObject_hex, /*nb_hex*/ +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ +#elif PY_VERSION_HEX >= 0x02000000 + 0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */ +#endif + }; + + static PyTypeObject pyswigobject_type +#if !defined(__cplusplus) + ; + static int type_init = 0; + if (!type_init) { + PyTypeObject tmp +#endif + = { + PyObject_HEAD_INIT(&PyType_Type) + 0, /*ob_size*/ + (char *)"PySwigObject", /*tp_name*/ + sizeof(PySwigObject), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)PySwigObject_dealloc, /*tp_dealloc*/ + (printfunc)PySwigObject_print, /*tp_print*/ + (getattrfunc)0, /*tp_getattr*/ + (setattrfunc)0, /*tp_setattr*/ + (cmpfunc)PySwigObject_compare, /*tp_compare*/ + (reprfunc)PySwigObject_repr, /*tp_repr*/ + &PySwigObject_as_number, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + (hashfunc)0, /*tp_hash*/ + (ternaryfunc)0, /*tp_call*/ + (reprfunc)PySwigObject_str, /*tp_str*/ + /* Space for future expansion */ + 0,0,0,0, + pyswigobject_type__doc__, /* Documentation string */ +#if PY_VERSION_HEX >= 0x02000000 + 0, /* tp_traverse */ + 0, /* tp_clear */ +#endif +#if PY_VERSION_HEX >= 0x02010000 + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#endif +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030000 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + 0,0,0,0 /* tp_alloc -> tp_next */ +#endif + }; +#if !defined(__cplusplus) + pyswigobject_type = tmp; + type_init = 1; + } +#endif + return &pyswigobject_type; +} + +SWIGRUNTIME PyObject * +PySwigObject_FromVoidPtrAndDesc(void *ptr, const char *desc) +{ + PySwigObject *self = PyObject_NEW(PySwigObject, PySwigObject_type()); + if (self) { + self->ptr = ptr; + self->desc = desc; + } + return (PyObject *)self; +} + +SWIGRUNTIMEINLINE void * +PySwigObject_AsVoidPtr(PyObject *self) +{ + return ((PySwigObject *)self)->ptr; +} + +SWIGRUNTIMEINLINE const char * +PySwigObject_GetDesc(PyObject *self) +{ + return ((PySwigObject *)self)->desc; +} + +SWIGRUNTIMEINLINE int +PySwigObject_Check(PyObject *op) { + return ((op)->ob_type == PySwigObject_type()) + || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0); +} + +/* ----------------------------------------------------------------------------- + * Implements a simple Swig Packed type, and use it instead of string + * ----------------------------------------------------------------------------- */ + +typedef struct { + PyObject_HEAD + void *pack; + const char *desc; + size_t size; +} PySwigPacked; + +SWIGRUNTIME int +PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) +{ + char result[SWIG_BUFFER_SIZE]; + flags = flags; + fputs("<Swig Packed ", fp); + if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) { + fputs("at ", fp); + fputs(result, fp); + } + fputs(v->desc,fp); + fputs(">", fp); + return 0; +} + +SWIGRUNTIME PyObject * +PySwigPacked_repr(PySwigPacked *v) +{ + char result[SWIG_BUFFER_SIZE]; + if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) { + return PyString_FromFormat("<Swig Packed at %s%s>", result, v->desc); + } else { + return PyString_FromFormat("<Swig Packed %s>", v->desc); + } +} + +SWIGRUNTIME PyObject * +PySwigPacked_str(PySwigPacked *v) +{ + char result[SWIG_BUFFER_SIZE]; + if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){ + return PyString_FromFormat("%s%s", result, v->desc); + } else { + return PyString_FromString(v->desc); + } +} + +SWIGRUNTIME int +PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w) +{ + int c = strcmp(v->desc, w->desc); + if (c) { + return (c > 0) ? 1 : -1; + } else { + size_t i = v->size; + size_t j = w->size; + int s = (i < j) ? -1 : ((i > j) ? 1 : 0); + return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size); + } +} + +SWIGRUNTIME void +PySwigPacked_dealloc(PySwigPacked *self) +{ + free(self->pack); + PyObject_Del(self); +} + +SWIGRUNTIME PyTypeObject* +PySwigPacked_type(void) { + static char pyswigpacked_type__doc__[] = + "Swig object carries a C/C++ instance pointer"; + static PyTypeObject pyswigpacked_type +#if !defined(__cplusplus) + ; + static int type_init = 0; + if (!type_init) { + PyTypeObject tmp +#endif + = { + PyObject_HEAD_INIT(&PyType_Type) + 0, /*ob_size*/ + (char *)"PySwigPacked", /*tp_name*/ + sizeof(PySwigPacked), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)PySwigPacked_dealloc, /*tp_dealloc*/ + (printfunc)PySwigPacked_print, /*tp_print*/ + (getattrfunc)0, /*tp_getattr*/ + (setattrfunc)0, /*tp_setattr*/ + (cmpfunc)PySwigPacked_compare, /*tp_compare*/ + (reprfunc)PySwigPacked_repr, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + (hashfunc)0, /*tp_hash*/ + (ternaryfunc)0, /*tp_call*/ + (reprfunc)PySwigPacked_str, /*tp_str*/ + /* Space for future expansion */ + 0,0,0,0, + pyswigpacked_type__doc__, /* Documentation string */ +#if PY_VERSION_HEX >= 0x02000000 + 0, /* tp_traverse */ + 0, /* tp_clear */ +#endif +#if PY_VERSION_HEX >= 0x02010000 + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#endif +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030000 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + 0,0,0,0 /* tp_alloc -> tp_next */ +#endif + }; +#if !defined(__cplusplus) + pyswigpacked_type = tmp; + type_init = 1; + } +#endif + return &pyswigpacked_type; +} + +SWIGRUNTIME PyObject * +PySwigPacked_FromDataAndDesc(void *ptr, size_t size, const char *desc) +{ + PySwigPacked *self = PyObject_NEW(PySwigPacked, PySwigPacked_type()); + if (self == NULL) { + return NULL; + } else { + void *pack = malloc(size); + if (pack) { + memcpy(pack, ptr, size); + self->pack = pack; + self->desc = desc; + self->size = size; + return (PyObject *) self; } - var = var->next; + return NULL; } - PyErr_SetString(PyExc_NameError,"Unknown C global variable"); - return 1; } -statichere PyTypeObject varlinktype = { - PyObject_HEAD_INIT(0) - 0, - (char *)"swigvarlink", /* Type name */ - sizeof(swig_varlinkobject), /* Basic size */ - 0, /* Itemsize */ - 0, /* Deallocator */ - (printfunc) swig_varlink_print, /* Print */ - (getattrfunc) swig_varlink_getattr, /* get attr */ - (setattrfunc) swig_varlink_setattr, /* Set attr */ - 0, /* tp_compare */ - (reprfunc) swig_varlink_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_mapping*/ - 0, /* tp_hash */ -}; +SWIGRUNTIMEINLINE const char * +PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size) +{ + PySwigPacked *self = (PySwigPacked *)obj; + if (self->size != size) return 0; + memcpy(ptr, self->pack, size); + return self->desc; +} -/* Create a variable linking object for use later */ -SWIGRUNTIME(PyObject *) -SWIG_Python_newvarlink(void) { - swig_varlinkobject *result = 0; - result = PyMem_NEW(swig_varlinkobject,1); - varlinktype.ob_type = &PyType_Type; /* Patch varlinktype into a PyType */ - result->ob_type = &varlinktype; - result->vars = 0; - result->ob_refcnt = 0; - Py_XINCREF((PyObject *) result); - return ((PyObject*) result); +SWIGRUNTIMEINLINE const char * +PySwigPacked_GetDesc(PyObject *self) +{ + return ((PySwigPacked *)self)->desc; } -SWIGRUNTIME(void) -SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { - swig_varlinkobject *v; - swig_globalvar *gv; - v= (swig_varlinkobject *) p; - gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); - gv->name = (char *) malloc(strlen(name)+1); - strcpy(gv->name,name); - gv->get_attr = get_attr; - gv->set_attr = set_attr; - gv->next = v->vars; - v->vars = gv; +SWIGRUNTIMEINLINE int +PySwigPacked_Check(PyObject *op) { + return ((op)->ob_type == PySwigPacked_type()) + || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0); } +#else +/* ----------------------------------------------------------------------------- + * Use the old Python PyCObject instead of PySwigObject + * ----------------------------------------------------------------------------- */ + +#define PySwigObject_GetDesc(obj) PyCObject_GetDesc(obj) +#define PySwigObject_Check(obj) PyCObject_Check(obj) +#define PySwigObject_AsVoidPtr(obj) PyCObject_AsVoidPtr(obj) +#define PySwigObject_FromVoidPtrAndDesc(p, d) PyCObject_FromVoidPtrAndDesc(p, d, NULL) + +#endif + +#endif + +/* ----------------------------------------------------------------------------- + * errors manipulation + * ----------------------------------------------------------------------------- */ + +SWIGRUNTIME void +SWIG_Python_TypeError(const char *type, PyObject *obj) +{ + if (type) { +#if defined(SWIG_COBJECT_TYPES) + if (obj && PySwigObject_Check(obj)) { + const char *otype = (const char *) PySwigObject_GetDesc(obj); + if (otype) { + PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received", + type, otype); + return; + } + } else +#endif + { + const char *otype = (obj ? obj->ob_type->tp_name : 0); + if (otype) { + PyObject *str = PyObject_Str(obj); + const char *cstr = str ? PyString_AsString(str) : 0; + if (cstr) { + PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", + type, otype, cstr); + } else { + PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", + type, otype); + } + Py_XDECREF(str); + return; + } + } + PyErr_Format(PyExc_TypeError, "a '%s' is expected", type); + } else { + PyErr_Format(PyExc_TypeError, "unexpected type is received"); + } +} + +SWIGRUNTIMEINLINE void +SWIG_Python_NullRef(const char *type) +{ + if (type) { + PyErr_Format(PyExc_TypeError, "null reference of type '%s' was received",type); + } else { + PyErr_Format(PyExc_TypeError, "null reference was received"); + } +} + +SWIGRUNTIME int +SWIG_Python_AddErrMesg(const char* mesg, int infront) +{ + if (PyErr_Occurred()) { + PyObject *type = 0; + PyObject *value = 0; + PyObject *traceback = 0; + PyErr_Fetch(&type, &value, &traceback); + if (value) { + PyObject *old_str = PyObject_Str(value); + Py_XINCREF(type); + PyErr_Clear(); + if (infront) { + PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str)); + } else { + PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); + } + Py_DECREF(old_str); + } + return 1; + } else { + return 0; + } +} + +SWIGRUNTIME int +SWIG_Python_ArgFail(int argnum) +{ + if (PyErr_Occurred()) { + /* add information about failing argument */ + char mesg[256]; + PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum); + return SWIG_Python_AddErrMesg(mesg, 1); + } else { + return 0; + } +} + + +/* ----------------------------------------------------------------------------- + * pointers/data manipulation + * ----------------------------------------------------------------------------- */ + /* Convert a pointer value */ -SWIGRUNTIME(int) +SWIGRUNTIME int SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) { - swig_type_info *tc; - char *c = 0; + swig_cast_info *tc; + const char *c = 0; static PyObject *SWIG_this = 0; int newref = 0; PyObject *pyobj = 0; - + void *vptr; + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; return 0; } + #ifdef SWIG_COBJECT_TYPES - if (!(PyCObject_Check(obj))) { + if (!(PySwigObject_Check(obj))) { if (!SWIG_this) SWIG_this = PyString_FromString("this"); pyobj = obj; obj = PyObject_GetAttr(obj,SWIG_this); newref = 1; if (!obj) goto type_error; - if (!PyCObject_Check(obj)) { + if (!PySwigObject_Check(obj)) { Py_DECREF(obj); goto type_error; } } - *ptr = PyCObject_AsVoidPtr(obj); - c = (char *) PyCObject_GetDesc(obj); - if (newref) Py_DECREF(obj); - goto cobject; + vptr = PySwigObject_AsVoidPtr(obj); + c = (const char *) PySwigObject_GetDesc(obj); + if (newref) { Py_DECREF(obj); } + goto type_check; #else if (!(PyString_Check(obj))) { if (!SWIG_this) @@ -500,72 +1187,78 @@ } c = PyString_AsString(obj); /* Pointer values must start with leading underscore */ - if (*c != '_') { - *ptr = (void *) 0; - if (strcmp(c,"NULL") == 0) { - if (newref) { Py_DECREF(obj); } - return 0; - } else { - if (newref) { Py_DECREF(obj); } - goto type_error; - } - } - c++; - c = SWIG_UnpackData(c,ptr,sizeof(void *)); + c = SWIG_UnpackVoidPtr(c, &vptr, ty->name); if (newref) { Py_DECREF(obj); } + if (!c) goto type_error; #endif -#ifdef SWIG_COBJECT_TYPES -cobject: -#endif - +type_check: if (ty) { tc = SWIG_TypeCheck(c,ty); if (!tc) goto type_error; - *ptr = SWIG_TypeCast(tc,(void*) *ptr); + *ptr = SWIG_TypeCast(tc,vptr); + } else { + *ptr = vptr; } - if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) { - PyObject *zero = PyInt_FromLong(0); - PyObject_SetAttrString(pyobj,(char*)"thisown",zero); - Py_DECREF(zero); + PyObject_SetAttrString(pyobj,(char*)"thisown",Py_False); } return 0; type_error: + PyErr_Clear(); + if (pyobj && !obj) { + obj = pyobj; + if (PyCFunction_Check(obj)) { + /* here we get the method pointer for callbacks */ + char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + c = doc ? strstr(doc, "swig_ptr: ") : 0; + if (c) { + c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; + if (!c) goto type_error; + goto type_check; + } + } + } if (flags & SWIG_POINTER_EXCEPTION) { - if (ty && c) { - char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); - sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); - PyErr_SetString(PyExc_TypeError, temp); - free((char *) temp); + if (ty) { + SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); } else { - PyErr_SetString(PyExc_TypeError,"Expected a pointer"); + SWIG_Python_TypeError("C/C++ pointer", obj); } } return -1; } /* Convert a pointer value, signal an exception on a type mismatch */ -SWIGRUNTIME(void *) +SWIGRUNTIME void * SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) { void *result; - SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION); + if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { + PyErr_Clear(); + if (flags & SWIG_POINTER_EXCEPTION) { + SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); + SWIG_Python_ArgFail(argnum); + } + } return result; } /* Convert a packed value value */ -SWIGRUNTIME(int) -SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, int sz, swig_type_info *ty, int flags) { - swig_type_info *tc; - char *c = 0; +SWIGRUNTIME int +SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty, int flags) { + swig_cast_info *tc; + const char *c = 0; +#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON) + c = PySwigPacked_UnpackData(obj, ptr, sz); +#else if ((!obj) || (!PyString_Check(obj))) goto type_error; c = PyString_AsString(obj); /* Pointer values must start with leading underscore */ - if (*c != '_') goto type_error; - c++; - c = SWIG_UnpackData(c,ptr,sz); + c = SWIG_UnpackDataName(c, ptr, sz, ty->name); +#endif + if (!c) goto type_error; if (ty) { tc = SWIG_TypeCheck(c,ty); if (!tc) goto type_error; @@ -573,38 +1266,38 @@ return 0; type_error: - - if (flags) { - if (ty && c) { - char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); - sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); - PyErr_SetString(PyExc_TypeError, temp); - free((char *) temp); + PyErr_Clear(); + if (flags & SWIG_POINTER_EXCEPTION) { + if (ty) { + SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); } else { - PyErr_SetString(PyExc_TypeError,"Expected a pointer"); + SWIG_Python_TypeError("C/C++ packed data", obj); } } return -1; -} +} -/* Create a new pointer object */ -SWIGRUNTIME(PyObject *) +/* Create a new array object */ +SWIGRUNTIME PyObject * SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int own) { - PyObject *robj; + PyObject *robj = 0; + if (!type) { + if (!PyErr_Occurred()) { + PyErr_Format(PyExc_TypeError, "Swig: null type passed to NewPointerObj"); + } + return robj; + } if (!ptr) { Py_INCREF(Py_None); return Py_None; } #ifdef SWIG_COBJECT_TYPES - robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) type->name, NULL); + robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)type->name); #else { - char result[1024]; - char *r = result; - *(r++) = '_'; - r = SWIG_PackData(r,&ptr,sizeof(void *)); - strcpy(r,type->name); - robj = PyString_FromString(result); + char result[SWIG_BUFFER_SIZE]; + robj = SWIG_PackVoidPtr(result, ptr, type->name, sizeof(result)) ? + PyString_FromString(result) : 0; } #endif if (!robj || (robj == Py_None)) return robj; @@ -616,9 +1309,7 @@ Py_DECREF(args); if (inst) { if (own) { - PyObject *n = PyInt_FromLong(1); - PyObject_SetAttrString(inst,(char*)"thisown",n); - Py_DECREF(n); + PyObject_SetAttrString(inst,(char*)"thisown",Py_True); } robj = inst; } @@ -626,55 +1317,95 @@ return robj; } -SWIGRUNTIME(PyObject *) -SWIG_Python_NewPackedObj(void *ptr, int sz, swig_type_info *type) { - char result[1024]; - char *r = result; - if ((2*sz + 1 + strlen(type->name)) > 1000) return 0; - *(r++) = '_'; - r = SWIG_PackData(r,ptr,sz); - strcpy(r,type->name); - return PyString_FromString(result); +SWIGRUNTIME PyObject * +SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { + PyObject *robj = 0; + if (!ptr) { + Py_INCREF(Py_None); + return Py_None; + } +#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON) + robj = PySwigPacked_FromDataAndDesc((void *) ptr, sz, (char *)type->name); +#else + { + char result[SWIG_BUFFER_SIZE]; + robj = SWIG_PackDataName(result, ptr, sz, type->name, sizeof(result)) ? + PyString_FromString(result) : 0; + } +#endif + return robj; } -/* Install Constants */ -SWIGRUNTIME(void) -SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { - int i; - PyObject *obj; - for (i = 0; constants[i].type; i++) { - switch(constants[i].type) { - case SWIG_PY_INT: - obj = PyInt_FromLong(constants[i].lvalue); - break; - case SWIG_PY_FLOAT: - obj = PyFloat_FromDouble(constants[i].dvalue); - break; - case SWIG_PY_STRING: - obj = PyString_FromString((char *) constants[i].pvalue); - break; - case SWIG_PY_POINTER: - obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); - break; - case SWIG_PY_BINARY: - obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); - break; - default: - obj = 0; - break; +/* -----------------------------------------------------------------------------* + * Get type list + * -----------------------------------------------------------------------------*/ + +#ifdef SWIG_LINK_RUNTIME +void *SWIG_ReturnGlobalTypeList(void *); +#endif + +SWIGRUNTIME swig_module_info * +SWIG_Python_GetModule(void) { + static void *type_pointer = (void *)0; + /* first check if module already created */ + if (!type_pointer) { +#ifdef SWIG_LINK_RUNTIME + type_pointer = SWIG_ReturnGlobalTypeList((void *)0); +#else + type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); + if (PyErr_Occurred()) { + PyErr_Clear(); + type_pointer = (void *)0; } - if (obj) { - PyDict_SetItemString(d,constants[i].name,obj); - Py_DECREF(obj); - } +#endif } + return (swig_module_info *) type_pointer; } +#if PY_MAJOR_VERSION < 2 +/* PyModule_AddObject function was introduced in Python 2.0. The following function +is copied out of Python/modsupport.c in python version 2.3.4 */ +SWIGINTERN int +PyModule_AddObject(PyObject *m, char *name, PyObject *o) +{ + PyObject *dict; + if (!PyModule_Check(m)) { + PyErr_SetString(PyExc_TypeError, + "PyModule_AddObject() needs module as first arg"); + return -1; + } + if (!o) { + PyErr_SetString(PyExc_TypeError, + "PyModule_AddObject() needs non-NULL value"); + return -1; + } + + dict = PyModule_GetDict(m); + if (dict == NULL) { + /* Internal error -- modules must have a dict! */ + PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__", + PyModule_GetName(m)); + return -1; + } + if (PyDict_SetItemString(dict, name, o)) + return -1; + Py_DECREF(o); + return 0; +} #endif -/* Contract support */ +SWIGRUNTIME void +SWIG_Python_SetModule(swig_module_info *swig_module) { + static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */ -#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else + PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + swig_empty_runtime_method_table); + PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, NULL); + if (pointer && module) { + PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); + } +} #ifdef __cplusplus } @@ -683,13 +1414,19 @@ /* -------- TYPES TABLE (BEGIN) -------- */ -#define SWIGTYPE_p_switch_channel_t swig_types[0] -#define SWIGTYPE_p_switch_file_handle_t swig_types[1] -#define SWIGTYPE_p_switch_core_session_t swig_types[2] -#define SWIGTYPE_p_p_switch_core_session_t swig_types[3] -#define SWIGTYPE_p_uint32_t swig_types[4] -#define SWIGTYPE_p_switch_input_callback_function_t swig_types[5] -static swig_type_info *swig_types[7]; +#define SWIGTYPE_p_char swig_types[0] +#define SWIGTYPE_p_p_switch_core_session_t swig_types[1] +#define SWIGTYPE_p_switch_channel_state_t swig_types[2] +#define SWIGTYPE_p_switch_channel_t swig_types[3] +#define SWIGTYPE_p_switch_core_session_t swig_types[4] +#define SWIGTYPE_p_switch_file_handle_t swig_types[5] +#define SWIGTYPE_p_switch_input_callback_function_t swig_types[6] +#define SWIGTYPE_ptrdiff_t swig_types[7] +#define SWIGTYPE_size_t swig_types[8] +static swig_type_info *swig_types[10]; +static swig_module_info swig_module = {swig_types, 9, 0, 0, 0, 0}; +#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) +#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) /* -------- TYPES TABLE (END) -------- */ @@ -700,40 +1437,180 @@ #define SWIG_init init_freeswitch #define SWIG_name "_freeswitch" -extern void fs_core_set_globals(void); -extern int fs_core_init(char *); -extern int fs_core_destroy(void); -extern int fs_loadable_module_init(void); -extern int fs_loadable_module_shutdown(void); -extern int fs_console_loop(void); -extern void fs_consol_log(char *,char *); -extern void fs_consol_clean(char *); -extern switch_core_session_t *fs_core_session_locate(char *); -extern void fs_channel_answer(switch_core_session_t *); -extern void fs_channel_pre_answer(switch_core_session_t *); -extern void fs_channel_hangup(switch_core_session_t *,char *); -extern void fs_channel_set_variable(switch_core_session_t *,char *,char *); -extern void fs_channel_get_variable(switch_core_session_t *,char *); -extern void fs_channel_set_state(switch_core_session_t *,char *); -extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); -extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); -extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); -extern int fs_ivr_play_file2(switch_core_session_t *,char *); -extern int fs_switch_ivr_collect_digits_callback(switch_core_session_t *,switch_input_callback_function_t,void *,unsigned int,unsigned int); -extern int fs_switch_ivr_collect_digits_count(switch_core_session_t *,char *,unsigned int,unsigned int,char const *,char *,unsigned int); -extern int fs_switch_ivr_originate(switch_core_session_t *,switch_core_session_t **,char *,uint32_t); -extern int fs_switch_ivr_session_transfer(switch_core_session_t *,char *,char *,char *); -extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,char *,uint32_t,switch_input_callback_function_t,char *,void *,unsigned int); -extern char *fs_switch_channel_get_variable(switch_channel_t *,char *); -extern int fs_switch_channel_set_variable(switch_channel_t *,char *,char *); +/* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */ +SWIGINTERN int +SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize) +{ + static swig_type_info* pchar_info = 0; + char* vptr = 0; + if (!pchar_info) pchar_info = SWIG_TypeQuery("char *"); + if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_info, 0) != -1) { + if (cptr) *cptr = vptr; + if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0; + return SWIG_OLDOBJ; + } else { + PyErr_Clear(); + if (PyString_Check(obj)) { + if (cptr) { + *cptr = PyString_AS_STRING(obj); + if (psize) { + *psize = PyString_GET_SIZE(obj) + 1; + } + } + return SWIG_PYSTR; + } + } + if (cptr) { + SWIG_type_error("char *", obj); + } + return 0; +} + + +SWIGINTERNINLINE int +SWIG_AsCharPtr(PyObject *obj, char **val) +{ + if (SWIG_AsCharPtrAndSize(obj, val, (size_t*)(0))) { + return 1; + } + if (val) { + PyErr_Clear(); + SWIG_type_error("char *", obj); + } + return 0; +} + + + /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_int PyInt_FromLong +/*@@*/ + + +#include <limits.h> + + +SWIGINTERNINLINE int + SWIG_CheckUnsignedLongInRange(unsigned long value, + unsigned long max_value, + const char *errmsg) +{ + if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %lu is greater than '%s' minimum %lu", + value, errmsg, max_value); + } + return 0; + } + return 1; + } + + +SWIGINTERN int + SWIG_AsVal_unsigned_SS_long(PyObject *obj, unsigned long *val) +{ + if (PyLong_Check(obj)) { + unsigned long v = PyLong_AsUnsignedLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return 1; + } else { + if (!val) PyErr_Clear(); + return 0; + } + } + if (PyInt_Check(obj)) { + long v = PyInt_AsLong(obj); + if (v >= 0) { + if (val) *val = v; + return 1; + } + } + if (val) { + SWIG_type_error("unsigned long", obj); + } + return 0; +} + + +#if UINT_MAX != ULONG_MAX +SWIGINTERN int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + const char* errmsg = val ? "unsigned int" : (char*)0; + unsigned long v; + if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { + if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { + if (val) *val = (unsigned int)(v); + return 1; + } + } else { + PyErr_Clear(); + } + if (val) { + SWIG_type_error(errmsg, obj); + } + return 0; +} +#else +SWIGINTERNINLINE unsigned int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); +} +#endif + + +SWIGINTERNINLINE unsigned int +SWIG_As_unsigned_SS_int(PyObject* obj) +{ + unsigned int v; + if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. + */ + memset((void*)&v, 0, sizeof(unsigned int)); + } + return v; +} + + +SWIGINTERNINLINE int +SWIG_Check_unsigned_SS_int(PyObject* obj) +{ + return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); +} + + +SWIGINTERN PyObject * +SWIG_FromCharPtr(const char* cptr) +{ + if (cptr) { + size_t size = strlen(cptr); + if (size > INT_MAX) { + return SWIG_NewPointerObj((char*)(cptr), + SWIG_TypeQuery("char *"), 0); + } else { + if (size != 0) { + return PyString_FromStringAndSize(cptr, size); + } else { + return PyString_FromString(cptr); + } + } + } + Py_INCREF(Py_None); + return Py_None; +} + + #include "switch.h" #ifdef __cplusplus extern "C" { #endif static PyObject *_wrap_fs_core_set_globals(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; if(!PyArg_ParseTuple(args,(char *)":fs_core_set_globals")) goto fail; fs_core_set_globals(); @@ -746,14 +1623,20 @@ static PyObject *_wrap_fs_core_init(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; + PyObject *resultobj = NULL; + char *arg1 = (char *) 0 ; int result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"s:fs_core_init",&arg1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O:fs_core_init",&obj0)) goto fail; + if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) { + SWIG_arg_fail(1);SWIG_fail; + } result = (int)fs_core_init(arg1); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -761,13 +1644,15 @@ static PyObject *_wrap_fs_core_destroy(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; int result; if(!PyArg_ParseTuple(args,(char *)":fs_core_destroy")) goto fail; result = (int)fs_core_destroy(); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -775,13 +1660,15 @@ static PyObject *_wrap_fs_loadable_module_init(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; int result; if(!PyArg_ParseTuple(args,(char *)":fs_loadable_module_init")) goto fail; result = (int)fs_loadable_module_init(); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -789,13 +1676,15 @@ static PyObject *_wrap_fs_loadable_module_shutdown(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; int result; if(!PyArg_ParseTuple(args,(char *)":fs_loadable_module_shutdown")) goto fail; result = (int)fs_loadable_module_shutdown(); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -803,26 +1692,36 @@ static PyObject *_wrap_fs_console_loop(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; int result; if(!PyArg_ParseTuple(args,(char *)":fs_console_loop")) goto fail; result = (int)fs_console_loop(); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_fs_consol_log(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; - char *arg2 ; +static PyObject *_wrap_fs_console_log(PyObject *self, PyObject *args) { + PyObject *resultobj = NULL; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"ss:fs_consol_log",&arg1,&arg2)) goto fail; - fs_consol_log(arg1,arg2); + if(!PyArg_ParseTuple(args,(char *)"OO:fs_console_log",&obj0,&obj1)) goto fail; + if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) { + SWIG_arg_fail(1);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + fs_console_log(arg1,arg2); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -831,12 +1730,16 @@ } -static PyObject *_wrap_fs_consol_clean(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; +static PyObject *_wrap_fs_console_clean(PyObject *self, PyObject *args) { + PyObject *resultobj = NULL; + char *arg1 = (char *) 0 ; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"s:fs_consol_clean",&arg1)) goto fail; - fs_consol_clean(arg1); + if(!PyArg_ParseTuple(args,(char *)"O:fs_console_clean",&obj0)) goto fail; + if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) { + SWIG_arg_fail(1);SWIG_fail; + } + fs_console_clean(arg1); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -846,14 +1749,18 @@ static PyObject *_wrap_fs_core_session_locate(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; + PyObject *resultobj = NULL; + char *arg1 = (char *) 0 ; switch_core_session_t *result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"s:fs_core_session_locate",&arg1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O:fs_core_session_locate",&obj0)) goto fail; + if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) { + SWIG_arg_fail(1);SWIG_fail; + } result = (switch_core_session_t *)fs_core_session_locate(arg1); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_switch_core_session_t, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_switch_core_session_t, 0); return resultobj; fail: return NULL; @@ -861,12 +1768,13 @@ static PyObject *_wrap_fs_channel_answer(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:fs_channel_answer",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; fs_channel_answer(arg1); Py_INCREF(Py_None); resultobj = Py_None; @@ -877,12 +1785,13 @@ static PyObject *_wrap_fs_channel_pre_answer(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:fs_channel_pre_answer",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; fs_channel_pre_answer(arg1); Py_INCREF(Py_None); resultobj = Py_None; @@ -893,13 +1802,18 @@ static PyObject *_wrap_fs_channel_hangup(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; + char *arg2 = (char *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Os:fs_channel_hangup",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:fs_channel_hangup",&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } fs_channel_hangup(arg1,arg2); Py_INCREF(Py_None); resultobj = Py_None; @@ -910,14 +1824,23 @@ static PyObject *_wrap_fs_channel_set_variable(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *arg3 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oss:fs_channel_set_variable",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:fs_channel_set_variable",&obj0,&obj1,&obj2)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } fs_channel_set_variable(arg1,arg2,arg3); Py_INCREF(Py_None); resultobj = Py_None; @@ -928,13 +1851,18 @@ static PyObject *_wrap_fs_channel_get_variable(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; + char *arg2 = (char *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Os:fs_channel_get_variable",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:fs_channel_get_variable",&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } fs_channel_get_variable(arg1,arg2); Py_INCREF(Py_None); resultobj = Py_None; @@ -945,13 +1873,18 @@ static PyObject *_wrap_fs_channel_set_state(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; + char *arg2 = (char *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Os:fs_channel_set_state",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:fs_channel_set_state",&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } fs_channel_set_state(arg1,arg2); Py_INCREF(Py_None); resultobj = Py_None; @@ -962,30 +1895,54 @@ static PyObject *_wrap_fs_ivr_play_file(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *arg3 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; switch_input_callback_function_t arg4 ; void *arg5 = (void *) 0 ; unsigned int arg6 ; int result; - switch_input_callback_function_t *argp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OssOOO:fs_ivr_play_file",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &argp4, SWIGTYPE_p_switch_input_callback_function_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg4 = *argp4; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg6 = (unsigned int) PyInt_AsLong(obj5); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOOO:fs_ivr_play_file",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } + { + switch_input_callback_function_t * argp; + SWIG_Python_ConvertPtr(obj3, (void **)&argp, SWIGTYPE_p_switch_input_callback_function_t, SWIG_POINTER_EXCEPTION); + if (SWIG_arg_fail(4)) SWIG_fail; + if (argp == NULL) { + SWIG_null_ref("switch_input_callback_function_t"); + } + if (SWIG_arg_fail(4)) SWIG_fail; + arg4 = *argp; + } + { + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),0,SWIG_POINTER_EXCEPTION|0))== -1) { + SWIG_arg_fail(5);SWIG_fail; + } + } + { + arg6 = (unsigned int)(SWIG_As_unsigned_SS_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -993,36 +1950,53 @@ static PyObject *_wrap_fs_switch_ivr_record_file(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ; - char *arg3 ; + char *arg3 = (char *) 0 ; switch_input_callback_function_t arg4 ; void *arg5 = (void *) 0 ; unsigned int arg6 ; - unsigned int arg7 ; int result; - switch_input_callback_function_t *argp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOsOOOO:fs_switch_ivr_record_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_switch_file_handle_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &argp4, SWIGTYPE_p_switch_input_callback_function_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg4 = *argp4; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg6 = (unsigned int) PyInt_AsLong(obj5); - if (PyErr_Occurred()) SWIG_fail; - arg7 = (unsigned int) PyInt_AsLong(obj6); - if (PyErr_Occurred()) SWIG_fail; - result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + if(!PyArg_ParseTuple(args,(char *)"OOOOOO:fs_switch_ivr_record_file",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_switch_file_handle_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } + { + switch_input_callback_function_t * argp; + SWIG_Python_ConvertPtr(obj3, (void **)&argp, SWIGTYPE_p_switch_input_callback_function_t, SWIG_POINTER_EXCEPTION); + if (SWIG_arg_fail(4)) SWIG_fail; + if (argp == NULL) { + SWIG_null_ref("switch_input_callback_function_t"); + } + if (SWIG_arg_fail(4)) SWIG_fail; + arg4 = *argp; + } + { + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),0,SWIG_POINTER_EXCEPTION|0))== -1) { + SWIG_arg_fail(5);SWIG_fail; + } + } + { + arg6 = (unsigned int)(SWIG_As_unsigned_SS_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1030,21 +2004,25 @@ static PyObject *_wrap_fs_switch_ivr_sleep(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - uint32_t arg2 ; + unsigned int arg2 ; int result; - uint32_t *argp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:fs_switch_ivr_sleep",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_uint32_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (unsigned int)(SWIG_As_unsigned_SS_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } result = (int)fs_switch_ivr_sleep(arg1,arg2); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1052,17 +2030,24 @@ static PyObject *_wrap_fs_ivr_play_file2(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; + char *arg2 = (char *) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Os:fs_ivr_play_file2",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:fs_ivr_play_file2",&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } result = (int)fs_ivr_play_file2(arg1,arg2); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1070,14 +2055,13 @@ static PyObject *_wrap_fs_switch_ivr_collect_digits_callback(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_input_callback_function_t arg2 ; void *arg3 = (void *) 0 ; unsigned int arg4 ; unsigned int arg5 ; int result; - switch_input_callback_function_t *argp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -1085,17 +2069,36 @@ PyObject * obj4 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOOOO:fs_switch_ivr_collect_digits_callback",&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_switch_input_callback_function_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg4 = (unsigned int) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; - arg5 = (unsigned int) PyInt_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + switch_input_callback_function_t * argp; + SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_switch_input_callback_function_t, SWIG_POINTER_EXCEPTION); + if (SWIG_arg_fail(2)) SWIG_fail; + if (argp == NULL) { + SWIG_null_ref("switch_input_callback_function_t"); + } + if (SWIG_arg_fail(2)) SWIG_fail; + arg2 = *argp; + } + { + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),0,SWIG_POINTER_EXCEPTION|0))== -1) { + SWIG_arg_fail(3);SWIG_fail; + } + } + { + arg4 = (unsigned int)(SWIG_As_unsigned_SS_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + { + arg5 = (unsigned int)(SWIG_As_unsigned_SS_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } result = (int)fs_switch_ivr_collect_digits_callback(arg1,arg2,arg3,arg4,arg5); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1103,31 +2106,52 @@ static PyObject *_wrap_fs_switch_ivr_collect_digits_count(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; + char *arg2 = (char *) 0 ; unsigned int arg3 ; unsigned int arg4 ; - char *arg5 ; - char *arg6 ; + char *arg5 = (char *) 0 ; + char *arg6 = (char *) 0 ; unsigned int arg7 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OsOOssO:fs_switch_ivr_collect_digits_count",&obj0,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = (unsigned int) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg4 = (unsigned int) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; - arg7 = (unsigned int) PyInt_AsLong(obj6); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOOOO:fs_switch_ivr_collect_digits_count",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + { + arg3 = (unsigned int)(SWIG_As_unsigned_SS_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + { + arg4 = (unsigned int)(SWIG_As_unsigned_SS_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + if (!SWIG_AsCharPtr(obj4, (char**)&arg5)) { + SWIG_arg_fail(5);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj5, (char**)&arg6)) { + SWIG_arg_fail(6);SWIG_fail; + } + { + arg7 = (unsigned int)(SWIG_As_unsigned_SS_int(obj6)); + if (SWIG_arg_fail(7)) SWIG_fail; + } result = (int)fs_switch_ivr_collect_digits_count(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1135,25 +2159,34 @@ static PyObject *_wrap_fs_switch_ivr_originate(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_core_session_t **arg2 = (switch_core_session_t **) 0 ; - char *arg3 ; - uint32_t arg4 ; + char *arg3 = (char *) 0 ; + unsigned int arg4 ; int result; - uint32_t *argp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOsO:fs_switch_ivr_originate",&obj0,&obj1,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &argp4, SWIGTYPE_p_uint32_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg4 = *argp4; + if(!PyArg_ParseTuple(args,(char *)"OOOO:fs_switch_ivr_originate",&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } + { + arg4 = (unsigned int)(SWIG_As_unsigned_SS_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } result = (int)fs_switch_ivr_originate(arg1,arg2,arg3,arg4); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1161,19 +2194,34 @@ static PyObject *_wrap_fs_switch_ivr_session_transfer(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *arg3 ; - char *arg4 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Osss:fs_switch_ivr_session_transfer",&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOO:fs_switch_ivr_session_transfer",&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj3, (char**)&arg4)) { + SWIG_arg_fail(4);SWIG_fail; + } result = (int)fs_switch_ivr_session_transfer(arg1,arg2,arg3,arg4); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1181,55 +2229,128 @@ static PyObject *_wrap_fs_switch_ivr_speak_text(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *arg3 ; - char *arg4 ; - uint32_t arg5 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + unsigned int arg5 ; switch_input_callback_function_t arg6 ; - char *arg7 ; + char *arg7 = (char *) 0 ; void *arg8 = (void *) 0 ; unsigned int arg9 ; int result; - uint32_t *argp5 ; - switch_input_callback_function_t *argp6 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OsssOOsOO:fs_switch_ivr_speak_text",&obj0,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj4,(void **) &argp5, SWIGTYPE_p_uint32_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg5 = *argp5; - if ((SWIG_ConvertPtr(obj5,(void **) &argp6, SWIGTYPE_p_switch_input_callback_function_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg6 = *argp6; - if ((SWIG_ConvertPtr(obj7,(void **) &arg8, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg9 = (unsigned int) PyInt_AsLong(obj8); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:fs_switch_ivr_speak_text",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj3, (char**)&arg4)) { + SWIG_arg_fail(4);SWIG_fail; + } + { + arg5 = (unsigned int)(SWIG_As_unsigned_SS_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + { + switch_input_callback_function_t * argp; + SWIG_Python_ConvertPtr(obj5, (void **)&argp, SWIGTYPE_p_switch_input_callback_function_t, SWIG_POINTER_EXCEPTION); + if (SWIG_arg_fail(6)) SWIG_fail; + if (argp == NULL) { + SWIG_null_ref("switch_input_callback_function_t"); + } + if (SWIG_arg_fail(6)) SWIG_fail; + arg6 = *argp; + } + if (!SWIG_AsCharPtr(obj6, (char**)&arg7)) { + SWIG_arg_fail(7);SWIG_fail; + } + { + if ((SWIG_ConvertPtr(obj7,(void **)(&arg8),0,SWIG_POINTER_EXCEPTION|0))== -1) { + SWIG_arg_fail(8);SWIG_fail; + } + } + { + arg9 = (unsigned int)(SWIG_As_unsigned_SS_int(obj8)); + if (SWIG_arg_fail(9)) SWIG_fail; + } result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; } +static PyObject *_wrap_fs_switch_ivr_speak_text2(PyObject *self, PyObject *args) { + PyObject *resultobj = NULL; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OOOO:fs_switch_ivr_speak_text2",&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj3, (char**)&arg4)) { + SWIG_arg_fail(4);SWIG_fail; + } + result = (int)fs_switch_ivr_speak_text2(arg1,arg2,arg3,arg4); + + { + resultobj = SWIG_From_int((int)(result)); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_fs_switch_channel_get_variable(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_channel_t *arg1 = (switch_channel_t *) 0 ; - char *arg2 ; + char *arg2 = (char *) 0 ; char *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Os:fs_switch_channel_get_variable",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_channel_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:fs_switch_channel_get_variable",&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_channel_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } result = (char *)fs_switch_channel_get_variable(arg1,arg2); - resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)""); + resultobj = SWIG_FromCharPtr(result); return resultobj; fail: return NULL; @@ -1237,18 +2358,29 @@ static PyObject *_wrap_fs_switch_channel_set_variable(PyObject *self, PyObject *args) { - PyObject *resultobj; + PyObject *resultobj = NULL; switch_channel_t *arg1 = (switch_channel_t *) 0 ; - char *arg2 ; - char *arg3 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oss:fs_switch_channel_set_variable",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_channel_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:fs_switch_channel_set_variable",&obj0,&obj1,&obj2)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_switch_channel_t, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) { + SWIG_arg_fail(2);SWIG_fail; + } + if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) { + SWIG_arg_fail(3);SWIG_fail; + } result = (int)fs_switch_channel_set_variable(arg1,arg2,arg3); - resultobj = PyInt_FromLong((long)result); + { + resultobj = SWIG_From_int((int)(result)); + } return resultobj; fail: return NULL; @@ -1256,84 +2388,546 @@ static PyMethodDef SwigMethods[] = { - { (char *)"fs_core_set_globals", _wrap_fs_core_set_globals, METH_VARARGS }, - { (char *)"fs_core_init", _wrap_fs_core_init, METH_VARARGS }, - { (char *)"fs_core_destroy", _wrap_fs_core_destroy, METH_VARARGS }, - { (char *)"fs_loadable_module_init", _wrap_fs_loadable_module_init, METH_VARARGS }, - { (char *)"fs_loadable_module_shutdown", _wrap_fs_loadable_module_shutdown, METH_VARARGS }, - { (char *)"fs_console_loop", _wrap_fs_console_loop, METH_VARARGS }, - { (char *)"fs_consol_log", _wrap_fs_consol_log, METH_VARARGS }, - { (char *)"fs_consol_clean", _wrap_fs_consol_clean, METH_VARARGS }, - { (char *)"fs_core_session_locate", _wrap_fs_core_session_locate, METH_VARARGS }, - { (char *)"fs_channel_answer", _wrap_fs_channel_answer, METH_VARARGS }, - { (char *)"fs_channel_pre_answer", _wrap_fs_channel_pre_answer, METH_VARARGS }, - { (char *)"fs_channel_hangup", _wrap_fs_channel_hangup, METH_VARARGS }, - { (char *)"fs_channel_set_variable", _wrap_fs_channel_set_variable, METH_VARARGS }, - { (char *)"fs_channel_get_variable", _wrap_fs_channel_get_variable, METH_VARARGS }, - { (char *)"fs_channel_set_state", _wrap_fs_channel_set_state, METH_VARARGS }, - { (char *)"fs_ivr_play_file", _wrap_fs_ivr_play_file, METH_VARARGS }, - { (char *)"fs_switch_ivr_record_file", _wrap_fs_switch_ivr_record_file, METH_VARARGS }, - { (char *)"fs_switch_ivr_sleep", _wrap_fs_switch_ivr_sleep, METH_VARARGS }, - { (char *)"fs_ivr_play_file2", _wrap_fs_ivr_play_file2, METH_VARARGS }, - { (char *)"fs_switch_ivr_collect_digits_callback", _wrap_fs_switch_ivr_collect_digits_callback, METH_VARARGS }, - { (char *)"fs_switch_ivr_collect_digits_count", _wrap_fs_switch_ivr_collect_digits_count, METH_VARARGS }, - { (char *)"fs_switch_ivr_originate", _wrap_fs_switch_ivr_originate, METH_VARARGS }, - { (char *)"fs_switch_ivr_session_transfer", _wrap_fs_switch_ivr_session_transfer, METH_VARARGS }, - { (char *)"fs_switch_ivr_speak_text", _wrap_fs_switch_ivr_speak_text, METH_VARARGS }, - { (char *)"fs_switch_channel_get_variable", _wrap_fs_switch_channel_get_variable, METH_VARARGS }, - { (char *)"fs_switch_channel_set_variable", _wrap_fs_switch_channel_set_variable, METH_VARARGS }, - { NULL, NULL } + { (char *)"fs_core_set_globals", _wrap_fs_core_set_globals, METH_VARARGS, NULL}, + { (char *)"fs_core_init", _wrap_fs_core_init, METH_VARARGS, NULL}, + { (char *)"fs_core_destroy", _wrap_fs_core_destroy, METH_VARARGS, NULL}, + { (char *)"fs_loadable_module_init", _wrap_fs_loadable_module_init, METH_VARARGS, NULL}, + { (char *)"fs_loadable_module_shutdown", _wrap_fs_loadable_module_shutdown, METH_VARARGS, NULL}, + { (char *)"fs_console_loop", _wrap_fs_console_loop, METH_VARARGS, NULL}, + { (char *)"fs_console_log", _wrap_fs_console_log, METH_VARARGS, NULL}, + { (char *)"fs_console_clean", _wrap_fs_console_clean, METH_VARARGS, NULL}, + { (char *)"fs_core_session_locate", _wrap_fs_core_session_locate, METH_VARARGS, NULL}, + { (char *)"fs_channel_answer", _wrap_fs_channel_answer, METH_VARARGS, NULL}, + { (char *)"fs_channel_pre_answer", _wrap_fs_channel_pre_answer, METH_VARARGS, NULL}, + { (char *)"fs_channel_hangup", _wrap_fs_channel_hangup, METH_VARARGS, NULL}, + { (char *)"fs_channel_set_variable", _wrap_fs_channel_set_variable, METH_VARARGS, NULL}, + { (char *)"fs_channel_get_variable", _wrap_fs_channel_get_variable, METH_VARARGS, NULL}, + { (char *)"fs_channel_set_state", _wrap_fs_channel_set_state, METH_VARARGS, NULL}, + { (char *)"fs_ivr_play_file", _wrap_fs_ivr_play_file, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_record_file", _wrap_fs_switch_ivr_record_file, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_sleep", _wrap_fs_switch_ivr_sleep, METH_VARARGS, NULL}, + { (char *)"fs_ivr_play_file2", _wrap_fs_ivr_play_file2, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_collect_digits_callback", _wrap_fs_switch_ivr_collect_digits_callback, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_collect_digits_count", _wrap_fs_switch_ivr_collect_digits_count, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_originate", _wrap_fs_switch_ivr_originate, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_session_transfer", _wrap_fs_switch_ivr_session_transfer, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_speak_text", _wrap_fs_switch_ivr_speak_text, METH_VARARGS, NULL}, + { (char *)"fs_switch_ivr_speak_text2", _wrap_fs_switch_ivr_speak_text2, METH_VARARGS, NULL}, + { (char *)"fs_switch_channel_get_variable", _wrap_fs_switch_channel_get_variable, METH_VARARGS, NULL}, + { (char *)"fs_switch_channel_set_variable", _wrap_fs_switch_channel_set_variable, METH_VARARGS, NULL}, + { NULL, NULL, 0, NULL } }; /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static swig_type_info _swigt__p_switch_channel_t[] = {{"_p_switch_channel_t", 0, "switch_channel_t *", 0},{"_p_switch_channel_t"},{0}}; -static swig_type_info _swigt__p_switch_file_handle_t[] = {{"_p_switch_file_handle_t", 0, "switch_file_handle_t *", 0},{"_p_switch_file_handle_t"},{0}}; -static swig_type_info _swigt__p_switch_core_session_t[] = {{"_p_switch_core_session_t", 0, "switch_core_session_t *", 0},{"_p_switch_core_session_t"},{0}}; -static swig_type_info _swigt__p_p_switch_core_session_t[] = {{"_p_p_switch_core_session_t", 0, "switch_core_session_t **", 0},{"_p_p_switch_core_session_t"},{0}}; -static swig_type_info _swigt__p_uint32_t[] = {{"_p_uint32_t", 0, "uint32_t *", 0},{"_p_uint32_t"},{0}}; -static swig_type_info _swigt__p_switch_input_callback_function_t[] = {{"_p_switch_input_callback_function_t", 0, "switch_input_callback_function_t *", 0},{"_p_switch_input_callback_function_t"},{0}}; +static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, 0}; +static swig_type_info _swigt__p_p_switch_core_session_t = {"_p_p_switch_core_session_t", "switch_core_session_t **", 0, 0, 0}; +static swig_type_info _swigt__p_switch_channel_state_t = {"_p_switch_channel_state_t", "enum switch_channel_state_t *|switch_channel_state_t *", 0, 0, 0}; +static swig_type_info _swigt__p_switch_channel_t = {"_p_switch_channel_t", "switch_channel_t *", 0, 0, 0}; +static swig_type_info _swigt__p_switch_core_session_t = {"_p_switch_core_session_t", "switch_core_session_t *", 0, 0, 0}; +static swig_type_info _swigt__p_switch_file_handle_t = {"_p_switch_file_handle_t", "switch_file_handle_t *", 0, 0, 0}; +static swig_type_info _swigt__p_switch_input_callback_function_t = {"_p_switch_input_callback_function_t", "switch_input_callback_function_t *", 0, 0, 0}; +static swig_type_info _swigt__ptrdiff_t = {"_ptrdiff_t", "ptrdiff_t", 0, 0, 0}; +static swig_type_info _swigt__size_t = {"_size_t", "size_t", 0, 0, 0}; -static swig_type_info *swig_types_initial[] = { -_swigt__p_switch_channel_t, -_swigt__p_switch_file_handle_t, -_swigt__p_switch_core_session_t, -_swigt__p_p_switch_core_session_t, -_swigt__p_uint32_t, -_swigt__p_switch_input_callback_function_t, -0 +static swig_type_info *swig_type_initial[] = { + &_swigt__p_char, + &_swigt__p_p_switch_core_session_t, + &_swigt__p_switch_channel_state_t, + &_swigt__p_switch_channel_t, + &_swigt__p_switch_core_session_t, + &_swigt__p_switch_file_handle_t, + &_swigt__p_switch_input_callback_function_t, + &_swigt__ptrdiff_t, + &_swigt__size_t, }; +static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_switch_core_session_t[] = { {&_swigt__p_p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_channel_state_t[] = { {&_swigt__p_switch_channel_state_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_channel_t[] = { {&_swigt__p_switch_channel_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_core_session_t[] = { {&_swigt__p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_file_handle_t[] = { {&_swigt__p_switch_file_handle_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_input_callback_function_t[] = { {&_swigt__p_switch_input_callback_function_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__size_t[] = { {&_swigt__size_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info *swig_cast_initial[] = { + _swigc__p_char, + _swigc__p_p_switch_core_session_t, + _swigc__p_switch_channel_state_t, + _swigc__p_switch_channel_t, + _swigc__p_switch_core_session_t, + _swigc__p_switch_file_handle_t, + _swigc__p_switch_input_callback_function_t, + _swigc__ptrdiff_t, + _swigc__size_t, +}; + + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{0}}; +{0, 0, 0, 0.0, 0, 0}}; #ifdef __cplusplus } #endif +/************************************************************************* + * Type initialization: + * This problem is tough by the requirement that no dynamic + * memory is used. Also, since swig_type_info structures store pointers to + * swig_cast_info structures and swig_cast_info structures store pointers back + * to swig_type_info structures, we need some lookup code at initialization. + * The idea is that swig generates all the structures that are needed. + * The runtime then collects these partially filled structures. + * The SWIG_InitializeModule function takes these initial arrays out of + * swig_module, and does all the lookup, filling in the swig_module.types + * array with the correct data and linking the correct swig_cast_info + * structures together. + * The generated swig_type_info structures are assigned staticly to an initial + * array. We just loop though that array, and handle each type individually. + * First we lookup if this type has been already loaded, and if so, use the + * loaded structure instead of the generated one. Then we have to fill in the + * cast linked list. The cast data is initially stored in something like a + * two-dimensional array. Each row corresponds to a type (there are the same + * number of rows as there are in the swig_type_initial array). Each entry in + * a column is one of the swig_cast_info structures for that type. + * The cast_initial array is actually an array of arrays, because each row has + * a variable number of columns. So to actually build the cast linked list, + * we find the array of casts associated with the type, and loop through it + * adding the casts to the list. The one last trick we need to do is making + * sure the type pointer in the swig_cast_info struct is correct. + + * First off, we lookup the cast->type name to see if it is already loaded. + * There are three cases to handle: + * 1) If the cast->type has already been loaded AND the type we are adding + * casting info to has not been loaded (it is in this module), THEN we + * replace the cast->type pointer with the type pointer that has already + * been loaded. + * 2) If BOTH types (the one we are adding casting info to, and the + * cast->type) are loaded, THEN the cast info has already been loaded by + * the previous module so we just ignore it. + * 3) Finally, if cast->type has not already been loaded, then we add that + * swig_cast_info to the linked list (because the cast->type) pointer will + * be correct. +**/ + #ifdef __cplusplus +extern "C" { +#endif + + SWIGRUNTIME void + SWIG_InitializeModule(void *clientdata) { + swig_type_info *type, *ret; + swig_cast_info *cast; + size_t i; + swig_module_info *module_head; + static int init_run = 0; + + clientdata = clientdata; + + if (init_run) return; + init_run = 1; + + /* Initialize the swig_module */ + swig_module.type_initial = swig_type_initial; + swig_module.cast_initial = swig_cast_initial; + + /* Try and load any already created modules */ + module_head = SWIG_GetModule(clientdata); + if (module_head) { + swig_module.next = module_head->next; + module_head->next = &swig_module; + } else { + /* This is the first module loaded */ + swig_module.next = &swig_module; + SWIG_SetModule(clientdata, &swig_module); + } + + /* Now work on filling in swig_module.types */ + for (i = 0; i < swig_module.size; ++i) { + type = 0; + + /* if there is another module already loaded */ + if (swig_module.next != &swig_module) { + type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); + } + if (type) { + /* Overwrite clientdata field */ + if (swig_module.type_initial[i]->clientdata) type->clientdata = swig_module.type_initial[i]->clientdata; + } else { + type = swig_module.type_initial[i]; + } + + /* Insert casting types */ + cast = swig_module.cast_initial[i]; + while (cast->type) { + /* Don't need to add information already in the list */ + ret = 0; + if (swig_module.next != &swig_module) { + ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); + } + if (ret && type == swig_module.type_initial[i]) { + cast->type = ret; + ret = 0; + } + + if (!ret) { + if (type->cast) { + type->cast->prev = cast; + cast->next = type->cast; + } + type->cast = cast; + } + + cast++; + } + + /* Set entry in modules->types array equal to the type */ + swig_module.types[i] = type; + } + swig_module.types[i] = 0; + } + + /* This function will propagate the clientdata field of type to + * any new swig_type_info structures that have been added into the list + * of equivalent types. It is like calling + * SWIG_TypeClientData(type, clientdata) a second time. + */ + SWIGRUNTIME void + SWIG_PropagateClientData(void) { + size_t i; + swig_cast_info *equiv; + static int init_run = 0; + + if (init_run) return; + init_run = 1; + + for (i = 0; i < swig_module.size; i++) { + if (swig_module.types[i]->clientdata) { + equiv = swig_module.types[i]->cast; + while (equiv) { + if (!equiv->converter) { + if (equiv->type && !equiv->type->clientdata) + SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); + } + equiv = equiv->next; + } + } + } + } + +#ifdef __cplusplus +} +#endif + + + +#ifdef __cplusplus +extern "C" { +#endif + + /* Python-specific SWIG API */ +#define SWIG_newvarlink() SWIG_Python_newvarlink() +#define SWIG_addvarlink(p, name, get_attr, set_attr) SWIG_Python_addvarlink(p, name, get_attr, set_attr) +#define SWIG_InstallConstants(d, constants) SWIG_Python_InstallConstants(d, constants) + + /* ----------------------------------------------------------------------------- + * global variable support code. + * ----------------------------------------------------------------------------- */ + + typedef struct swig_globalvar { + char *name; /* Name of global variable */ + PyObject *(*get_attr)(void); /* Return the current value */ + int (*set_attr)(PyObject *); /* Set the value */ + struct swig_globalvar *next; + } swig_globalvar; + + typedef struct swig_varlinkobject { + PyObject_HEAD + swig_globalvar *vars; + } swig_varlinkobject; + + SWIGINTERN PyObject * + swig_varlink_repr(swig_varlinkobject *v) { + v = v; + return PyString_FromString("<Swig global variables>"); + } + + SWIGINTERN int + swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) { + swig_globalvar *var; + flags = flags; + fprintf(fp,"Swig global variables { "); + for (var = v->vars; var; var=var->next) { + fprintf(fp,"%s", var->name); + if (var->next) fprintf(fp,", "); + } + fprintf(fp," }\n"); + return 0; + } + + SWIGINTERN PyObject * + swig_varlink_getattr(swig_varlinkobject *v, char *n) { + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + return (*var->get_attr)(); + } + var = var->next; + } + PyErr_SetString(PyExc_NameError,"Unknown C global variable"); + return NULL; + } + + SWIGINTERN int + swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + return (*var->set_attr)(p); + } + var = var->next; + } + PyErr_SetString(PyExc_NameError,"Unknown C global variable"); + return 1; + } + + SWIGINTERN PyTypeObject* + swig_varlink_type(void) { + static char varlink__doc__[] = "Swig var link object"; + static PyTypeObject varlink_type +#if !defined(__cplusplus) + ; + static int type_init = 0; + if (!type_init) { + PyTypeObject tmp +#endif + = { + PyObject_HEAD_INIT(&PyType_Type) + 0, /* Number of items in variable part (ob_size) */ + (char *)"swigvarlink", /* Type name (tp_name) */ + sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */ + 0, /* Itemsize (tp_itemsize) */ + 0, /* Deallocator (tp_dealloc) */ + (printfunc) swig_varlink_print, /* Print (tp_print) */ + (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */ + (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */ + 0, /* tp_compare */ + (reprfunc) swig_varlink_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + 0, /* tp_flags */ + varlink__doc__, /* tp_doc */ +#if PY_VERSION_HEX >= 0x02000000 + 0, /* tp_traverse */ + 0, /* tp_clear */ +#endif +#if PY_VERSION_HEX >= 0x02010000 + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#endif +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030000 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + 0,0,0,0 /* tp_alloc -> tp_next */ +#endif + }; +#if !defined(__cplusplus) + varlink_type = tmp; + type_init = 1; + } +#endif + return &varlink_type; + } + + /* Create a variable linking object for use later */ + SWIGINTERN PyObject * + SWIG_Python_newvarlink(void) { + swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type()); + if (result) { + result->vars = 0; + } + return ((PyObject*) result); + } + + SWIGINTERN void + SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { + swig_varlinkobject *v = (swig_varlinkobject *) p; + swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); + if (gv) { + size_t size = strlen(name)+1; + gv->name = (char *)malloc(size); + if (gv->name) { + strncpy(gv->name,name,size); + gv->get_attr = get_attr; + gv->set_attr = set_attr; + gv->next = v->vars; + } + } + v->vars = gv; + } + + /* ----------------------------------------------------------------------------- + * constants/methods manipulation + * ----------------------------------------------------------------------------- */ + + /* Install Constants */ + SWIGINTERN void + SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { + PyObject *obj = 0; + size_t i; + for (i = 0; constants[i].type; ++i) { + switch(constants[i].type) { + case SWIG_PY_INT: + obj = PyInt_FromLong(constants[i].lvalue); + break; + case SWIG_PY_FLOAT: + obj = PyFloat_FromDouble(constants[i].dvalue); + break; + case SWIG_PY_STRING: + if (constants[i].pvalue) { + obj = PyString_FromString((char *) constants[i].pvalue); + } else { + Py_INCREF(Py_None); + obj = Py_None; + } + break; + case SWIG_PY_POINTER: + obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); + break; + case SWIG_PY_BINARY: + obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); + break; + default: + obj = 0; + break; + } + if (obj) { + PyDict_SetItemString(d,constants[i].name,obj); + Py_DECREF(obj); + } + } + } + + /* -----------------------------------------------------------------------------*/ + /* Fix SwigMethods to carry the callback ptrs when needed */ + /* -----------------------------------------------------------------------------*/ + + SWIGINTERN void + SWIG_Python_FixMethods(PyMethodDef *methods, + swig_const_info *const_table, + swig_type_info **types, + swig_type_info **types_initial) { + size_t i; + for (i = 0; methods[i].ml_name; ++i) { + char *c = methods[i].ml_doc; + if (c && (c = strstr(c, "swig_ptr: "))) { + int j; + swig_const_info *ci = 0; + char *name = c + 10; + for (j = 0; const_table[j].type; ++j) { + if (strncmp(const_table[j].name, name, + strlen(const_table[j].name)) == 0) { + ci = &(const_table[j]); + break; + } + } + if (ci) { + size_t shift = (ci->ptype) - types; + swig_type_info *ty = types_initial[shift]; + size_t ldoc = (c - methods[i].ml_doc); + size_t lptr = strlen(ty->name)+2*sizeof(void*)+2; + char *ndoc = (char*)malloc(ldoc + lptr + 10); + if (ndoc) { + char *buff = ndoc; + void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0; + if (ptr) { + strncpy(buff, methods[i].ml_doc, ldoc); + buff += ldoc; + strncpy(buff, "swig_ptr: ", 10); + buff += 10; + SWIG_PackVoidPtr(buff, ptr, ty->name, lptr); + methods[i].ml_doc = ndoc; + } + } + } + } + } + } + + /* -----------------------------------------------------------------------------* + * Initialize type list + * -----------------------------------------------------------------------------*/ + +#ifdef __cplusplus +} +#endif + +/* -----------------------------------------------------------------------------* + * Partial Init method + * -----------------------------------------------------------------------------*/ + +#ifdef __cplusplus extern "C" #endif -SWIGEXPORT(void) SWIG_init(void) { +SWIGEXPORT void SWIG_init(void) { static PyObject *SWIG_globals = 0; - static int typeinit = 0; PyObject *m, *d; - int i; if (!SWIG_globals) SWIG_globals = SWIG_newvarlink(); + + /* Fix SwigMethods to carry the callback ptrs when needed */ + SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial); + m = Py_InitModule((char *) SWIG_name, SwigMethods); d = PyModule_GetDict(m); - if (!typeinit) { - for (i = 0; swig_types_initial[i]; i++) { - swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]); - } - typeinit = 1; - } + SWIG_InitializeModule(0); SWIG_InstallConstants(d,swig_const_table); + { + PyDict_SetItemString(d,"CS_NEW", SWIG_From_int((int)(CS_NEW))); + } + { + PyDict_SetItemString(d,"CS_INIT", SWIG_From_int((int)(CS_INIT))); + } + { + PyDict_SetItemString(d,"CS_RING", SWIG_From_int((int)(CS_RING))); + } + { + PyDict_SetItemString(d,"CS_TRANSMIT", SWIG_From_int((int)(CS_TRANSMIT))); + } + { + PyDict_SetItemString(d,"CS_EXECUTE", SWIG_From_int((int)(CS_EXECUTE))); + } + { + PyDict_SetItemString(d,"CS_LOOPBACK", SWIG_From_int((int)(CS_LOOPBACK))); + } + { + PyDict_SetItemString(d,"CS_HOLD", SWIG_From_int((int)(CS_HOLD))); + } + { + PyDict_SetItemString(d,"CS_HIBERNATE", SWIG_From_int((int)(CS_HIBERNATE))); + } + { + PyDict_SetItemString(d,"CS_HANGUP", SWIG_From_int((int)(CS_HANGUP))); + } + { + PyDict_SetItemString(d,"CS_DONE", SWIG_From_int((int)(CS_DONE))); + } } Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile Fri Dec 22 00:27:56 2006 @@ -5,7 +5,7 @@ depends: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js/nsprpub --prefix=$(PREFIX) --with-pic MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js --prefix=$(PREFIX) --with-pic --with-nspr=yes - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) --without-libidn + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX) --without-libidn $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile Fri Dec 22 00:27:56 2006 @@ -7,7 +7,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan-0.46.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\libetpan-0.46\build-windows\include";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libetpan\build-windows\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\libetpan-0.46\build-windows\include";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libetpan\build-windows\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib odbc32.lib " + AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib odbc32.lib " + AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj Fri Dec 22 00:27:56 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libteletone\src"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js20051231\src";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include";"$(InputDir)..\..\..\..\libs\libteletone\src";"$(InputDir)..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\include";"$(InputDir)..\mod_spidermonkey"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libteletone\src"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib libnspr4.lib libplc4.lib libplds4.lib" + AdditionalDependencies="ws2_32.lib winmm.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/Makefile Fri Dec 22 00:27:56 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c Modified: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Fri Dec 22 00:27:56 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install xmlrpc-c-1.03.14.tgz --prefix=$(PREFIX) --disable-cplusplus --disable-wininet-client --disable-libwww-client + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install xmlrpc-c --prefix=$(PREFIX) --disable-cplusplus --disable-wininet-client --disable-libwww-client $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c Modified: freeswitch/branches/knhor/trunk/src/switch_core.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_core.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_core.c Fri Dec 22 00:27:56 2006 @@ -2617,45 +2617,50 @@ { switch_dialplan_interface_t *dialplan_interface = NULL; switch_caller_profile_t *caller_profile; - switch_caller_extension_t *extension; + switch_caller_extension_t *extension = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard RING %s\n", switch_channel_get_name(session->channel)); if ((caller_profile = switch_channel_get_caller_profile(session->channel)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't get profile!\n"); switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return; } else { char *dp[25]; + char *dpstr; int argc, x, count = 0; if (!switch_strlen_zero(caller_profile->dialplan)) { - argc = switch_separate_string(caller_profile->dialplan, ',', dp, (sizeof(dp) / sizeof(dp[0]))); - for (x = 0; x < argc; x++) { - if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dp[x]))) { - continue; - } + if ((dpstr = switch_core_session_strdup(session, caller_profile->dialplan))) { + argc = switch_separate_string(dpstr, ',', dp, (sizeof(dp) / sizeof(dp[0]))); + for (x = 0; x < argc; x++) { + if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dp[x]))) { + continue; + } - count++; + count++; - if ((extension = dialplan_interface->hunt_function(session)) != 0) { - switch_channel_set_caller_extension(session->channel, extension); - break; - } - } - } + if ((extension = dialplan_interface->hunt_function(session)) != 0) { + switch_channel_set_caller_extension(session->channel, extension); + return; + } + } + } + } if (!count) { if (switch_channel_test_flag(session->channel, CF_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, changing state to HOLD\n"); switch_channel_set_state(session->channel, CS_HOLD); return; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, Aborting\n"); - switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); - } + } } } - + + if (!extension) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Route, Aborting\n"); + switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); + } } static void switch_core_standard_on_execute(switch_core_session_t *session) Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Fri Dec 22 00:27:56 2006 @@ -977,8 +977,23 @@ char *title = "", *copyright = "", *software = "", *artist = "", *comment = "", *date = ""; uint8_t asis = 0; char *ext; + char *prefix; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + prefix = switch_channel_get_variable(channel, "sound_prefix"); if (file) { + if (prefix && *file != '/' && *file != '\\' && *(file+1) != ':') { + char *new_file; + uint32_t len; + len = (uint32_t)strlen(file) + (uint32_t)strlen(prefix) + 10; + new_file = switch_core_session_alloc(session, len); + snprintf(new_file, len, "%s/%s", prefix, file); + file = new_file; + } + if ((ext = strrchr(file, '.'))) { ext++; } else { @@ -1004,10 +1019,6 @@ fh->samples = 0; } - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - if (switch_core_file_open(fh, file, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, @@ -1054,7 +1065,7 @@ date = (char *) switch_core_session_strdup(session, (char *)p); switch_channel_set_variable(channel, "RECORD_DATE", (char *)p); } - +#if 0 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timer name '%s'\n",timer_name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN FILE %s %uhz %u channels\n" @@ -1070,6 +1081,7 @@ artist, comment, date); +#endif assert(read_codec != NULL); interval = read_codec->implementation->microseconds_per_frame / 1000; @@ -4336,6 +4348,240 @@ return status; } + + +static char *SAY_METHOD_NAMES[] = { + "N/A", + "PRONOUNCED", + "ITERATED", + NULL +}; + +static char *SAY_TYPE_NAMES[] = { + "NUMBER", + "ITEMS", + "PERSONS", + "MESSAGES", + "CURRENCY", + "TIME_MEASUREMENT", + "CURRENT_DATE", + "CURRENT_TIME", + "CURRENT_DATE_TIME", + "TELEPHONE_NUMBER", + "TELEPHONE_EXTENSION", + "URL", + "EMAIL_ADDRESS", + "POSTAL_ADDRESS", + "ACCOUNT_NUMBER", + "NAME_SPELLED", + "NAME_PHONETIC", + NULL +}; + + +static switch_say_method_t get_say_method_by_name(char *name) +{ + int x = 0; + for (x = 0; SAY_METHOD_NAMES[x]; x++) { + if (!strcasecmp(SAY_METHOD_NAMES[x], name)) { + break; + } + } + + return (switch_say_method_t) x; +} + +static switch_say_method_t get_say_type_by_name(char *name) +{ + int x = 0; + for (x = 0; SAY_TYPE_NAMES[x]; x++) { + if (!strcasecmp(SAY_TYPE_NAMES[x], name)) { + break; + } + } + + return (switch_say_method_t) x; +} + + +SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, + char *macro_name, + char *data, + char *lang, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + switch_xml_t cfg, xml = NULL, language, macros, macro, input, action; + char *lname = NULL, *mname = NULL, hint_data[1024] = "", enc_hint[1024] = ""; + switch_status_t status = SWITCH_STATUS_GENERR; + char *old_sound_prefix, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_url_encode(data, enc_hint, sizeof(enc_hint)); + snprintf(hint_data, sizeof(hint_data), "macro_name=%s&lang=%s&data=%s", macro_name, lang, enc_hint); + + if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of phrases failed.\n"); + goto done; + } + + if (!(macros = switch_xml_child(cfg, "macros"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find macros tag.\n"); + goto done; + } + + if (!(language = switch_xml_child(macros, "language"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find language tag.\n"); + goto done; + } + + while(language) { + if ((lname = (char *) switch_xml_attr(language, "name")) && !strcasecmp(lname, lang)) { + break; + } + language = language->next; + } + + if (!language) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find language %s.\n", lang); + goto done; + } + + sound_path = (char *) switch_xml_attr_soft(language, "sound_path"); + tts_engine = (char *) switch_xml_attr_soft(language, "tts_engine"); + tts_voice = (char *) switch_xml_attr_soft(language, "tts_voice"); + + old_sound_prefix = switch_channel_get_variable(channel, "sound_prefix"); + switch_channel_set_variable(channel, "sound_prefix", sound_path); + + if (!(macro = switch_xml_child(language, "macro"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find any macro tags.\n"); + goto done; + } + + while(macro) { + if ((mname = (char *) switch_xml_attr(macro, "name")) && !strcasecmp(mname, macro_name)) { + break; + } + macro = macro->next; + } + + if (!macro) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find macro %s.\n", macro_name); + goto done; + } + + if (!(input = switch_xml_child(macro, "input"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find any input tags.\n"); + goto done; + } + + switch_channel_pre_answer(channel); + + while(input) { + char *pattern = (char *) switch_xml_attr(input, "pattern"); + + if (pattern) { + pcre *re = NULL; + int proceed = 0, ovector[30]; + char substituted[1024] = ""; + char *odata = NULL; + char *expanded = NULL; + + if ((proceed = switch_perform_regex(data, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { + for (action = switch_xml_child(input, "action"); action; action = action->next) { + char *adata = (char *) switch_xml_attr_soft(action, "data"); + char *func = (char *) switch_xml_attr_soft(action, "function"); + + if (strchr(pattern, '(') && strchr(adata, '$')) { + switch_perform_substitution(re, proceed, adata, data, substituted, sizeof(substituted), ovector); + odata = substituted; + } else { + odata = adata; + } + + expanded = switch_channel_expand_variables(channel, odata); + + if (expanded == odata) { + expanded = NULL; + } else { + odata = expanded; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Handle %s:[%s] (%s)\n", func, odata, lang); + + if (!strcasecmp(func, "play-file")) { + switch_ivr_play_file(session, NULL, odata, NULL, input_callback, buf, buflen); + } else if (!strcasecmp(func, "execute")) { + const switch_application_interface_t *application_interface; + char *app_name = NULL; + char *app_arg = NULL; + + if ((app_name = strdup(odata))) { + char *e = NULL; + if ((app_arg = strchr(app_name, '('))) { + *app_arg++ = '\0'; + if ((e = strchr(app_arg, ')'))) { + *e = '\0'; + } + if (app_name && app_arg && e && (application_interface = switch_loadable_module_get_application_interface(app_name))) { + if (application_interface->application_function) { + application_interface->application_function(session, app_arg); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application!\n"); + } + } + switch_safe_free(app_name); + } + } else if (!strcasecmp(func, "say")) { + switch_say_interface_t *si; + if ((si = switch_loadable_module_get_say_interface(lang))) { + char *say_type = (char *) switch_xml_attr_soft(action, "type"); + char *say_method = (char *) switch_xml_attr_soft(action, "method"); + + si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), input_callback, buf, buflen); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid SAY Interface [%s]!\n", lang); + } + } else if (!strcasecmp(func, "speak-text")) { + switch_codec_t *read_codec; + if ((read_codec = switch_core_session_get_read_codec(session))) { + switch_ivr_speak_text(session, + tts_engine, + tts_voice, + NULL, + read_codec->implementation->samples_per_second, + input_callback, + odata, + buf, + buflen); + } + } + } + } + + switch_clean_re(re); + switch_safe_free(expanded); + } + + input = input->next; + } + + done: + + switch_channel_set_variable(channel, "sound_prefix", old_sound_prefix); + + if (xml) { + switch_xml_free(xml); + } + return status; +} + /* For Emacs: * Local Variables: Modified: freeswitch/branches/knhor/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_loadable_module.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_loadable_module.c Fri Dec 22 00:27:56 2006 @@ -54,6 +54,7 @@ switch_hash_t *asr_hash; switch_hash_t *directory_hash; switch_hash_t *chat_hash; + switch_hash_t *say_hash; switch_memory_pool_t *pool; }; @@ -260,6 +261,20 @@ switch_core_hash_insert(loadable_modules.chat_hash, (char *) ptr->interface_name, (void *) ptr); } } + + if (new_module->module_interface->say_interface) { + const switch_say_interface_t *ptr; + + for (ptr = new_module->module_interface->say_interface; ptr; ptr = ptr->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Say interface '%s'\n", ptr->interface_name); + if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "type", "say"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "name", "%s", ptr->interface_name); + switch_event_fire(&event); + } + switch_core_hash_insert(loadable_modules.say_hash, (char *) ptr->interface_name, (void *) ptr); + } + } return SWITCH_STATUS_SUCCESS; @@ -506,6 +521,7 @@ switch_core_hash_init(&loadable_modules.asr_hash, loadable_modules.pool); switch_core_hash_init(&loadable_modules.directory_hash, loadable_modules.pool); switch_core_hash_init(&loadable_modules.chat_hash, loadable_modules.pool); + switch_core_hash_init(&loadable_modules.say_hash, loadable_modules.pool); switch_core_hash_init(&loadable_modules.dialplan_hash, loadable_modules.pool); if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { @@ -681,6 +697,11 @@ SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name) { return switch_core_hash_find(loadable_modules.chat_hash, name); +} + +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name) +{ + return switch_core_hash_find(loadable_modules.say_hash, name); } SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool_t *pool, const switch_codec_implementation_t **array, Modified: freeswitch/branches/knhor/trunk/src/switch_xml.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_xml.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_xml.c Fri Dec 22 00:27:56 2006 @@ -107,6 +107,7 @@ { "config", SWITCH_XML_SECTION_CONFIG}, { "directory", SWITCH_XML_SECTION_DIRECTORY}, { "dialplan", SWITCH_XML_SECTION_DIALPLAN}, + { "phrases", SWITCH_XML_SECTION_PHRASES}, { NULL, 0} };

1 0

[commit] r3782 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Dec '06

21 Dec '06

Author: mikej Date: Thu Dec 21 12:19:02 2006 New Revision: 3782 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: hand merge r3779 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 21 12:19:02 2006 @@ -912,9 +912,9 @@ switch_event_t *event; switch_mutex_lock(member->flag_mutex); - member->energy_level += 100; - if (member->energy_level > 1200) { - member->energy_level = 1200; + member->energy_level += 200; + if (member->energy_level > 3000) { + member->energy_level = 3000; } switch_mutex_unlock(member->flag_mutex);

1 0

[commit] r3776 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Dec '06

21 Dec '06

Author: knhor Date: Thu Dec 21 10:58:32 2006 New Revision: 3776 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix segfault Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 21 10:58:32 2006 @@ -2447,7 +2447,7 @@ void *val; char *d = ";"; int pretty = 0; - int argofs = (strcasecmp(argv[1],"list") == 0); // detect being called from chat vs. api + int argofs = (argc >= 2 && strcasecmp(argv[1],"list") == 0); // detect being called from chat vs. api if (argv[1+argofs]) { if (argv[2+argofs] && !strcasecmp(argv[1+argofs], "delim")) {

1 0

[commit] r3775 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Dec '06

21 Dec '06

Author: knhor Date: Thu Dec 21 02:29:01 2006 New Revision: 3775 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix list. restore commands cmd. add synonym help. move conf_api_main lookup sub-code into conf_api_dispatch. use conf_api_dispatch for the chat api. (i got busy coding....) add 'pretty' mode to list cmd. Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 21 02:29:01 2006 @@ -2088,6 +2088,36 @@ } } +static void conference_list_pretty(conference_obj_t *conference, switch_stream_handle_t *stream) +{ + if (conference != NULL && stream != NULL) { + conference_member_t *member = NULL; + + switch_mutex_lock(conference->member_mutex); +// stream->write_function(stream, "<pre>Current Callers:\n"); + + for (member = conference->members; member; member = member->next) { + switch_channel_t *channel; + switch_caller_profile_t *profile; + + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + channel = switch_core_session_get_channel(member->session); + profile = switch_channel_get_caller_profile(channel); + + + stream->write_function(stream, "%u) %s (%s)\n", + member->id, + profile->caller_id_name, + profile->caller_id_number + ); + + } + switch_mutex_unlock(conference->member_mutex); + } +} + static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim) { if (conference != NULL && stream != NULL && delim != NULL) { @@ -2103,6 +2133,7 @@ uint32_t count = 0; if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "continue\n"); continue; } @@ -2412,29 +2443,32 @@ { int syntax_err = 1; -// if (conference != NULL && stream != NULL) { - { - switch_hash_index_t *hi; - void *val; - char *d = ";"; + switch_hash_index_t *hi; + void *val; + char *d = ";"; + int pretty = 0; + int argofs = (strcasecmp(argv[1],"list") == 0); // detect being called from chat vs. api - if (argv[1]) { - if (argv[2] && !strcasecmp(argv[1], "delim")) { - d = argv[2]; + if (argv[1+argofs]) { + if (argv[2+argofs] && !strcasecmp(argv[1+argofs], "delim")) { + d = argv[2+argofs]; - if (*d == '"') { - if (++d) { - char *p; - if ((p = strchr(d, '"'))) { - *p = '\0'; - } - } else { - d = ";"; + if (*d == '"') { + if (++d) { + char *p; + if ((p = strchr(d, '"'))) { + *p = '\0'; } + } else { + d = ";"; } } + } else if (strcasecmp(argv[1+argofs], "pretty") == 0) { + pretty = 1; } + } + if (conference == NULL) { for (hi = switch_hash_first(globals.conference_pool, globals.conference_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; @@ -2443,12 +2477,22 @@ conference->name, conference->count, conference->count == 1 ? "" : ""); + if (pretty) { + conference_list_pretty(conference, stream); + } else { + conference_list(conference, stream, d); + } + } + } else { + if (pretty) { + conference_list_pretty(conference, stream); + } else { conference_list(conference, stream, d); } - - syntax_err = 0; } + syntax_err = 0; + return syntax_err; } @@ -2902,6 +2946,108 @@ #define CONFFUNCAPISIZE (sizeof(conf_api_sub_commands)/sizeof(conf_api_sub_commands[0])) +switch_status_t conf_api_dispatch(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv, char *cmdline, int argn) +{ switch_status_t status = SWITCH_STATUS_FALSE; + + if (conference != NULL) { + int i,found=0; + + /* loop through the command table to find a match */ + for (i=0; i<CONFFUNCAPISIZE && !found; i++) { + if (strcasecmp(argv[argn],conf_api_sub_commands[i].pname) == 0) { + found = 1; + switch(conf_api_sub_commands[i].fntype) { + + /* commands that we've broken the command line into arguments for */ + case CONF_API_SUB_ARGS_SPLIT: + { conf_api_args_cmd_t pfn = (conf_api_args_cmd_t)conf_api_sub_commands[i].pfnapicmd; + + if (pfn(conference, stream, argc, argv) != 0) { + /* command returned error, so show syntax usage */ + stream->write_function(stream,conf_api_sub_commands[i].psyntax); + } + } + break; + + /* member specific command that can be itteratted */ + case CONF_API_SUB_MEMBER_TARGET: + { + uint32_t id = atoi(argv[argn+1]); + int all = ( id == 0 && strcasecmp(argv[argn+1], "all") == 0 ); + int last = ( id == 0 && strcasecmp(argv[argn+1], "last") == 0 ); + + if(all) { + conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); + } else if (last) { + conference_member_t *member = NULL; + conference_member_t *last_member = NULL; + + switch_mutex_lock(conference->member_mutex); + + /* find last (oldest) member */ + member = conference->members; + while (member != NULL) { + if (last_member == NULL || member->id > last_member->id) { + last_member = member; + } + member = member->next; + } + + /* exec functio on last (oldest) member */ + if (last_member != NULL) { + conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; + pfn(last_member, stream, argv[argn+2]); + } + + switch_mutex_unlock(conference->member_mutex); + } else { + conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; + conference_member_t *member = conference_member_get(conference, id); + + if (member != NULL) { + pfn(conference_member_get(conference, id), stream, argv[argn+2]); + } else { + if (id == 0) { + stream->write_function(stream,conf_api_sub_commands[i].psyntax); + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + } + } + } + } + break; + + /* commands that deals with all text after command */ + case CONF_API_SUB_ARGS_AS_ONE: + { conf_api_text_cmd_t pfn = (conf_api_text_cmd_t)conf_api_sub_commands[i].pfnapicmd; + char *pstr = cmdline+strlen(conf_api_sub_commands[i].pname)+1; + + /* advance past all leading white space after command */ + while(*pstr == ' ' || *pstr == '\t') { + pstr++; + } + + /* call the command handler */ + if (pfn(conference, stream, pstr) != 0) { + /* command returned error, so show syntax usage */ + stream->write_function(stream,conf_api_sub_commands[i].psyntax); + } + } + break; + } + } + } + + if(!found) { + stream->write_function(stream, "Confernece command '%s' not found.\n", argv[argn]); + } else { + status = SWITCH_STATUS_SUCCESS; + } + } + + return status; +} + /* API Interface Function */ static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { @@ -2931,116 +3077,28 @@ /* try to find a command to execute */ if (argc) { - int i,found=0; - uint32_t cnum = atoi(argv[0]); - conference_obj_t *conference = (cnum != 0 ? (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]) : NULL); + conference_obj_t *conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]); - if(cnum == 0 || (cnum != 0 && conference != NULL && argc >= 3)) { - int argn = (cnum != 0 ? 1 : 0); - - /* loop through the command table to find a match */ - for (i=0; i<CONFFUNCAPISIZE && !found; i++) { - if (strcasecmp(argv[argn],conf_api_sub_commands[i].pname) == 0) { - found = 1; - switch(conf_api_sub_commands[i].fntype) { - - /* commands that we've broken the command line into arguments for */ - case CONF_API_SUB_ARGS_SPLIT: - { conf_api_args_cmd_t pfn = (conf_api_args_cmd_t)conf_api_sub_commands[i].pfnapicmd; - - if (pfn(conference, stream, argc, &argv[0]) != 0) { - /* command returned error, so show syntax usage */ - stream->write_function(stream,conf_api_sub_commands[i].psyntax); - } - } - break; - - /* member specific command that can be itteratted */ - case CONF_API_SUB_MEMBER_TARGET: - if (conference != NULL) { - uint32_t id = atoi(argv[argn+1]); - int all = ( id == 0 && strcasecmp(argv[argn+1], "all") == 0 ); - int last = ( id == 0 && strcasecmp(argv[argn+1], "last") == 0 ); - - if(all) { - conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); - } else if (last) { - conference_member_t *member = NULL; - conference_member_t *last_member = NULL; - - switch_mutex_lock(conference->member_mutex); - - /* find last (oldest) member */ - member = conference->members; - while (member != NULL) { - if (last_member == NULL || member->id > last_member->id) { - last_member = member; - } - member = member->next; - } - - /* exec functio on last (oldest) member */ - if (last_member != NULL) { - conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; - pfn(last_member, stream, argv[argn+2]); - } - - switch_mutex_unlock(conference->member_mutex); - } else { - conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; - conference_member_t *member = conference_member_get(conference, id); - - if (member != NULL) { - pfn(conference_member_get(conference, id), stream, argv[argn+2]); - } else { - if (id == 0) { - stream->write_function(stream,conf_api_sub_commands[i].psyntax); - } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); - } - } - } - } else { - stream->write_function(stream, "Conference %s not found\n", argv[0]); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); - } - break; - - /* commands that deals with all text after command */ - case CONF_API_SUB_ARGS_AS_ONE: - { conf_api_text_cmd_t pfn = (conf_api_text_cmd_t)conf_api_sub_commands[i].pfnapicmd; - char *pstr = lbuf+strlen(conf_api_sub_commands[i].pname)+1; - - /* advance past all leading white space after command */ - while(*pstr == ' ' || *pstr == '\t') { - pstr++; - } - - /* call the command handler */ - if (pfn(conference, stream, pstr) != 0) { - /* command returned error, so show syntax usage */ - stream->write_function(stream,conf_api_sub_commands[i].psyntax); - } - } - break; - } - } + if(conference != NULL) { + if (argc >= 2) { + status = conf_api_dispatch(conference, stream, argc, argv, lbuf, 1); + } else { + stream->write_function(stream,"Conference command, not specified.\nTry 'help'\n"); } - - /* no command found */ - if(!found) { - stream->write_function(stream, "Confernece command '%s' not found.\nTry 'help conference'\n", argv[argn]); - } } else { - if (argc < 3) { - stream->write_function(stream,"Conference argument required\n"); + /* special case the list command, because it doesn't require a conference argument */ + if (strcasecmp(argv[0],"list") == 0) { + conf_api_sub_list(NULL, stream, argc, argv); + } else if (strcasecmp(argv[0],"help") == 0 || strcasecmp(argv[0],"commands") == 0) { + stream->write_function(stream, "%s\n", conf_api_interface.syntax); } else { - stream->write_function(stream,"No Conference called %s found.\n",argv[0]); + stream->write_function(stream, "Conference %s not found\n", argv[0]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); } } } else { - stream->write_function(stream, "Command not specified.\nTry 'help conference'\n"); + stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n"); } } @@ -3640,36 +3698,9 @@ /*.next */ }; -static void chat_list_pretty(conference_obj_t *conference, switch_stream_handle_t *stream) -{ - conference_member_t *member = NULL; - - switch_mutex_lock(conference->member_mutex); - stream->write_function(stream, "<pre>Current Callers:\n"); - - for (member = conference->members; member; member = member->next) { - switch_channel_t *channel; - switch_caller_profile_t *profile; - - if (switch_test_flag(member, MFLAG_NOCHANNEL)) { - continue; - } - channel = switch_core_session_get_channel(member->session); - profile = switch_channel_get_caller_profile(channel); - - - stream->write_function(stream, "*) %s (%s)\n", - profile->caller_id_name, - profile->caller_id_number - ); - - } - switch_mutex_unlock(conference->member_mutex); -} - static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) { - char name[512] = "", *p; + char name[512] = "", *p, *lbuf; switch_chat_interface_t *ci; conference_obj_t *conference = NULL; switch_stream_handle_t stream = {0}; @@ -3694,22 +3725,39 @@ } if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, name))) { - ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Sorry, We're Closed", NULL); + ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL); return SWITCH_STATUS_FALSE; } SWITCH_STANDARD_STREAM(stream); - if (strstr(body, "list")) { - chat_list_pretty(conference, &stream); - } else { - stream.write_function(&stream, "The only command we have so far is 'list'.\nGet coding or go press PayPal!!\n"); + if (body != NULL && (lbuf = strdup(body))) { + int argc; + char *argv[25]; + + memset(argv,0,sizeof(argv)); + argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + /* try to find a command to execute */ + if (argc) { + /* special case list */ + if (strcasecmp(argv[0],"list") == 0) { + conference_list_pretty(conference, &stream); + /* provide help */ + } else if (strcasecmp(argv[0],"help") == 0 || strcasecmp(argv[0],"commands") == 0) { + stream.write_function(&stream, "%s\n", conf_api_interface.syntax); + /* find a normal command */ + } else { + conf_api_dispatch(conference, &stream, argc, argv, lbuf, 0); + } + } else { + stream.write_function(&stream, "No parameters specified.\nTry 'help'\n"); + } } + switch_safe_free(lbuf); ci->chat_send(CONF_CHAT_PROTO, to, from, "", stream.data, NULL); switch_safe_free(stream.data); - - return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3757 - freeswitch/branches/igorneves/scripts/socket
by Freeswitch SVN 20 Dec '06

20 Dec '06

Author: igorneves Date: Wed Dec 20 12:30:25 2006 New Revision: 3757 Modified: freeswitch/branches/igorneves/scripts/socket/fsconsole.c Log: new version, dont know the changes yet Modified: freeswitch/branches/igorneves/scripts/socket/fsconsole.c ============================================================================== --- freeswitch/branches/igorneves/scripts/socket/fsconsole.c (original) +++ freeswitch/branches/igorneves/scripts/socket/fsconsole.c Wed Dec 20 12:30:25 2006 @@ -6,301 +6,491 @@ #include <fcntl.h> #include <stdio.h> #include <string.h> + +#ifdef WIN32 +#include <winsock2.h> +#else +#define closesocket close +#endif + +#ifdef _MSC_VER +#include <io.h> +#define write _write +#else #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> +#include <sys/errno.h> #include <unistd.h> +#endif -#define buflen 38 + +#define buflen 4096 #define NUL '\0' -char *app = "freeswitch"; -char *version = "0.1"; -char *hostname = "127.0.0.1"; +char *app = "fsconsole"; + +/* Defaults according to current (12-06-06) freeswitch.xml */ +char *hostname = "localhost"; char *secret = "ClueCon"; -unsigned int port = 8021; +u_short port = 8021; -char *intro = "Welcome to FreeSWITCH Console.\n\n"; +/* Debug Level */ +int debug = 0; +char *intro = "Welcome to the FreeSWITCH Console.\n"; + char buffer[buflen], *command; -int sd, flag, prompt; +#ifdef WIN32 +SOCKET sd; +#else +int sd; +#endif +int flag, prompt, display; char *trim(char *str); void print_tokens(char *line); -int fs_switch_read(); -// Debug level -int debug = 3; +#ifdef WIN32 +typedef SOCKET socket_t; +#else +typedef int socket_t; +#endif + +typedef enum { + STATUS_SUCCESS +} status_t; + +static int socket_set_nonblock(socket_t sd) +{ +#ifdef WIN32 + u_long argp = 1; + if (ioctlsocket(sd, FIONBIO, &argp) == SOCKET_ERROR) { + return ((WSAGetLastError() == 0) ? STATUS_SUCCESS : WSAGetLastError()); + } +#else + flag = fcntl(sd, F_GETFL, 0); + flag |= O_NONBLOCK; + if (fcntl(sd, F_SETFL, flag) == -1) { + return errno; + } +#endif + return STATUS_SUCCESS; +} + +unsigned long getaddr(char *host_name) +{ + struct hostent *host; + unsigned long addr = 0; + struct in_addr address; + + if (isalpha(host_name[0])) { /* host address is a name */ + host = gethostbyname(host_name); + if(!host) { + return 0; + } else { + address = *(struct in_addr*)host->h_addr_list[0]; + addr = address.s_addr; + } + } + else { + addr = inet_addr(host_name); + } + + return addr; +} + int main(int argc, char *argv[]) { - if (argv[1] == "--help") { - fprintf(stderr,"usage %s hostname port\n", argv[0]); - exit(0); - } - /* Hostname and Port defined on command line */ - if (argc > 1) { - strncpy(hostname, argv[1], sizeof(hostname)); - hostname = argv[1]; - port = atoi(argv[2]); - } + int len; + char contents[4096]; - sd = socket(AF_INET, SOCK_STREAM, 0); /* init socket descriptor */ - struct sockaddr_in sin; - struct hostent *host = gethostbyname(hostname); + char whitespace[] = "\r"; + char *token, *token_split, *subtoken_split; + char token_key[32], token_val[32], token_contents[4096], subtoken_contents[4096]; + char subtoken_key[32], subtoken_val[32]; - //char buffer[buflen]; - int len; - char *p; - char cmd[38]; - int i, n, out; + struct sockaddr_in sin = {0}; - /*** PLACE DATA IN sockaddr_in struct ***/ - memcpy(&sin.sin_addr.s_addr, host->h_addr, host->h_length); - sin.sin_family = AF_INET; - sin.sin_port = htons(port); + char cmd[256]; - /*** CONNECT SOCKET TO THE SERVICE DESCRIBED BY sockaddr_in struct ***/ - if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) < 0) - { - perror("connecting"); - exit(1); - } + if (argv[1] && !strcmp(argv[1], "--help")) { + fprintf(stderr,"usage %s hostname port secret\n", argv[0]); + exit(0); + } - flag = fcntl(sd, F_GETFL, 0); - flag |= O_NONBLOCK; - fcntl(sd, F_SETFL, flag); + /* Hostname, Port and Secret defined on command line */ + if (argc > 1) { + hostname = argv[1]; + } else if (argc > 2) { + port = (u_short)atoi(argv[2]); + } else if (argc > 3) { + secret = argv[3]; + } - printf(intro); + /* Init socket descriptor */ + sd = socket(AF_INET, SOCK_STREAM, 0); - /* Setup the prompt */ - prompt = 1; + /* Put Data intoN sockaddr_in struct */ + sin.sin_family = AF_INET; + sin.sin_port = htons(port); + sin.sin_addr.s_addr = getaddr(hostname); - while(1) + /* Connect Socket */ + if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) < 0) + { + perror("connecting"); + exit(1); + } + + /* Set Socket Descriptor to Non-Blocking */ + socket_set_nonblock(sd); + + /* Set the prompt to non-blocking */ + socket_set_nonblock(0); + + /* Print the Introduction */ + printf(intro); + + /* First Prompt = No, would show before authentication.... */ + prompt = 0; + + /* While Program is Running... */ + for(;;) { + /* If Authenticated -- print the current version */ + if (command) + { + if(!strcmp(command,"authenticated")) + { + /* Print the version */ + printf("\nRunning Version:\n"); + sprintf(buffer, "api version\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + /* Authentication Complete -- set current command to blank */ + command = ""; + } + } + /* Prompt */ if (prompt) { - printf("%s %s> ", app, version); + printf("\n%s@%s> ", app, hostname); prompt = 0; } + memset(contents, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer)); memset(cmd, 0, sizeof(cmd)); - /* Setup the first read */ - fs_switch_read(sd, buffer); + len = atoi(buffer); + if (len <= 0) len += buflen; + len = recv(sd, buffer, len, 0); + + if (len > 0) + { + if (debug > 1) + printf("Received a response: len %d.\n", len); - flag = fcntl(0, F_GETFL, 0); - flag |= O_NONBLOCK; - fcntl(0, F_SETFL, flag); + if (debug > 2) + display = 1; - fgets(cmd, 36, stdin); - cmd[strlen(cmd) - 1] = 0; + memset(contents, 0, sizeof(contents)); + strncpy(contents, buffer, len); - if (!strcmp(cmd, "exit")) { - printf("Exiting.. goodbye\n"); - exit(0); - } + /* Print Incoming input to screen if debug enabled or display is set */ + if (debug > 0 || display == 1) + { + write(1,contents,len); - if (!strcmp(cmd, "version")) { - printf("Version %s\n", version); - prompt = 1; - } - - if (!strcmp(cmd, "\n")) { - prompt = 1; - } + /* If not debugging, Prevent Display of Response */ + if (debug < 2) + display = 0; - if (fs_switch_read() > 0) { - // Do nothing - } else { - // Sleep - sleep(1); - } - } + /* Response received -- Set the prompt */ + prompt = 1; - close(sd); -} + } + /* print_tokens(contents); */ + for (token=strtok(contents,whitespace); token !=NULL; token=strtok(NULL,whitespace)) + { -int fs_switch_read() - { + /* Multiline requires \r, set back to \r + to properly execute the display of responses! UNF */ + strcpy(whitespace, "\r"); - int len; - char buf[4096], reply[4096], tmp[255], contents[4096]; + sprintf(token_contents, "%s", token); + + token_split = strtok(token_contents, ":"); + sprintf(token_key, "%s", token_split); + token_split = strtok(NULL, "\n"); + sprintf(token_val, "%s", token_split); + token_split = strtok(NULL, "\n"); - char content[32]; - char content_type[32]; - char content_following[32]; - char content_after[32]; - char junk[32]; + token = strtok(NULL, "\n\n"); - len = atoi(tmp); - if (len <= 0) len += 255; - len = recv(sd, buffer, len, 0); - - if (len > 0) - { - memset(contents, 0, sizeof(contents)); - strncpy(contents, buffer, len); + trim(token_val); - // Print Incoming input to screen - if (debug > 0) - write(1,contents,len); + if (debug > 2) + printf("\nkey: '%s', val: '%s'\n", token_key, token_val); - char whitespace[] = "\r"; - char *token, *token_split, *subtoken_split; - char token_key[32], token_val[32], token_contents[4096], subtoken_contents[4096]; - char subtoken_key[32], subtoken_val[32]; + if (strcmp(token_key, "Content-Type") == 0) + { + display = 1; - //print_tokens(contents); + if (strcmp(token_val, "auth/request") == 0) + { - for (token=strtok(contents,whitespace); token !=NULL; token=strtok(NULL,whitespace)) - { + printf("\nAuthenticating...\n"); + + command = "auth"; + sprintf(buffer, "auth %s\n\n", secret); + write((int)sd, buffer, (unsigned int)strlen(buffer)); - //printf("Next token is %s\n", token); + /* If not debugging, Prevent Display of Response */ + if (debug < 2) + display = 0; - sprintf(token_contents, "%s", token); + } else if (strcmp(token_val, "command/reply") == 0) { - token_split = strtok(token_contents, ":"); - sprintf(token_key, "%s", token_split); - token_split = strtok(NULL, "\n"); - sprintf(token_val, "%s", token_split); - token_split = strtok(NULL, "\n"); + /* Parse the reply */ + sprintf(subtoken_contents, "%s", token_split); + + subtoken_split = strtok(subtoken_contents, ":"); + sprintf(subtoken_key, "%s", subtoken_split); + subtoken_split = strtok(NULL, "\n"); + sprintf(subtoken_val, "%s", subtoken_split); + subtoken_split = strtok(NULL, "\n"); - token = strtok(NULL, "\n\n"); + trim(subtoken_val); - trim(token_val); + if (debug > 2) + printf("subkey: '%s', subval: '%s'\n", subtoken_key, subtoken_val); - if (debug > 1) - printf("\nkey: '%s', val: '%s'\n", token_key, token_val); + if (strcmp(subtoken_key, "Reply-Text") == 0) + { + if (strcmp(subtoken_val, "+OK accepted") == 0) + { + if (strcmp(command, "auth") == 0) + { + printf("Authentication Successful\n"); + command = "authenticated"; + /* Auth Command received -- Prompt and Display handled elsewhere */ + prompt = 0; + display = 0; - if (strcmp(token_key, "Content-Type") == 0) - { + /* Authentication required a \r, set back to \n + to properly execute the display of responses! */ + strcpy(whitespace, "\n"); - if (strcmp(token_val, "auth/request") == 0) - { - printf("\nAuthenticating...\n"); - - command = "auth"; - sprintf(buf, "auth %s\n\n", secret); - write(sd, buf, strlen(buf)); + } + } else if (strncmp(subtoken_val, "-", 1) == 0) { + /* Received an error, print */ - } else if (strcmp(token_val, "command/reply") == 0) { + printf("\n%s\n", subtoken_val); + /* Since we received a response, set the prompt */ + prompt = 1; - /* Parse the reply */ - sprintf(subtoken_contents, "%s", token_split); - - subtoken_split = strtok(subtoken_contents, ":"); - sprintf(subtoken_key, "%s", subtoken_split); - subtoken_split = strtok(NULL, "\n"); - sprintf(subtoken_val, "%s", subtoken_split); - subtoken_split = strtok(NULL, "\n"); + } else if (strncmp(subtoken_val, "+", 1) == 0) { + /* Received an uncoded OK, print */ - trim(subtoken_val); + printf("\n%s\n", subtoken_val); + /* Since we received a response, set the prompt */ + prompt = 1; - if (debug > 1) - printf("subkey: '%s', subval: '%s'\n", subtoken_key, subtoken_val); - - if (strcmp(subtoken_key, "Reply-Text") == 0) - { - if (strcmp(subtoken_val, "+OK accepted") == 0) - { - if (strcmp(command, "auth") == 0) - { - printf("\nAuthentication Successful\n"); - command = ""; + } + + /* || "ts" is a hack -- why? */ + } else if (strcmp(subtoken_key, "") == 0 || strcmp(subtoken_key, "ts") == 0) { + printf("\n%s\n", subtoken_val); + /* Since we received a response, set the prompt */ + prompt = 1; + } + + } else if (strcmp(token_val, "api/response") == 0) { + + /* Since we received an api response, display results */ + if (command && strcmp(command,"authenticated")) + { + display = 1; + } + } - } + } + } } - } + /* Get the command */ + fgets(cmd, 254, stdin); - } - /* Set the prompt */ - prompt = 1; + /* Received a Command */ + if (strlen(cmd)) + { - return 1; - } else { - return 0; - } - -} + /* Received an Enter Only - Reset Prompt*/ + if (strcmp(cmd, "\n") == 0) { + prompt = 1; + } + /* Drop the \n */ + cmd[strlen(cmd) - 1] = 0; -void print_tokens(char *line) -{ - char whitespace[] = "\n"; - char *token; - - for (token=strtok(line,whitespace); token !=NULL; token=strtok(NULL,whitespace)) - { - printf("Next token is %s\n", token); + /* If not debugging, Prevent Display of Response */ + if (debug < 2) + display = 0; + + if (strcmp(cmd, "exit") == 0 || strcmp(cmd, "quit") == 0) { + printf("Exiting.. goodbye.\n"); + break; + } else if (strncmp(cmd, "event", 5) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strcmp(cmd, "noevents") == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strncmp(cmd, "log", 3) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strcmp(cmd, "nolog") == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strncmp(cmd, "api", 3) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strncmp(cmd, "bgapi", 5) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strncmp(cmd, "sendevent", 9) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strncmp(cmd, "sendmsg", 7) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + sprintf(buffer, "%s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else if (strncmp(cmd, "help", 4) == 0 || strncmp(cmd, "?", 1) == 0) { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + printf("\n- Console -\n"); + printf("Valid Commands:\n\n"); + printf("event [xml|plain] <list of events to log or all for all> - enable or disable events by class or all\n"); + printf("noevents - disable all events that were previously enabled w/ event\n"); + printf("nixevent <some_event> - command to allow 'events all' followed by 'nixevent <some_event>' to do all but <some_event>\n"); + printf("log <level> - enable log output. Levels same as the console.conf values\n"); + printf("nolog - disable log output previously enabled by the log command\n"); + printf("api <command> <arg> - send an api command (blocking mode)\n"); + printf("bgapi <command> <arg> - send an api command (non-blocking mode) this will let you execute a job in the background\n"); + printf("sendevent <event-name> - send an event into the event system (multi line input for headers)\n"); + printf("exit - close the fsconsole\n"); + + printf("\n- API - "); + + /* Print the additional api commands available from console... */ + sprintf(buffer, "api help\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + } else { + if (debug > 2) + printf("Received Command: %s\n", cmd); + + + sprintf(buffer, "api %s\n\n", cmd); + write((int)sd, buffer, (unsigned int)strlen(buffer)); + + printf("\n"); + + } + + } + + /* 100% CPU fix */ + usleep(1); + } + + closesocket(sd); } - char *trim(char *str) { - char *ibuf = str, *obuf = str; - int i = 0, cnt = 0; + char *ibuf = str, *obuf = str; + int i = 0, cnt = 0; - /* - ** Trap NULL - */ + /* + ** Trap NULL + */ - if (str) - { - /* - ** Remove leading spaces (from RMLEAD.C) - */ + if (str) + { + /* Remove leading spaces */ + for (ibuf = str; *ibuf && isspace(*ibuf); ++ibuf) + ; + if (str != ibuf) + memmove(str, ibuf, ibuf - str); - for (ibuf = str; *ibuf && isspace(*ibuf); ++ibuf) - ; - if (str != ibuf) - memmove(str, ibuf, ibuf - str); + /* Collapse embedded spaces */ - /* - ** Collapse embedded spaces (from LV1WS.C) - */ + while (*ibuf) + { + if (isspace(*ibuf) && cnt) { + ibuf++; + } else { - while (*ibuf) - { - if (isspace(*ibuf) && cnt) - ibuf++; - else - { - if (!isspace(*ibuf)) - cnt = 0; - else - { - *ibuf = ' '; - cnt = 1; - } - obuf[i++] = *ibuf++; - } - } - obuf[i] = NUL; + if (!isspace(*ibuf)) { + cnt = 0; + } else { + *ibuf = ' '; + cnt = 1; + } - /* - ** Remove trailing spaces (from RMTRAIL.C) - */ + obuf[i++] = *ibuf++; + } + } - while (--i >= 0) - { - if (!isspace(obuf[i])) - break; - } - obuf[++i] = NUL; - } - return str; + obuf[i] = NUL; + + /* Remove trailing spaces */ + while (--i >= 0) + { + if (!isspace(obuf[i])) + break; + } + + obuf[++i] = NUL; + } + + return str; + }

1 0

[commit] r3750 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 20 Dec '06

20 Dec '06

Author: knhor Date: Tue Dec 19 22:12:48 2006 New Revision: 3750 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: hand merge 3705 and 3742 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Dec 19 22:12:48 2006 @@ -2274,6 +2274,7 @@ switch_clear_flag(member, MFLAG_RUNNING); switch_set_flag(member, MFLAG_KICKED); switch_mutex_unlock(member->flag_mutex); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); if(stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); @@ -2438,7 +2439,10 @@ switch_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; - stream->write_function(stream, "Conference %s (%u members)\n", conference->name, conference->count); + stream->write_function(stream, "Conference %s (%u member%s)\n", + conference->name, + conference->count, + conference->count == 1 ? "" : ""); conference_list(conference, stream, d); }

1 0

[commit] r3748 - in freeswitch/branches/knhor/trunk: . build build/config libs/apr libs/apr-iconv-1.1.1 libs/apr-iconv-1.1.1/autom4te.cache libs/apr-iconv-1.1.1/build libs/apr-iconv-1.1.1/ccs libs/apr-iconv-1.1.1/ces libs/apr-iconv-1.1.1/docs libs/apr-iconv-1.1.1/include libs/apr-iconv-1.1.1/lib libs/apr-iconv-1.1.1/util libs/apr-util libs/apr-util/buckets libs/apr-util/build libs/apr-util/build/pkg libs/apr-util/build/rpm libs/apr-util/crypto libs/apr-util/dbd libs/apr-util/dbm libs/a
by Freeswitch SVN 20 Dec '06

20 Dec '06

Author: knhor Date: Tue Dec 19 22:00:59 2006 New Revision: 3748 Added: freeswitch/branches/knhor/trunk/acsite.m4 - copied unchanged from r3743, /freeswitch/trunk/acsite.m4 freeswitch/branches/knhor/trunk/libs/apr/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/AUTHORS - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/AUTHORS freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/CHANGES - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/CHANGES freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/COPYING - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/COPYING freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/LICENSE - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/LICENSE freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/NOTICE - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/NOTICE freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/README - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/README freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/apriconv.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/apriconv.dsp freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/autom4te.cache/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/autom4te.cache/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/autom4te.cache/output.0 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/autom4te.cache/output.0 freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/autom4te.cache/requests - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/autom4te.cache/requests freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/autom4te.cache/traces.0 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/autom4te.cache/traces.0 freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/BaseAddr.ref - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/BaseAddr.ref freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/apr-iconv.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/apr-iconv.m4 freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/apr_common.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/apr_common.m4 freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/config.guess freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/config.sub freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/find_apr.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/find_apr.m4 freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/gen_aliases.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/gen_aliases.awk freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/install.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/install.sh freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/make_exports.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/make_exports.awk freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/make_var_export.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/make_var_export.awk freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/mkdir.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/mkdir.sh freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/build/modules.mk.win - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/build/modules.mk.win freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/buildconf - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/buildconf freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/Makefile.win - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/Makefile.win freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/adobe-stdenc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/adobe-stdenc.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/adobe-symbol.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/adobe-symbol.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/adobe-zdingbats.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/adobe-zdingbats.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/apriconv_ccs_modules.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/apriconv_ccs_modules.dsp freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/big5.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/big5.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/charset.aliases - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/charset.aliases freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cns11643-plane1.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cns11643-plane1.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cns11643-plane14.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cns11643-plane14.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cns11643-plane2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cns11643-plane2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp037.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp037.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp038.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp038.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp10000.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp10000.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp10006.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp10006.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp10007.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp10007.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp10029.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp10029.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp1006.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp1006.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp10079.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp10079.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp10081.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp10081.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp1026.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp1026.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp273.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp273.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp274.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp274.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp275.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp275.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp277.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp277.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp278.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp278.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp280.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp280.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp281.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp281.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp284.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp284.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp285.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp285.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp290.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp290.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp297.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp297.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp420.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp420.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp423.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp423.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp424.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp424.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp437.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp437.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp500.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp500.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp737.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp737.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp775.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp775.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp850.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp850.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp851.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp851.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp852.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp852.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp855.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp855.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp856.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp856.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp857.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp857.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp860.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp860.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp861.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp861.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp862.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp862.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp863.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp863.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp864.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp864.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp865.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp865.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp866.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp866.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp868.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp868.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp869.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp869.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp870.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp870.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp871.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp871.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp874.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp874.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp875.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp875.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp880.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp880.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp891.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp891.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp903.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp903.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp904.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp904.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp905.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp905.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp918.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp918.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp932.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp932.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp936.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp936.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp949.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp949.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/cp950.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/cp950.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/dec-mcs.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/dec-mcs.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-at-de-a.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-at-de-a.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-at-de.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-at-de.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-ca-fr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-ca-fr.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-dk-no-a.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-dk-no-a.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-dk-no.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-dk-no.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-es-a.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-es-a.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-es-s.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-es-s.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-es.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-es.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-fi-se-a.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-fi-se-a.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-fi-se.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-fi-se.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-fr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-fr.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-it.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-it.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-pt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-pt.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-uk.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-uk.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-us.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ebcdic-us.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/gb12345.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/gb12345.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/gb_2312-80.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/gb_2312-80.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/hp-roman8.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/hp-roman8.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-1.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-1.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-10.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-10.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-13.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-13.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-14.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-14.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-15.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-15.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-3.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-3.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-4.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-4.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-5.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-5.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-6.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-6.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-7.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-7.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-8.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-8.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-9.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-8859-9.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-10.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-10.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-102.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-102.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-103.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-103.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-11.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-11.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-111.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-111.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-121.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-121.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-122.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-122.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-123.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-123.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-128.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-128.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-13.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-13.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-139.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-139.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-14.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-14.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-141.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-141.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-142.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-142.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-143.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-143.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-146.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-146.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-147.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-147.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-15.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-15.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-150.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-150.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-151.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-151.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-152.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-152.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-153.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-153.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-154.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-154.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-155.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-155.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-158.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-158.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-16.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-16.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-17.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-17.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-18.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-18.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-19.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-19.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-21.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-21.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-25.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-25.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-27.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-27.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-37.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-37.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-4.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-4.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-47.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-47.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-49.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-49.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-50.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-50.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-51.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-51.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-54.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-54.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-55.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-55.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-57.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-57.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-60.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-60.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-61.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-61.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-69.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-69.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-70.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-70.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-8-1.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-8-1.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-8-2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-8-2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-84.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-84.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-85.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-85.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-86.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-86.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-88.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-88.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-89.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-89.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-9-1.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-9-1.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-9-2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-9-2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-90.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-90.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-91.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-91.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-92.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-92.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-93.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-93.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-94.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-94.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-95.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-95.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-96.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-96.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-98.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-98.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-99.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso-ir-99.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso646-dk.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso646-dk.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/iso646-kr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/iso646-kr.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/jis_x0201.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/jis_x0201.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/jis_x0208-1983.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/jis_x0208-1983.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/jis_x0212-1990.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/jis_x0212-1990.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/johab.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/johab.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/koi8-r.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/koi8-r.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/koi8-ru.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/koi8-ru.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/koi8-u.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/koi8-u.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/ksx1001.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/ksx1001.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/libapriconv_ccs_modules.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/libapriconv_ccs_modules.dsp freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-ce.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-ce.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-croatian.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-croatian.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-cyrillic.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-cyrillic.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-dingbats.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-dingbats.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-greek.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-greek.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-iceland.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-iceland.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-japan.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-japan.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-roman.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-roman.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-romania.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-romania.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-thai.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-thai.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-turkish.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-turkish.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/mac-ukraine.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/mac-ukraine.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/macintosh.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/macintosh.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/osd_ebcdic_df04_1.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/osd_ebcdic_df04_1.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/osd_ebcdic_df04_15.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/osd_ebcdic_df04_15.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/shift_jis.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/shift_jis.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/us-ascii.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/us-ascii.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1250.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1250.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1251.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1251.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1252.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1252.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1253.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1253.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1254.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1254.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1255.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1255.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1256.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1256.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1257.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1257.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ccs/windows-1258.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ccs/windows-1258.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/Makefile.win - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/Makefile.win freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/_tbl_simple.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/_tbl_simple.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/apriconv_ces_modules.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/apriconv_ces_modules.dsp freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/charset.aliases - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/charset.aliases freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/euc-jp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/euc-jp.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/euc-kr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/euc-kr.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/euc-tw.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/euc-tw.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/gb2312.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/gb2312.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/iso-10646-ucs-2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/iso-10646-ucs-2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/iso-10646-ucs-4.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/iso-10646-ucs-4.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-cn.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-cn.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-jp-2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-jp-2.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-jp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-jp.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-kr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/iso-2022-kr.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/libapriconv_ces_modules.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/libapriconv_ces_modules.dsp freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/ucs2-internal.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/ucs2-internal.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/ucs4-internal.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/ucs4-internal.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/unicode-1-1-utf-7.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/unicode-1-1-utf-7.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/utf-16.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/utf-16.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/ces/utf-8.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/ces/utf-8.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/configure - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/configure freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/configure.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/configure.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/docs/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/docs/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/docs/doxygen.conf - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/docs/doxygen.conf freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/include/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/include/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/include/api_version.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/include/api_version.h freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/include/apr_iconv.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/include/apr_iconv.h freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/api_version.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/api_version.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/apr_iconv_private.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/apr_iconv_private.h.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/charset_alias.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/charset_alias.h freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv.h freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_ccs.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_ccs.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_ces.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_ces.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_ces_euc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_ces_euc.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_ces_iso2022.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_ces_iso2022.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_int.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_int.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_module.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_module.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/lib/iconv_uc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/lib/iconv_uc.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/libapriconv.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/libapriconv.dsp freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/libapriconv.rc - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/libapriconv.rc freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/util/ - copied from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/util/ freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/util/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/util/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/util/iconv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/util/iconv.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/util/iconv_stream.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/util/iconv_stream.c freeswitch/branches/knhor/trunk/libs/apr-iconv-1.1.1/util/iconv_stream.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-iconv-1.1.1/util/iconv_stream.h freeswitch/branches/knhor/trunk/libs/apr-util/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/ freeswitch/branches/knhor/trunk/libs/apr-util/CHANGES - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/CHANGES freeswitch/branches/knhor/trunk/libs/apr-util/INSTALL.MySQL - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/INSTALL.MySQL freeswitch/branches/knhor/trunk/libs/apr-util/LICENSE - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/LICENSE freeswitch/branches/knhor/trunk/libs/apr-util/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-util/NOTICE - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/NOTICE freeswitch/branches/knhor/trunk/libs/apr-util/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr-util/apr-util.pc.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/apr-util.pc.in freeswitch/branches/knhor/trunk/libs/apr-util/apr-util.spec - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/apr-util.spec freeswitch/branches/knhor/trunk/libs/apr-util/aprutil.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/aprutil.dsp freeswitch/branches/knhor/trunk/libs/apr-util/aprutil.dsw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/aprutil.dsw freeswitch/branches/knhor/trunk/libs/apr-util/apu-config.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/apu-config.in freeswitch/branches/knhor/trunk/libs/apr-util/buckets/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/buckets/ freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_brigade.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_brigade.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_alloc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_alloc.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_eos.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_eos.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_file.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_file.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_flush.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_flush.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_heap.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_heap.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_mmap.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_mmap.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_pipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_pipe.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_pool.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_pool.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_refcount.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_refcount.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_simple.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_simple.c freeswitch/branches/knhor/trunk/libs/apr-util/buckets/apr_buckets_socket.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buckets/apr_buckets_socket.c freeswitch/branches/knhor/trunk/libs/apr-util/build/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/build/ freeswitch/branches/knhor/trunk/libs/apr-util/build-outputs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build-outputs.mk freeswitch/branches/knhor/trunk/libs/apr-util/build.conf - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build.conf freeswitch/branches/knhor/trunk/libs/apr-util/build/apr_common.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/apr_common.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/apu-conf.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/apu-conf.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/apu-hints.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/apu-hints.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/apu-iconv.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/apu-iconv.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/config.guess freeswitch/branches/knhor/trunk/libs/apr-util/build/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/config.sub freeswitch/branches/knhor/trunk/libs/apr-util/build/dbd.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/dbd.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/dbm.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/dbm.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/find_apr.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/find_apr.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/find_apu.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/find_apu.m4 freeswitch/branches/knhor/trunk/libs/apr-util/build/get-version.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/get-version.sh freeswitch/branches/knhor/trunk/libs/apr-util/build/install.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/install.sh freeswitch/branches/knhor/trunk/libs/apr-util/build/mkdir.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/mkdir.sh freeswitch/branches/knhor/trunk/libs/apr-util/build/pkg/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/build/pkg/ freeswitch/branches/knhor/trunk/libs/apr-util/build/pkg/README - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/pkg/README freeswitch/branches/knhor/trunk/libs/apr-util/build/pkg/buildpkg.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/pkg/buildpkg.sh freeswitch/branches/knhor/trunk/libs/apr-util/build/pkg/pkginfo.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/pkg/pkginfo.in freeswitch/branches/knhor/trunk/libs/apr-util/build/rpm/ - copied from r3743, /freeswitch/trunk/libs/apr-util/build/rpm/ freeswitch/branches/knhor/trunk/libs/apr-util/build/rpm/apr-util.spec.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/rpm/apr-util.spec.in freeswitch/branches/knhor/trunk/libs/apr-util/build/w32locatedb.pl - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/build/w32locatedb.pl freeswitch/branches/knhor/trunk/libs/apr-util/buildconf - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/buildconf freeswitch/branches/knhor/trunk/libs/apr-util/config.layout - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/config.layout freeswitch/branches/knhor/trunk/libs/apr-util/configure - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/configure freeswitch/branches/knhor/trunk/libs/apr-util/configure.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/configure.in freeswitch/branches/knhor/trunk/libs/apr-util/crypto/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/crypto/ freeswitch/branches/knhor/trunk/libs/apr-util/crypto/apr_md4.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/crypto/apr_md4.c freeswitch/branches/knhor/trunk/libs/apr-util/crypto/apr_md5.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/crypto/apr_md5.c freeswitch/branches/knhor/trunk/libs/apr-util/crypto/apr_sha1.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/crypto/apr_sha1.c freeswitch/branches/knhor/trunk/libs/apr-util/crypto/getuuid.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/crypto/getuuid.c freeswitch/branches/knhor/trunk/libs/apr-util/crypto/uuid.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/crypto/uuid.c freeswitch/branches/knhor/trunk/libs/apr-util/dbd/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/dbd/ freeswitch/branches/knhor/trunk/libs/apr-util/dbd/apr_dbd.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbd/apr_dbd.c freeswitch/branches/knhor/trunk/libs/apr-util/dbd/apr_dbd_pgsql.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbd/apr_dbd_pgsql.c freeswitch/branches/knhor/trunk/libs/apr-util/dbd/apr_dbd_sqlite2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbd/apr_dbd_sqlite2.c freeswitch/branches/knhor/trunk/libs/apr-util/dbd/apr_dbd_sqlite3.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbd/apr_dbd_sqlite3.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/dbm/ freeswitch/branches/knhor/trunk/libs/apr-util/dbm/apr_dbm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/apr_dbm.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/apr_dbm_berkeleydb.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/apr_dbm_berkeleydb.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/apr_dbm_gdbm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/apr_dbm_gdbm.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/apr_dbm_ndbm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/apr_dbm_ndbm.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/apr_dbm_sdbm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/apr_dbm_sdbm.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/ freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm_hash.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm_hash.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm_lock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm_lock.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm_pair.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm_pair.c freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm_pair.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm_pair.h freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm_private.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm_private.h freeswitch/branches/knhor/trunk/libs/apr-util/dbm/sdbm/sdbm_tune.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/dbm/sdbm/sdbm_tune.h freeswitch/branches/knhor/trunk/libs/apr-util/docs/ - copied from r3743, /freeswitch/trunk/libs/apr-util/docs/ freeswitch/branches/knhor/trunk/libs/apr-util/docs/doxygen.conf - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/docs/doxygen.conf freeswitch/branches/knhor/trunk/libs/apr-util/encoding/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/encoding/ freeswitch/branches/knhor/trunk/libs/apr-util/encoding/apr_base64.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/encoding/apr_base64.c freeswitch/branches/knhor/trunk/libs/apr-util/export_vars.sh.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/export_vars.sh.in freeswitch/branches/knhor/trunk/libs/apr-util/hooks/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/hooks/ freeswitch/branches/knhor/trunk/libs/apr-util/hooks/apr_hooks.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/hooks/apr_hooks.c freeswitch/branches/knhor/trunk/libs/apr-util/include/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/include/ freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_anylock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_anylock.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_base64.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_base64.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_buckets.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_buckets.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_date.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_date.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_dbd.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_dbd.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_dbm.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_dbm.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_hooks.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_hooks.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_ldap.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_ldap.h.in freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_ldap.hnw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_ldap.hnw freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_ldap.hw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_ldap.hw freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_ldap_init.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_ldap_init.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_ldap_option.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_ldap_option.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_ldap_url.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_ldap_url.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_md4.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_md4.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_md5.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_md5.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_optional.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_optional.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_optional_hooks.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_optional_hooks.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_queue.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_queue.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_reslist.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_reslist.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_rmm.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_rmm.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_sdbm.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_sdbm.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_sha1.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_sha1.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_strmatch.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_strmatch.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_uri.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_uri.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_uuid.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_uuid.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_xlate.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_xlate.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apr_xml.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apr_xml.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apu.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu.h.in freeswitch/branches/knhor/trunk/libs/apr-util/include/apu.hnw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu.hnw freeswitch/branches/knhor/trunk/libs/apr-util/include/apu.hw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu.hw freeswitch/branches/knhor/trunk/libs/apr-util/include/apu_version.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu_version.h freeswitch/branches/knhor/trunk/libs/apr-util/include/apu_want.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu_want.h.in freeswitch/branches/knhor/trunk/libs/apr-util/include/apu_want.hnw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu_want.hnw freeswitch/branches/knhor/trunk/libs/apr-util/include/apu_want.hw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/apu_want.hw freeswitch/branches/knhor/trunk/libs/apr-util/include/private/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/include/private/ freeswitch/branches/knhor/trunk/libs/apr-util/include/private/apr_dbd_internal.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/private/apr_dbd_internal.h freeswitch/branches/knhor/trunk/libs/apr-util/include/private/apr_dbm_private.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/private/apr_dbm_private.h freeswitch/branches/knhor/trunk/libs/apr-util/include/private/apu_config.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/private/apu_config.h.in freeswitch/branches/knhor/trunk/libs/apr-util/include/private/apu_config.hw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/private/apu_config.hw freeswitch/branches/knhor/trunk/libs/apr-util/include/private/apu_select_dbm.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/private/apu_select_dbm.h.in freeswitch/branches/knhor/trunk/libs/apr-util/include/private/apu_select_dbm.hw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/include/private/apu_select_dbm.hw freeswitch/branches/knhor/trunk/libs/apr-util/ldap/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/ldap/ freeswitch/branches/knhor/trunk/libs/apr-util/ldap/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/ldap/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr-util/ldap/apr_ldap_init.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/ldap/apr_ldap_init.c freeswitch/branches/knhor/trunk/libs/apr-util/ldap/apr_ldap_option.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/ldap/apr_ldap_option.c freeswitch/branches/knhor/trunk/libs/apr-util/ldap/apr_ldap_url.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/ldap/apr_ldap_url.c freeswitch/branches/knhor/trunk/libs/apr-util/libaprutil.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/libaprutil.dsp freeswitch/branches/knhor/trunk/libs/apr-util/libaprutil.rc - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/libaprutil.rc freeswitch/branches/knhor/trunk/libs/apr-util/misc/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/misc/ freeswitch/branches/knhor/trunk/libs/apr-util/misc/apr_date.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/misc/apr_date.c freeswitch/branches/knhor/trunk/libs/apr-util/misc/apr_queue.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/misc/apr_queue.c freeswitch/branches/knhor/trunk/libs/apr-util/misc/apr_reslist.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/misc/apr_reslist.c freeswitch/branches/knhor/trunk/libs/apr-util/misc/apr_rmm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/misc/apr_rmm.c freeswitch/branches/knhor/trunk/libs/apr-util/misc/apu_version.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/misc/apu_version.c freeswitch/branches/knhor/trunk/libs/apr-util/renames_pending - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/renames_pending freeswitch/branches/knhor/trunk/libs/apr-util/strmatch/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/strmatch/ freeswitch/branches/knhor/trunk/libs/apr-util/strmatch/apr_strmatch.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/strmatch/apr_strmatch.c freeswitch/branches/knhor/trunk/libs/apr-util/test/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/test/ freeswitch/branches/knhor/trunk/libs/apr-util/test/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-util/test/Makefile.win - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/Makefile.win freeswitch/branches/knhor/trunk/libs/apr-util/test/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr-util/test/abts.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/abts.c freeswitch/branches/knhor/trunk/libs/apr-util/test/abts.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/abts.h freeswitch/branches/knhor/trunk/libs/apr-util/test/abts_tests.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/abts_tests.h freeswitch/branches/knhor/trunk/libs/apr-util/test/data/ - copied from r3743, /freeswitch/trunk/libs/apr-util/test/data/ freeswitch/branches/knhor/trunk/libs/apr-util/test/dbd.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/dbd.c freeswitch/branches/knhor/trunk/libs/apr-util/test/nw_misc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/nw_misc.c freeswitch/branches/knhor/trunk/libs/apr-util/test/nwgnuaputest - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/nwgnuaputest freeswitch/branches/knhor/trunk/libs/apr-util/test/test_apu.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/test_apu.h freeswitch/branches/knhor/trunk/libs/apr-util/test/testbuckets.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testbuckets.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testdate.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testdate.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testdbd.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testdbd.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testdbm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testdbm.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testldap.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testldap.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testmd4.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testmd4.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testmd5.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testmd5.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testpass.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testpass.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testqueue.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testqueue.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testreslist.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testreslist.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testrmm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testrmm.c freeswitch/branches/knhor/trunk/libs/apr-util/test/teststrmatch.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/teststrmatch.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testuri.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testuri.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testutil.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testutil.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testutil.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testutil.h freeswitch/branches/knhor/trunk/libs/apr-util/test/testuuid.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testuuid.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testxlate.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testxlate.c freeswitch/branches/knhor/trunk/libs/apr-util/test/testxml.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/test/testxml.c freeswitch/branches/knhor/trunk/libs/apr-util/uri/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/uri/ freeswitch/branches/knhor/trunk/libs/apr-util/uri/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/uri/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr-util/uri/apr_uri.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/uri/apr_uri.c freeswitch/branches/knhor/trunk/libs/apr-util/xlate/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/xlate/ freeswitch/branches/knhor/trunk/libs/apr-util/xlate/xlate.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xlate/xlate.c freeswitch/branches/knhor/trunk/libs/apr-util/xml/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/xml/ freeswitch/branches/knhor/trunk/libs/apr-util/xml/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr-util/xml/apr_xml.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/apr_xml.c freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/ freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/COPYING - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/COPYING freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/README - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/README freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/acconfig.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/acconfig.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/aclocal.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/aclocal.m4 freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/buildconf.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/config.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/config.h.in freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/configure - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/configure freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/configure.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/configure.in freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/ - copied from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/ freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/PrintPath - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/PrintPath freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/config.guess freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/config.sub freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/install-sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/install-sh freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/ltmain.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/ltmain.sh freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/missing - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/missing freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/conftools/mkinstalldirs - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/conftools/mkinstalldirs freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/ freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/Makefile.in freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/ascii.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/ascii.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/asciitab.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/asciitab.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/config.hnw - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/config.hnw freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/expat.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/expat.dsp freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/expat.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/expat.h.in freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/iasciitab.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/iasciitab.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/latin1tab.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/latin1tab.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/map_osd_ebcdic_df04_1.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/map_osd_ebcdic_df04_1.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/nametab.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/nametab.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/osd_ebcdic_df04_1.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/osd_ebcdic_df04_1.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/utf8tab.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/utf8tab.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/winconfig.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xml.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xml.dsp freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmlparse.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmlrole.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlrole.c freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmlrole.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlrole.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmltok.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmltok.c freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmltok.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmltok.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmltok_impl.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmltok_impl.c freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmltok_impl.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmltok_impl.h freeswitch/branches/knhor/trunk/libs/apr-util/xml/expat/lib/xmltok_ns.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr-util/xml/expat/lib/xmltok_ns.c freeswitch/branches/knhor/trunk/libs/apr/CHANGES - copied unchanged from r3743, /freeswitch/trunk/libs/apr/CHANGES freeswitch/branches/knhor/trunk/libs/apr/LICENSE - copied unchanged from r3743, /freeswitch/trunk/libs/apr/LICENSE freeswitch/branches/knhor/trunk/libs/apr/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/Makefile.in freeswitch/branches/knhor/trunk/libs/apr/NOTICE - copied unchanged from r3743, /freeswitch/trunk/libs/apr/NOTICE freeswitch/branches/knhor/trunk/libs/apr/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr/README.dev - copied unchanged from r3743, /freeswitch/trunk/libs/apr/README.dev freeswitch/branches/knhor/trunk/libs/apr/apr-config.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/apr-config.in freeswitch/branches/knhor/trunk/libs/apr/apr.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/apr.dsp freeswitch/branches/knhor/trunk/libs/apr/apr.dsw - copied unchanged from r3743, /freeswitch/trunk/libs/apr/apr.dsw freeswitch/branches/knhor/trunk/libs/apr/apr.pc.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/apr.pc.in freeswitch/branches/knhor/trunk/libs/apr/apr.spec - copied unchanged from r3743, /freeswitch/trunk/libs/apr/apr.spec freeswitch/branches/knhor/trunk/libs/apr/atomic/ - copied from r3743, /freeswitch/trunk/libs/apr/atomic/ freeswitch/branches/knhor/trunk/libs/apr/atomic/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/atomic/netware/ freeswitch/branches/knhor/trunk/libs/apr/atomic/netware/apr_atomic.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/atomic/netware/apr_atomic.c freeswitch/branches/knhor/trunk/libs/apr/atomic/os390/ - copied from r3743, /freeswitch/trunk/libs/apr/atomic/os390/ freeswitch/branches/knhor/trunk/libs/apr/atomic/os390/atomic.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/atomic/os390/atomic.c freeswitch/branches/knhor/trunk/libs/apr/atomic/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/atomic/unix/ freeswitch/branches/knhor/trunk/libs/apr/atomic/unix/apr_atomic.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/atomic/unix/apr_atomic.c freeswitch/branches/knhor/trunk/libs/apr/atomic/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/atomic/win32/ freeswitch/branches/knhor/trunk/libs/apr/atomic/win32/apr_atomic.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/atomic/win32/apr_atomic.c freeswitch/branches/knhor/trunk/libs/apr/build/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/build/ freeswitch/branches/knhor/trunk/libs/apr/build-outputs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build-outputs.mk freeswitch/branches/knhor/trunk/libs/apr/build.conf - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build.conf freeswitch/branches/knhor/trunk/libs/apr/build/MakeEtags - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/MakeEtags freeswitch/branches/knhor/trunk/libs/apr/build/NWGNUenvironment.inc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/NWGNUenvironment.inc freeswitch/branches/knhor/trunk/libs/apr/build/NWGNUhead.inc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/NWGNUhead.inc freeswitch/branches/knhor/trunk/libs/apr/build/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr/build/NWGNUtail.inc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/NWGNUtail.inc freeswitch/branches/knhor/trunk/libs/apr/build/PrintPath - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/PrintPath freeswitch/branches/knhor/trunk/libs/apr/build/aplibtool.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/aplibtool.c freeswitch/branches/knhor/trunk/libs/apr/build/apr_app.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/apr_app.dsp freeswitch/branches/knhor/trunk/libs/apr/build/apr_common.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/apr_common.m4 freeswitch/branches/knhor/trunk/libs/apr/build/apr_hints.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/apr_hints.m4 freeswitch/branches/knhor/trunk/libs/apr/build/apr_network.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/apr_network.m4 freeswitch/branches/knhor/trunk/libs/apr/build/apr_rules.mk.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/apr_rules.mk.in freeswitch/branches/knhor/trunk/libs/apr/build/apr_threads.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/apr_threads.m4 freeswitch/branches/knhor/trunk/libs/apr/build/buildcheck.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/buildcheck.sh freeswitch/branches/knhor/trunk/libs/apr/build/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/config.guess freeswitch/branches/knhor/trunk/libs/apr/build/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/config.sub freeswitch/branches/knhor/trunk/libs/apr/build/cvtdsp.pl - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/cvtdsp.pl freeswitch/branches/knhor/trunk/libs/apr/build/find_apr.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/find_apr.m4 freeswitch/branches/knhor/trunk/libs/apr/build/fixwin32mak.pl - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/fixwin32mak.pl freeswitch/branches/knhor/trunk/libs/apr/build/gen-build.py - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/gen-build.py freeswitch/branches/knhor/trunk/libs/apr/build/get-version.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/get-version.sh freeswitch/branches/knhor/trunk/libs/apr/build/install.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/install.sh freeswitch/branches/knhor/trunk/libs/apr/build/jlibtool.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/jlibtool.c freeswitch/branches/knhor/trunk/libs/apr/build/libapr_app.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/libapr_app.dsp freeswitch/branches/knhor/trunk/libs/apr/build/libtool.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/libtool.m4 freeswitch/branches/knhor/trunk/libs/apr/build/lineends.pl - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/lineends.pl freeswitch/branches/knhor/trunk/libs/apr/build/ltmain.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/ltmain.sh freeswitch/branches/knhor/trunk/libs/apr/build/make_exports.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/make_exports.awk freeswitch/branches/knhor/trunk/libs/apr/build/make_nw_export.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/make_nw_export.awk freeswitch/branches/knhor/trunk/libs/apr/build/make_var_export.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/make_var_export.awk freeswitch/branches/knhor/trunk/libs/apr/build/mkdir.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/mkdir.sh freeswitch/branches/knhor/trunk/libs/apr/build/nw_export.inc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/nw_export.inc freeswitch/branches/knhor/trunk/libs/apr/build/nw_ver.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/nw_ver.awk freeswitch/branches/knhor/trunk/libs/apr/build/pkg/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/build/pkg/ freeswitch/branches/knhor/trunk/libs/apr/build/pkg/README - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/pkg/README freeswitch/branches/knhor/trunk/libs/apr/build/pkg/buildpkg.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/pkg/buildpkg.sh freeswitch/branches/knhor/trunk/libs/apr/build/pkg/pkginfo.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/pkg/pkginfo.in freeswitch/branches/knhor/trunk/libs/apr/build/prebuildNW.bat - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/prebuildNW.bat freeswitch/branches/knhor/trunk/libs/apr/build/rpm/ - copied from r3743, /freeswitch/trunk/libs/apr/build/rpm/ freeswitch/branches/knhor/trunk/libs/apr/build/rpm/apr.spec.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/rpm/apr.spec.in freeswitch/branches/knhor/trunk/libs/apr/build/run-gcov.sh - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/run-gcov.sh freeswitch/branches/knhor/trunk/libs/apr/build/win32ver.awk - copied unchanged from r3743, /freeswitch/trunk/libs/apr/build/win32ver.awk freeswitch/branches/knhor/trunk/libs/apr/buildconf - copied unchanged from r3743, /freeswitch/trunk/libs/apr/buildconf freeswitch/branches/knhor/trunk/libs/apr/config.layout - copied unchanged from r3743, /freeswitch/trunk/libs/apr/config.layout freeswitch/branches/knhor/trunk/libs/apr/configure - copied unchanged from r3743, /freeswitch/trunk/libs/apr/configure freeswitch/branches/knhor/trunk/libs/apr/configure.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/configure.in freeswitch/branches/knhor/trunk/libs/apr/docs/ - copied from r3743, /freeswitch/trunk/libs/apr/docs/ freeswitch/branches/knhor/trunk/libs/apr/docs/APRDesign.html - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/APRDesign.html freeswitch/branches/knhor/trunk/libs/apr/docs/canonical_filenames.html - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/canonical_filenames.html freeswitch/branches/knhor/trunk/libs/apr/docs/doxygen.conf - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/doxygen.conf freeswitch/branches/knhor/trunk/libs/apr/docs/incomplete_types - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/incomplete_types freeswitch/branches/knhor/trunk/libs/apr/docs/non_apr_programs - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/non_apr_programs freeswitch/branches/knhor/trunk/libs/apr/docs/pool-design.html - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/pool-design.html freeswitch/branches/knhor/trunk/libs/apr/docs/win32_builds.html - copied unchanged from r3743, /freeswitch/trunk/libs/apr/docs/win32_builds.html freeswitch/branches/knhor/trunk/libs/apr/dso/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/ freeswitch/branches/knhor/trunk/libs/apr/dso/aix/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/aix/ freeswitch/branches/knhor/trunk/libs/apr/dso/aix/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/aix/dso.c freeswitch/branches/knhor/trunk/libs/apr/dso/beos/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/beos/ freeswitch/branches/knhor/trunk/libs/apr/dso/beos/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/beos/dso.c freeswitch/branches/knhor/trunk/libs/apr/dso/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/netware/ freeswitch/branches/knhor/trunk/libs/apr/dso/netware/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/netware/dso.c freeswitch/branches/knhor/trunk/libs/apr/dso/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/os2/ freeswitch/branches/knhor/trunk/libs/apr/dso/os2/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/os2/dso.c freeswitch/branches/knhor/trunk/libs/apr/dso/os390/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/os390/ freeswitch/branches/knhor/trunk/libs/apr/dso/os390/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/os390/dso.c freeswitch/branches/knhor/trunk/libs/apr/dso/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/dso/unix/ freeswitch/branches/knhor/trunk/libs/apr/dso/unix/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/unix/dso.c freeswitch/branches/knhor/trunk/libs/apr/dso/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/dso/win32/ freeswitch/branches/knhor/trunk/libs/apr/dso/win32/dso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/dso/win32/dso.c freeswitch/branches/knhor/trunk/libs/apr/emacs-mode - copied unchanged from r3743, /freeswitch/trunk/libs/apr/emacs-mode freeswitch/branches/knhor/trunk/libs/apr/file_io/ - copied from r3743, /freeswitch/trunk/libs/apr/file_io/ freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/file_io/netware/ freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/filepath.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/netware/filepath.c freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/filestat.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/netware/filestat.c freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/filesys.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/netware/filesys.c freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/flock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/netware/flock.c freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/mktemp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/netware/mktemp.c freeswitch/branches/knhor/trunk/libs/apr/file_io/netware/pipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/netware/pipe.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/file_io/os2/ freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/copy.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/copy.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/dir.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/dir.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/dir_make_recurse.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/dir_make_recurse.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/fileacc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/fileacc.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/filedup.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/filedup.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/filepath.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/filepath.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/filepath_util.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/filepath_util.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/filestat.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/filestat.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/filesys.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/filesys.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/flock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/flock.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/fullrw.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/fullrw.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/maperrorcode.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/maperrorcode.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/mktemp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/mktemp.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/open.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/open.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/pipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/pipe.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/readwrite.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/readwrite.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/seek.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/seek.c freeswitch/branches/knhor/trunk/libs/apr/file_io/os2/tempdir.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/os2/tempdir.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/file_io/unix/ freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/copy.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/copy.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/dir.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/dir.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/fileacc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/fileacc.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/filedup.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/filedup.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/filepath.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/filepath.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/filepath_util.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/filepath_util.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/filestat.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/filestat.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/flock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/flock.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/fullrw.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/fullrw.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/mktemp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/mktemp.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/open.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/open.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/pipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/pipe.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/readwrite.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/readwrite.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/seek.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/seek.c freeswitch/branches/knhor/trunk/libs/apr/file_io/unix/tempdir.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/unix/tempdir.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/file_io/win32/ freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/dir.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/dir.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/filedup.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/filedup.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/filepath.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/filepath.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/filestat.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/filestat.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/filesys.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/filesys.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/flock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/flock.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/open.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/open.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/pipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/pipe.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/readwrite.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/readwrite.c freeswitch/branches/knhor/trunk/libs/apr/file_io/win32/seek.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/file_io/win32/seek.c freeswitch/branches/knhor/trunk/libs/apr/helpers/ - copied from r3743, /freeswitch/trunk/libs/apr/helpers/ freeswitch/branches/knhor/trunk/libs/apr/helpers/apr_rename.pl - copied unchanged from r3743, /freeswitch/trunk/libs/apr/helpers/apr_rename.pl freeswitch/branches/knhor/trunk/libs/apr/images/ - copied from r3743, /freeswitch/trunk/libs/apr/images/ freeswitch/branches/knhor/trunk/libs/apr/images/ScanDocBig.jpg - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/ScanDocBig.jpg freeswitch/branches/knhor/trunk/libs/apr/images/ScanDocSmall.jpg - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/ScanDocSmall.jpg freeswitch/branches/knhor/trunk/libs/apr/images/ball1.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/ball1.gif freeswitch/branches/knhor/trunk/libs/apr/images/ball1.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/ball1.png freeswitch/branches/knhor/trunk/libs/apr/images/ball2.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/ball2.gif freeswitch/branches/knhor/trunk/libs/apr/images/ball2.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/ball2.png freeswitch/branches/knhor/trunk/libs/apr/images/bug.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/bug.gif freeswitch/branches/knhor/trunk/libs/apr/images/bug.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/bug.png freeswitch/branches/knhor/trunk/libs/apr/images/caution.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/caution.gif freeswitch/branches/knhor/trunk/libs/apr/images/caution.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/caution.png freeswitch/branches/knhor/trunk/libs/apr/images/master.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/master.gif freeswitch/branches/knhor/trunk/libs/apr/images/master.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/master.png freeswitch/branches/knhor/trunk/libs/apr/images/tip.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/tip.gif freeswitch/branches/knhor/trunk/libs/apr/images/tip.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/tip.png freeswitch/branches/knhor/trunk/libs/apr/images/warning.gif - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/warning.gif freeswitch/branches/knhor/trunk/libs/apr/images/warning.png - copied unchanged from r3743, /freeswitch/trunk/libs/apr/images/warning.png freeswitch/branches/knhor/trunk/libs/apr/include/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/include/ freeswitch/branches/knhor/trunk/libs/apr/include/apr.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr.h.in freeswitch/branches/knhor/trunk/libs/apr/include/apr.hnw - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr.hnw freeswitch/branches/knhor/trunk/libs/apr/include/apr.hw - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr.hw freeswitch/branches/knhor/trunk/libs/apr/include/apr_allocator.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_allocator.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_atomic.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_atomic.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_env.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_env.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_errno.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_errno.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_file_info.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_file_info.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_file_io.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_file_io.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_fnmatch.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_fnmatch.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_general.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_general.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_getopt.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_getopt.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_global_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_global_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_hash.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_hash.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_inherit.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_inherit.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_lib.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_lib.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_mmap.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_mmap.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_network_io.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_network_io.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_poll.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_poll.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_pools.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_pools.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_portable.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_portable.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_proc_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_proc_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_random.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_random.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_ring.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_ring.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_shm.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_shm.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_signal.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_signal.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_strings.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_strings.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_support.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_support.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_tables.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_tables.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_thread_cond.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_thread_cond.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_thread_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_thread_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_thread_proc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_thread_proc.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_thread_rwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_thread_rwlock.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_time.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_time.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_user.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_user.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_version.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_version.h freeswitch/branches/knhor/trunk/libs/apr/include/apr_want.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/apr_want.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/aix/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/aix/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/aix/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/aix/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/apr_private_common.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/apr_private_common.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/apr_arch_proc_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/apr_arch_proc_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/apr_arch_thread_cond.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/apr_arch_thread_cond.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/apr_arch_thread_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/apr_arch_thread_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/apr_arch_thread_rwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/apr_arch_thread_rwlock.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/beos/apr_arch_threadproc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/beos/apr_arch_threadproc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_file_io.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_file_io.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_global_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_global_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_internal_time.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_internal_time.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_networkio.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_networkio.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_pre_nw.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_pre_nw.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_proc_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_proc_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_thread_cond.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_thread_cond.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_thread_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_thread_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_thread_rwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_thread_rwlock.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_arch_threadproc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_arch_threadproc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/netware/apr_private.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/netware/apr_private.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_file_io.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_file_io.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_networkio.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_networkio.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_os2calls.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_os2calls.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_proc_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_proc_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_thread_cond.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_thread_cond.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_thread_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_thread_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_thread_rwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_thread_rwlock.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os2/apr_arch_threadproc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os2/apr_arch_threadproc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/os390/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/os390/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/os390/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/os390/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_file_io.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_file_io.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_global_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_global_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_inherit.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_inherit.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_internal_time.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_internal_time.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_misc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_misc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_networkio.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_networkio.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_poll_private.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_poll_private.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_shm.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_shm.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_thread_cond.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_cond.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_thread_rwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_rwlock.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_arch_threadproc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_threadproc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/unix/apr_private.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/ freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_atime.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_atime.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_dso.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_dso.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_file_io.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_file_io.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_inherit.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_inherit.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_misc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_misc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_proc_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_proc_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_thread_cond.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_cond.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_thread_mutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_mutex.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_thread_rwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_rwlock.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_threadproc.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_threadproc.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_arch_utf8.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_utf8.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_dbg_win32_handles.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_dbg_win32_handles.h freeswitch/branches/knhor/trunk/libs/apr/include/arch/win32/apr_private.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/include/arch/win32/apr_private.h freeswitch/branches/knhor/trunk/libs/apr/libapr.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/libapr.dsp freeswitch/branches/knhor/trunk/libs/apr/libapr.rc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/libapr.rc freeswitch/branches/knhor/trunk/libs/apr/libaprnw.mcp.zip - copied unchanged from r3743, /freeswitch/trunk/libs/apr/libaprnw.mcp.zip freeswitch/branches/knhor/trunk/libs/apr/locks/ - copied from r3743, /freeswitch/trunk/libs/apr/locks/ freeswitch/branches/knhor/trunk/libs/apr/locks/beos/ - copied from r3743, /freeswitch/trunk/libs/apr/locks/beos/ freeswitch/branches/knhor/trunk/libs/apr/locks/beos/proc_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/beos/proc_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/beos/thread_cond.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/beos/thread_cond.c freeswitch/branches/knhor/trunk/libs/apr/locks/beos/thread_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/beos/thread_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/beos/thread_rwlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/beos/thread_rwlock.c freeswitch/branches/knhor/trunk/libs/apr/locks/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/locks/netware/ freeswitch/branches/knhor/trunk/libs/apr/locks/netware/proc_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/netware/proc_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/netware/thread_cond.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/netware/thread_cond.c freeswitch/branches/knhor/trunk/libs/apr/locks/netware/thread_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/netware/thread_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/netware/thread_rwlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/netware/thread_rwlock.c freeswitch/branches/knhor/trunk/libs/apr/locks/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/locks/os2/ freeswitch/branches/knhor/trunk/libs/apr/locks/os2/proc_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/os2/proc_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/os2/thread_cond.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/os2/thread_cond.c freeswitch/branches/knhor/trunk/libs/apr/locks/os2/thread_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/os2/thread_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/os2/thread_rwlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/os2/thread_rwlock.c freeswitch/branches/knhor/trunk/libs/apr/locks/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/locks/unix/ freeswitch/branches/knhor/trunk/libs/apr/locks/unix/global_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/unix/global_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/unix/proc_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/unix/proc_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/unix/thread_cond.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/unix/thread_cond.c freeswitch/branches/knhor/trunk/libs/apr/locks/unix/thread_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/unix/thread_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/unix/thread_rwlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/unix/thread_rwlock.c freeswitch/branches/knhor/trunk/libs/apr/locks/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/locks/win32/ freeswitch/branches/knhor/trunk/libs/apr/locks/win32/proc_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/win32/proc_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/win32/thread_cond.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/win32/thread_cond.c freeswitch/branches/knhor/trunk/libs/apr/locks/win32/thread_mutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/win32/thread_mutex.c freeswitch/branches/knhor/trunk/libs/apr/locks/win32/thread_rwlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/locks/win32/thread_rwlock.c freeswitch/branches/knhor/trunk/libs/apr/memory/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/memory/ freeswitch/branches/knhor/trunk/libs/apr/memory/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/memory/unix/ freeswitch/branches/knhor/trunk/libs/apr/memory/unix/apr_pools.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/memory/unix/apr_pools.c freeswitch/branches/knhor/trunk/libs/apr/misc/ - copied from r3743, /freeswitch/trunk/libs/apr/misc/ freeswitch/branches/knhor/trunk/libs/apr/misc/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/misc/netware/ freeswitch/branches/knhor/trunk/libs/apr/misc/netware/apr.xdc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/netware/apr.xdc freeswitch/branches/knhor/trunk/libs/apr/misc/netware/aprlib.def - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/netware/aprlib.def freeswitch/branches/knhor/trunk/libs/apr/misc/netware/charset.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/netware/charset.c freeswitch/branches/knhor/trunk/libs/apr/misc/netware/libprews.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/netware/libprews.c freeswitch/branches/knhor/trunk/libs/apr/misc/netware/rand.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/netware/rand.c freeswitch/branches/knhor/trunk/libs/apr/misc/netware/start.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/netware/start.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/misc/unix/ freeswitch/branches/knhor/trunk/libs/apr/misc/unix/charset.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/charset.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/env.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/env.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/errorcodes.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/errorcodes.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/getopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/getopt.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/otherchild.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/otherchild.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/rand.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/rand.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/randbyte_os2.inc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/randbyte_os2.inc freeswitch/branches/knhor/trunk/libs/apr/misc/unix/start.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/start.c freeswitch/branches/knhor/trunk/libs/apr/misc/unix/version.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/unix/version.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/misc/win32/ freeswitch/branches/knhor/trunk/libs/apr/misc/win32/apr_app.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/apr_app.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/charset.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/charset.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/env.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/env.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/internal.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/internal.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/misc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/misc.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/rand.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/rand.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/start.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/start.c freeswitch/branches/knhor/trunk/libs/apr/misc/win32/utf8.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/misc/win32/utf8.c freeswitch/branches/knhor/trunk/libs/apr/mmap/ - copied from r3743, /freeswitch/trunk/libs/apr/mmap/ freeswitch/branches/knhor/trunk/libs/apr/mmap/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/mmap/unix/ freeswitch/branches/knhor/trunk/libs/apr/mmap/unix/common.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/mmap/unix/common.c freeswitch/branches/knhor/trunk/libs/apr/mmap/unix/mmap.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/mmap/unix/mmap.c freeswitch/branches/knhor/trunk/libs/apr/mmap/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/mmap/win32/ freeswitch/branches/knhor/trunk/libs/apr/mmap/win32/mmap.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/mmap/win32/mmap.c freeswitch/branches/knhor/trunk/libs/apr/network_io/ - copied from r3743, /freeswitch/trunk/libs/apr/network_io/ freeswitch/branches/knhor/trunk/libs/apr/network_io/beos/ - copied from r3743, /freeswitch/trunk/libs/apr/network_io/beos/ freeswitch/branches/knhor/trunk/libs/apr/network_io/beos/sendrecv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/beos/sendrecv.c freeswitch/branches/knhor/trunk/libs/apr/network_io/beos/socketcommon.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/beos/socketcommon.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/network_io/os2/ freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/inet_ntop.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/inet_ntop.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/inet_pton.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/inet_pton.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/os2calls.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/os2calls.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/sendrecv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/sendrecv.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/sendrecv_udp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/sendrecv_udp.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/sockaddr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/sockaddr.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/sockets.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/sockets.c freeswitch/branches/knhor/trunk/libs/apr/network_io/os2/sockopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/os2/sockopt.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/network_io/unix/ freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/inet_ntop.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/inet_ntop.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/inet_pton.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/inet_pton.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/multicast.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/multicast.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/sendrecv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/sendrecv.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/sockaddr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/sockaddr.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/sockets.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/sockets.c freeswitch/branches/knhor/trunk/libs/apr/network_io/unix/sockopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/unix/sockopt.c freeswitch/branches/knhor/trunk/libs/apr/network_io/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/network_io/win32/ freeswitch/branches/knhor/trunk/libs/apr/network_io/win32/sendrecv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/win32/sendrecv.c freeswitch/branches/knhor/trunk/libs/apr/network_io/win32/sockets.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/win32/sockets.c freeswitch/branches/knhor/trunk/libs/apr/network_io/win32/sockopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/network_io/win32/sockopt.c freeswitch/branches/knhor/trunk/libs/apr/passwd/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/passwd/ freeswitch/branches/knhor/trunk/libs/apr/passwd/apr_getpass.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/passwd/apr_getpass.c freeswitch/branches/knhor/trunk/libs/apr/poll/ - copied from r3743, /freeswitch/trunk/libs/apr/poll/ freeswitch/branches/knhor/trunk/libs/apr/poll/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/poll/os2/ freeswitch/branches/knhor/trunk/libs/apr/poll/os2/poll.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/os2/poll.c freeswitch/branches/knhor/trunk/libs/apr/poll/os2/pollset.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/os2/pollset.c freeswitch/branches/knhor/trunk/libs/apr/poll/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/poll/unix/ freeswitch/branches/knhor/trunk/libs/apr/poll/unix/epoll.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/unix/epoll.c freeswitch/branches/knhor/trunk/libs/apr/poll/unix/kqueue.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/unix/kqueue.c freeswitch/branches/knhor/trunk/libs/apr/poll/unix/poll.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/unix/poll.c freeswitch/branches/knhor/trunk/libs/apr/poll/unix/port.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/unix/port.c freeswitch/branches/knhor/trunk/libs/apr/poll/unix/select.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/poll/unix/select.c freeswitch/branches/knhor/trunk/libs/apr/random/ - copied from r3743, /freeswitch/trunk/libs/apr/random/ freeswitch/branches/knhor/trunk/libs/apr/random/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/random/unix/ freeswitch/branches/knhor/trunk/libs/apr/random/unix/apr_random.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/random/unix/apr_random.c freeswitch/branches/knhor/trunk/libs/apr/random/unix/sha2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/random/unix/sha2.c freeswitch/branches/knhor/trunk/libs/apr/random/unix/sha2.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/random/unix/sha2.h freeswitch/branches/knhor/trunk/libs/apr/random/unix/sha2_glue.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/random/unix/sha2_glue.c freeswitch/branches/knhor/trunk/libs/apr/renames_pending - copied unchanged from r3743, /freeswitch/trunk/libs/apr/renames_pending freeswitch/branches/knhor/trunk/libs/apr/shmem/ - copied from r3743, /freeswitch/trunk/libs/apr/shmem/ freeswitch/branches/knhor/trunk/libs/apr/shmem/beos/ - copied from r3743, /freeswitch/trunk/libs/apr/shmem/beos/ freeswitch/branches/knhor/trunk/libs/apr/shmem/beos/shm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/shmem/beos/shm.c freeswitch/branches/knhor/trunk/libs/apr/shmem/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/shmem/os2/ freeswitch/branches/knhor/trunk/libs/apr/shmem/os2/shm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/shmem/os2/shm.c freeswitch/branches/knhor/trunk/libs/apr/shmem/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/shmem/unix/ freeswitch/branches/knhor/trunk/libs/apr/shmem/unix/shm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/shmem/unix/shm.c freeswitch/branches/knhor/trunk/libs/apr/shmem/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/shmem/win32/ freeswitch/branches/knhor/trunk/libs/apr/shmem/win32/shm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/shmem/win32/shm.c freeswitch/branches/knhor/trunk/libs/apr/strings/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/strings/ freeswitch/branches/knhor/trunk/libs/apr/strings/apr_cpystrn.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/strings/apr_cpystrn.c freeswitch/branches/knhor/trunk/libs/apr/strings/apr_fnmatch.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/strings/apr_fnmatch.c freeswitch/branches/knhor/trunk/libs/apr/strings/apr_snprintf.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/strings/apr_snprintf.c freeswitch/branches/knhor/trunk/libs/apr/strings/apr_strings.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/strings/apr_strings.c freeswitch/branches/knhor/trunk/libs/apr/strings/apr_strnatcmp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/strings/apr_strnatcmp.c freeswitch/branches/knhor/trunk/libs/apr/strings/apr_strtok.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/strings/apr_strtok.c freeswitch/branches/knhor/trunk/libs/apr/support/ - copied from r3743, /freeswitch/trunk/libs/apr/support/ freeswitch/branches/knhor/trunk/libs/apr/support/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/support/unix/ freeswitch/branches/knhor/trunk/libs/apr/support/unix/waitio.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/support/unix/waitio.c freeswitch/branches/knhor/trunk/libs/apr/tables/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/tables/ freeswitch/branches/knhor/trunk/libs/apr/tables/apr_hash.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/tables/apr_hash.c freeswitch/branches/knhor/trunk/libs/apr/tables/apr_tables.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/tables/apr_tables.c freeswitch/branches/knhor/trunk/libs/apr/test/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/test/ freeswitch/branches/knhor/trunk/libs/apr/test/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/Makefile.in freeswitch/branches/knhor/trunk/libs/apr/test/Makefile.win - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/Makefile.win freeswitch/branches/knhor/trunk/libs/apr/test/NWGNUmakefile - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/NWGNUmakefile freeswitch/branches/knhor/trunk/libs/apr/test/README - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/README freeswitch/branches/knhor/trunk/libs/apr/test/abts.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/abts.c freeswitch/branches/knhor/trunk/libs/apr/test/abts.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/abts.h freeswitch/branches/knhor/trunk/libs/apr/test/abts_tests.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/abts_tests.h freeswitch/branches/knhor/trunk/libs/apr/test/aprtest.def - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/aprtest.def freeswitch/branches/knhor/trunk/libs/apr/test/aprtest.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/aprtest.dsp freeswitch/branches/knhor/trunk/libs/apr/test/aprtest.win - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/aprtest.win freeswitch/branches/knhor/trunk/libs/apr/test/data/ - copied from r3743, /freeswitch/trunk/libs/apr/test/data/ freeswitch/branches/knhor/trunk/libs/apr/test/data/file_datafile.txt - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/data/file_datafile.txt freeswitch/branches/knhor/trunk/libs/apr/test/data/mmap_datafile.txt - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/data/mmap_datafile.txt freeswitch/branches/knhor/trunk/libs/apr/test/globalmutexchild.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/globalmutexchild.c freeswitch/branches/knhor/trunk/libs/apr/test/internal/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/test/internal/ freeswitch/branches/knhor/trunk/libs/apr/test/internal/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/internal/Makefile.in freeswitch/branches/knhor/trunk/libs/apr/test/internal/testregex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/internal/testregex.c freeswitch/branches/knhor/trunk/libs/apr/test/internal/testucs.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/internal/testucs.c freeswitch/branches/knhor/trunk/libs/apr/test/mod_test.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/mod_test.c freeswitch/branches/knhor/trunk/libs/apr/test/nw_misc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nw_misc.c freeswitch/branches/knhor/trunk/libs/apr/test/nwgnuaprtest - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnuaprtest freeswitch/branches/knhor/trunk/libs/apr/test/nwgnuglobalmutexchild - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnuglobalmutexchild freeswitch/branches/knhor/trunk/libs/apr/test/nwgnumod_test - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnumod_test freeswitch/branches/knhor/trunk/libs/apr/test/nwgnuproc_child - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnuproc_child freeswitch/branches/knhor/trunk/libs/apr/test/nwgnureadchild - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnureadchild freeswitch/branches/knhor/trunk/libs/apr/test/nwgnusockchild - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnusockchild freeswitch/branches/knhor/trunk/libs/apr/test/nwgnutestatmc - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnutestatmc freeswitch/branches/knhor/trunk/libs/apr/test/nwgnutryread - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/nwgnutryread freeswitch/branches/knhor/trunk/libs/apr/test/occhild.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/occhild.c freeswitch/branches/knhor/trunk/libs/apr/test/proc_child.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/proc_child.c freeswitch/branches/knhor/trunk/libs/apr/test/readchild.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/readchild.c freeswitch/branches/knhor/trunk/libs/apr/test/sendfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/sendfile.c freeswitch/branches/knhor/trunk/libs/apr/test/sockchild.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/sockchild.c freeswitch/branches/knhor/trunk/libs/apr/test/testall.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testall.dsp freeswitch/branches/knhor/trunk/libs/apr/test/testall.dsw - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testall.dsw freeswitch/branches/knhor/trunk/libs/apr/test/testapp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testapp.c freeswitch/branches/knhor/trunk/libs/apr/test/testapp.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testapp.dsp freeswitch/branches/knhor/trunk/libs/apr/test/testappnt.dsp - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testappnt.dsp freeswitch/branches/knhor/trunk/libs/apr/test/testargs.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testargs.c freeswitch/branches/knhor/trunk/libs/apr/test/testatomic.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testatomic.c freeswitch/branches/knhor/trunk/libs/apr/test/testdir.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testdir.c freeswitch/branches/knhor/trunk/libs/apr/test/testdso.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testdso.c freeswitch/branches/knhor/trunk/libs/apr/test/testdup.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testdup.c freeswitch/branches/knhor/trunk/libs/apr/test/testenv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testenv.c freeswitch/branches/knhor/trunk/libs/apr/test/testfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testfile.c freeswitch/branches/knhor/trunk/libs/apr/test/testfilecopy.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testfilecopy.c freeswitch/branches/knhor/trunk/libs/apr/test/testfileinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testfileinfo.c freeswitch/branches/knhor/trunk/libs/apr/test/testflock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testflock.c freeswitch/branches/knhor/trunk/libs/apr/test/testflock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testflock.h freeswitch/branches/knhor/trunk/libs/apr/test/testfmt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testfmt.c freeswitch/branches/knhor/trunk/libs/apr/test/testfnmatch.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testfnmatch.c freeswitch/branches/knhor/trunk/libs/apr/test/testglobalmutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testglobalmutex.c freeswitch/branches/knhor/trunk/libs/apr/test/testglobalmutex.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testglobalmutex.h freeswitch/branches/knhor/trunk/libs/apr/test/testhash.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testhash.c freeswitch/branches/knhor/trunk/libs/apr/test/testipsub.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testipsub.c freeswitch/branches/knhor/trunk/libs/apr/test/testlfs.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testlfs.c freeswitch/branches/knhor/trunk/libs/apr/test/testlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testlock.c freeswitch/branches/knhor/trunk/libs/apr/test/testlockperf.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testlockperf.c freeswitch/branches/knhor/trunk/libs/apr/test/testmmap.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testmmap.c freeswitch/branches/knhor/trunk/libs/apr/test/testmutexscope.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testmutexscope.c freeswitch/branches/knhor/trunk/libs/apr/test/testnames.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testnames.c freeswitch/branches/knhor/trunk/libs/apr/test/testoc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testoc.c freeswitch/branches/knhor/trunk/libs/apr/test/testpath.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testpath.c freeswitch/branches/knhor/trunk/libs/apr/test/testpipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testpipe.c freeswitch/branches/knhor/trunk/libs/apr/test/testpoll.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testpoll.c freeswitch/branches/knhor/trunk/libs/apr/test/testpools.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testpools.c freeswitch/branches/knhor/trunk/libs/apr/test/testproc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testproc.c freeswitch/branches/knhor/trunk/libs/apr/test/testprocmutex.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testprocmutex.c freeswitch/branches/knhor/trunk/libs/apr/test/testrand.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testrand.c freeswitch/branches/knhor/trunk/libs/apr/test/testrand2.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testrand2.c freeswitch/branches/knhor/trunk/libs/apr/test/testshm.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testshm.c freeswitch/branches/knhor/trunk/libs/apr/test/testshm.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testshm.h freeswitch/branches/knhor/trunk/libs/apr/test/testshmconsumer.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testshmconsumer.c freeswitch/branches/knhor/trunk/libs/apr/test/testshmproducer.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testshmproducer.c freeswitch/branches/knhor/trunk/libs/apr/test/testsleep.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testsleep.c freeswitch/branches/knhor/trunk/libs/apr/test/testsock.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testsock.c freeswitch/branches/knhor/trunk/libs/apr/test/testsock.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testsock.h freeswitch/branches/knhor/trunk/libs/apr/test/testsockets.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testsockets.c freeswitch/branches/knhor/trunk/libs/apr/test/testsockopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testsockopt.c freeswitch/branches/knhor/trunk/libs/apr/test/teststr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/teststr.c freeswitch/branches/knhor/trunk/libs/apr/test/teststrnatcmp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/teststrnatcmp.c freeswitch/branches/knhor/trunk/libs/apr/test/testtable.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testtable.c freeswitch/branches/knhor/trunk/libs/apr/test/testtemp.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testtemp.c freeswitch/branches/knhor/trunk/libs/apr/test/testthread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testthread.c freeswitch/branches/knhor/trunk/libs/apr/test/testtime.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testtime.c freeswitch/branches/knhor/trunk/libs/apr/test/testud.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testud.c freeswitch/branches/knhor/trunk/libs/apr/test/testuser.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testuser.c freeswitch/branches/knhor/trunk/libs/apr/test/testutil.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testutil.c freeswitch/branches/knhor/trunk/libs/apr/test/testutil.h - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testutil.h freeswitch/branches/knhor/trunk/libs/apr/test/testvsn.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/testvsn.c freeswitch/branches/knhor/trunk/libs/apr/test/tryread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/test/tryread.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/ - copied from r3743, /freeswitch/trunk/libs/apr/threadproc/ freeswitch/branches/knhor/trunk/libs/apr/threadproc/beos/ - copied from r3743, /freeswitch/trunk/libs/apr/threadproc/beos/ freeswitch/branches/knhor/trunk/libs/apr/threadproc/beos/apr_proc_stub.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/beos/apr_proc_stub.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/beos/proc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/beos/proc.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/beos/thread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/beos/thread.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/beos/threadpriv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/beos/threadpriv.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/beos/threadproc_common.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/beos/threadproc_common.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/threadproc/netware/ freeswitch/branches/knhor/trunk/libs/apr/threadproc/netware/proc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/netware/proc.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/netware/procsup.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/netware/procsup.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/netware/signals.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/netware/signals.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/netware/thread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/netware/thread.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/netware/threadpriv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/netware/threadpriv.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/os2/ - copied from r3743, /freeswitch/trunk/libs/apr/threadproc/os2/ freeswitch/branches/knhor/trunk/libs/apr/threadproc/os2/proc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/os2/proc.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/os2/signals.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/os2/signals.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/os2/thread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/os2/thread.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/os2/threadpriv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/os2/threadpriv.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/threadproc/unix/ freeswitch/branches/knhor/trunk/libs/apr/threadproc/unix/proc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/unix/proc.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/unix/procsup.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/unix/procsup.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/unix/signals.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/unix/signals.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/unix/thread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/unix/thread.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/unix/threadpriv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/unix/threadpriv.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/threadproc/win32/ freeswitch/branches/knhor/trunk/libs/apr/threadproc/win32/proc.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/win32/proc.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/win32/signals.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/win32/signals.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/win32/thread.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/win32/thread.c freeswitch/branches/knhor/trunk/libs/apr/threadproc/win32/threadpriv.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/threadproc/win32/threadpriv.c freeswitch/branches/knhor/trunk/libs/apr/time/ - copied from r3743, /freeswitch/trunk/libs/apr/time/ freeswitch/branches/knhor/trunk/libs/apr/time/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/time/unix/ freeswitch/branches/knhor/trunk/libs/apr/time/unix/time.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/time/unix/time.c freeswitch/branches/knhor/trunk/libs/apr/time/unix/timestr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/time/unix/timestr.c freeswitch/branches/knhor/trunk/libs/apr/time/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/time/win32/ freeswitch/branches/knhor/trunk/libs/apr/time/win32/access.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/time/win32/access.c freeswitch/branches/knhor/trunk/libs/apr/time/win32/time.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/time/win32/time.c freeswitch/branches/knhor/trunk/libs/apr/time/win32/timestr.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/time/win32/timestr.c freeswitch/branches/knhor/trunk/libs/apr/user/ - copied from r3743, /freeswitch/trunk/libs/apr/user/ freeswitch/branches/knhor/trunk/libs/apr/user/netware/ - copied from r3743, /freeswitch/trunk/libs/apr/user/netware/ freeswitch/branches/knhor/trunk/libs/apr/user/netware/groupinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/user/netware/groupinfo.c freeswitch/branches/knhor/trunk/libs/apr/user/netware/userinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/user/netware/userinfo.c freeswitch/branches/knhor/trunk/libs/apr/user/unix/ (props changed) - copied from r3743, /freeswitch/trunk/libs/apr/user/unix/ freeswitch/branches/knhor/trunk/libs/apr/user/unix/groupinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/user/unix/groupinfo.c freeswitch/branches/knhor/trunk/libs/apr/user/unix/userinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/user/unix/userinfo.c freeswitch/branches/knhor/trunk/libs/apr/user/win32/ - copied from r3743, /freeswitch/trunk/libs/apr/user/win32/ freeswitch/branches/knhor/trunk/libs/apr/user/win32/groupinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/user/win32/groupinfo.c freeswitch/branches/knhor/trunk/libs/apr/user/win32/userinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/apr/user/win32/userinfo.c freeswitch/branches/knhor/trunk/libs/js/ - copied from r3743, /freeswitch/trunk/libs/js/ freeswitch/branches/knhor/trunk/libs/js/AUTHORS - copied unchanged from r3743, /freeswitch/trunk/libs/js/AUTHORS freeswitch/branches/knhor/trunk/libs/js/ChangeLog - copied unchanged from r3743, /freeswitch/trunk/libs/js/ChangeLog freeswitch/branches/knhor/trunk/libs/js/LINKS - copied unchanged from r3743, /freeswitch/trunk/libs/js/LINKS freeswitch/branches/knhor/trunk/libs/js/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/Makefile.in freeswitch/branches/knhor/trunk/libs/js/README - copied unchanged from r3743, /freeswitch/trunk/libs/js/README freeswitch/branches/knhor/trunk/libs/js/THANKS - copied unchanged from r3743, /freeswitch/trunk/libs/js/THANKS freeswitch/branches/knhor/trunk/libs/js/TODO - copied unchanged from r3743, /freeswitch/trunk/libs/js/TODO freeswitch/branches/knhor/trunk/libs/js/VERSION - copied unchanged from r3743, /freeswitch/trunk/libs/js/VERSION freeswitch/branches/knhor/trunk/libs/js/aclocal.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/js/aclocal.m4 freeswitch/branches/knhor/trunk/libs/js/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/js/config.guess freeswitch/branches/knhor/trunk/libs/js/config.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/config.h.in freeswitch/branches/knhor/trunk/libs/js/config.hw - copied unchanged from r3743, /freeswitch/trunk/libs/js/config.hw freeswitch/branches/knhor/trunk/libs/js/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/js/config.sub freeswitch/branches/knhor/trunk/libs/js/configure - copied unchanged from r3743, /freeswitch/trunk/libs/js/configure freeswitch/branches/knhor/trunk/libs/js/configure.ac - copied unchanged from r3743, /freeswitch/trunk/libs/js/configure.ac freeswitch/branches/knhor/trunk/libs/js/js-config.1 - copied unchanged from r3743, /freeswitch/trunk/libs/js/js-config.1 freeswitch/branches/knhor/trunk/libs/js/js-config.sh.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/js-config.sh.in freeswitch/branches/knhor/trunk/libs/js/js.1 - copied unchanged from r3743, /freeswitch/trunk/libs/js/js.1 freeswitch/branches/knhor/trunk/libs/js/js.3 - copied unchanged from r3743, /freeswitch/trunk/libs/js/js.3 freeswitch/branches/knhor/trunk/libs/js/js.pc.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/js.pc.in freeswitch/branches/knhor/trunk/libs/js/jslint.js - copied unchanged from r3743, /freeswitch/trunk/libs/js/jslint.js freeswitch/branches/knhor/trunk/libs/js/libtool.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/js/libtool.m4 freeswitch/branches/knhor/trunk/libs/js/ltmain.sh - copied unchanged from r3743, /freeswitch/trunk/libs/js/ltmain.sh freeswitch/branches/knhor/trunk/libs/js/nsprpub/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/admin/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/admin/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/admin/explode.pl - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/admin/explode.pl freeswitch/branches/knhor/trunk/libs/js/nsprpub/admin/makeTargetDirs.sh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/admin/makeTargetDirs.sh freeswitch/branches/knhor/trunk/libs/js/nsprpub/admin/repackage.sh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/admin/repackage.sh freeswitch/branches/knhor/trunk/libs/js/nsprpub/admin/symlinks.sh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/admin/symlinks.sh freeswitch/branches/knhor/trunk/libs/js/nsprpub/build/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/build/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/build/autoconf/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/build/autoconf/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/config.guess freeswitch/branches/knhor/trunk/libs/js/nsprpub/build/autoconf/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/config.sub freeswitch/branches/knhor/trunk/libs/js/nsprpub/build/autoconf/install-sh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/install-sh freeswitch/branches/knhor/trunk/libs/js/nsprpub/build/cygwin-wrapper - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/build/cygwin-wrapper freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/config/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/autoconf.mk.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/autoconf.mk.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/config.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/config.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/gcc_hidden.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/gcc_hidden.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/libc_r.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/libc_r.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/make-system-wrappers.pl - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/make-system-wrappers.pl freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/nfspwd.pl - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/nfspwd.pl freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/now.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/now.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/nsinstall.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/nsinstall.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/nspr-config.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/nspr-config.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/nspr.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/nspr.m4 freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/nsprincl.mk.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/nsprincl.mk.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/nsprincl.sh.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/nsprincl.sh.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/pathsub.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/pathsub.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/prdepend.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/prdepend.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/prmkdir.bat - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/prmkdir.bat freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/rules.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/rules.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/config/system-headers - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/config/system-headers freeswitch/branches/knhor/trunk/libs/js/nsprpub/configure - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/configure freeswitch/branches/knhor/trunk/libs/js/nsprpub/configure.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/configure.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/include/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/include/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/MANIFEST - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/MANIFEST freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plarena.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plarena.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plarena.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plarena.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plarenas.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plarenas.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plds.def - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plds.def freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plds.rc - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plds.rc freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plds_symvec.opt - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plds_symvec.opt freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plhash.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plhash.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plhash.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plhash.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/ds/plvrsion.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plvrsion.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/README - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/README freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/MANIFEST - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/MANIFEST freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/README - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/README freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/plbase64.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plbase64.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/plerror.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plerror.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/plgetopt.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plgetopt.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/plresolv.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plresolv.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/include/plstr.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plstr.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/README - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/README freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/base64.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/base64.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/plc.def - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plc.def freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/plc.rc - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plc.rc freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/plc_symvec.opt - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plc_symvec.opt freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/plerror.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plerror.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/plgetopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plgetopt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/plvrsion.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plvrsion.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strcat.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcat.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strccmp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strccmp.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strchr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strchr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strcmp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcmp.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strcpy.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcpy.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strcstr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcstr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strdup.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strdup.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strlen.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strlen.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strpbrk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strpbrk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strstr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strstr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/libc/src/strtok.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strtok.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/include/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/include/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/include/MANIFEST - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/MANIFEST freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/include/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/include/gcint.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/gcint.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/include/prgc.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/prgc.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/macgc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/macgc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/os2gc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/os2gc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/prgcapi.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/prgcapi.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/prmsgc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/prmsgc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/unixgc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/unixgc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/win16gc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/win16gc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/src/win32gc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/win32gc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/tests/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/tests/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/tests/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/tests/gc1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/gc1.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/msgc/tests/thrashgc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/thrashgc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/plvrsion.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/plvrsion.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/prstrms.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/prstrms.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/prstrms.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/prstrms.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/prstrms.rc - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/prstrms.rc freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/tests/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/arena.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/arena.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/base64t.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/base64t.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/string.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/string.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/windows/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/windows/makefile - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/makefile freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/windows/readme.1st - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/readme.1st freeswitch/branches/knhor/trunk/libs/js/nsprpub/lib/tests/windows/winevent.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/winevent.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/macbuild/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/macbuild/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/linux/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/linux/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/linux/sun-nspr.spec - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/sun-nspr.spec freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/Makefile-devl.c… - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile-devl.com freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/Makefile.com - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile.com freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/Makefile.targ - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile.targ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/depend - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/depend freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386 - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386 freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/depend - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/depend freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/common_files/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/common_files/copyright - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/copyright freeswitch/branches/knhor/trunk/libs/js/nsprpub/pkg/solaris/proto64.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/proto64.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/MANIFEST - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/MANIFEST freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/gencfg.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/gencfg.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_aix.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_aix.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_aix32.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_aix32.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_aix64.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_aix64.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_beos.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_beos.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_beos.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_beos.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_bsdi.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_bsdi.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_bsdi.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_bsdi.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_darwin.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_darwin.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_darwin.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_darwin.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_dgux.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_dgux.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_dgux.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_dgux.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_freebsd.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_hpux.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_hpux.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_hpux32.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_hpux32.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_hpux64.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_hpux64.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_irix.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_irix.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_irix32.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_irix32.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_irix64.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_irix64.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_linux.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_linux.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_linux.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_linux.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_macos.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_macos.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_ncr.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_ncr.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_ncr.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_ncr.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nec.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nec.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nec.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nec.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_netbsd.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_netbsd.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_netbsd.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_netbsd.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nextstep.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nextstep.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nextstep.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nextstep.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nspr_pthread.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nspr_pthread.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nto.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nto.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_nto.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nto.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_openbsd.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openbsd.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_openbsd.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openbsd.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_openvms.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openvms.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_openvms.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openvms.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_os2.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_os2.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_os2.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_os2.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_os2_errors.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_os2_errors.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_osf1.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_osf1.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_osf1.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_osf1.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_pcos.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_pcos.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_pth.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_pth.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_qnx.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_qnx.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_qnx.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_qnx.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_reliantunix.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_reliantunix.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_reliantunix.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_reliantunix.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_rhapsody.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_rhapsody.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_rhapsody.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_rhapsody.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_riscos.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_riscos.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_riscos.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_riscos.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_scoos.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_scoos.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_scoos.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_scoos.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_solaris.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_solaris.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_solaris.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_solaris.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_sony.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sony.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_sony.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sony.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_sunos4.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sunos4.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_sunos4.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sunos4.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_unix_errors.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unix_errors.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_unixos.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixos.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_unixware.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixware.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_unixware.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixware.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_unixware7.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixware7.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_win16.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win16.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_win16.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win16.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_win32_errors.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win32_errors.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_win95.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win95.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_win95.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win95.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_winnt.cfg - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_winnt.cfg freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/_winnt.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_winnt.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/prosdep.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/prosdep.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/md/sunos4.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/sunos4.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/nspr.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/nspr.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/pralarm.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/pralarm.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/probslet.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/probslet.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/protypes.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/protypes.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/obsolete/prsem.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/prsem.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/pratom.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/pratom.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prbit.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prbit.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prclist.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prclist.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prcmon.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prcmon.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prcountr.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prcountr.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prcvar.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prcvar.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prdtoa.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prdtoa.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prenv.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prenv.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prerr.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prerr.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prerror.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prerror.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prinet.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prinet.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prinit.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prinit.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prinrval.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prinrval.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prio.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prio.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/pripcsem.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/pripcsem.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/pprio.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/pprio.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/pprmwait.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/pprmwait.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/pprthred.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/pprthred.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/primpl.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/primpl.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/private/prpriv.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/prpriv.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prlink.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlink.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlock.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prlog.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlog.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prlong.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlong.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prmem.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prmem.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prmon.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prmon.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prmwait.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prmwait.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prnetdb.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prnetdb.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prolock.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prolock.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prpdce.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prpdce.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prprf.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prprf.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prproces.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prproces.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prrng.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prrng.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prrwlock.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prrwlock.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prshm.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prshm.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prshma.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prshma.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prsystem.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prsystem.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prthread.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prthread.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prtime.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtime.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prtpool.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtpool.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prtrace.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtrace.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prtypes.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtypes.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prvrsion.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prvrsion.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/include/prwin16.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/include/prwin16.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/btcvar.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btcvar.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/btlocks.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btlocks.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/btmisc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btmisc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/btmon.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btmon.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/btsem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btsem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/btthread.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btthread.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/bthreads/objs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/objs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcascii.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcascii.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcbase.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcbase.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcbase.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcbase.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rccv.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rccv.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rccv.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rccv.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcfileio.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcfileio.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcinrval.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcinrval.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcio.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcio.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcio.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcio.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rclock.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rclock.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rclock.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rclock.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcmon.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcmon.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcnetdb.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetdb.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcnetio.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetio.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcthread.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcthread.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rcthread.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcthread.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rctime.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rctime.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/rctime.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rctime.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/time.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/time.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/cthreads/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prdir.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prdir.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/priometh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/priometh.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/pripv6.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prlayer.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlayer.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prlog.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prmapopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prmapopt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prmmap.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prmmap.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prmwait.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prmwait.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prpolevt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prpolevt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prprf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prprf.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prscanf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prscanf.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prsocket.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prsocket.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/io/prstdio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prstdio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/linking/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/linking/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/linking/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/linking/prlink.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/prlink.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/malloc/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/malloc/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/malloc/prmalloc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmalloc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bcpu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bcpu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/beos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/beos.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/beos_errors.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/beos_errors.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bmemory.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bmemory.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bmisc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bmisc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bmmap.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bmmap.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bnet.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bnet.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bproc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bproc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/brng.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/brng.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bseg.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bseg.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/btime.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/btime.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/beos/objs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/objs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/MANIFEST - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/MANIFEST freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macdll.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macdll.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macdll.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macdll.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macio.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macio.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macrng.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macrng.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macsocket.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macsocket.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/macthr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macthr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/mactime.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mactime.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/mactime.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mactime.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/mdmac.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdmac.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/mdmac.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdmac.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/objs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/objs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2_errors.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2_errors.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2cv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2cv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2emx.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2emx.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2gc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2gc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2inrval.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2inrval.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2io.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2io.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2misc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2misc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2poll.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2poll.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2rng.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2rng.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2sem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2sem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2sock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2sock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2thred.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2thred.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/prosdep.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/prosdep.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/aix.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/aix.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/aixwrap.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/aixwrap.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/bsdi.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/bsdi.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/darwin.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/darwin.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/dgux.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/dgux.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/freebsd.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/freebsd.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/hpux.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/hpux.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/irix.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/irix.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/linux.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/linux.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/ncr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/ncr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/nec.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/nec.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/netbsd.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/netbsd.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/nextstep.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/nextstep.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/nto.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/nto.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/openbsd.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/openbsd.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/openvms.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/openvms.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_AIX.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_AIX.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_Irix.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Irix.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/osf1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/osf1.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/qnx.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/qnx.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/reliantunix.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/reliantunix.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/rhapsody.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/rhapsody.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/riscos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/riscos.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/scoos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/scoos.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/solaris.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/solaris.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/sony.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/sony.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/sunos4.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/sunos4.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/unix.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/unix.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/unix_errors.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/unix_errors.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/unixware.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/unixware.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/uxpoll.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxpoll.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/uxproces.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxproces.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/uxrng.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxrng.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/uxshm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxshm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/unix/uxwrap.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxwrap.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntgc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntgc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntinrval.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntinrval.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntmisc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntmisc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntsec.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntsec.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntsem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntsem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/ntthread.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntthread.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/objs.mk - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/objs.mk freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16callb.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16callb.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16error.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16error.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16fmem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16fmem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16gc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16gc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16io.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16io.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16mem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16mem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16null.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16null.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16proc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16proc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16sock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16sock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16stdio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16stdio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w16thred.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16thred.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w32poll.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32poll.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w32rng.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32rng.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w32shm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32shm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w95cv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95cv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w95io.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95io.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w95sock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95sock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/w95thred.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95thred.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/md/windows/win32_errors.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/win32_errors.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/prgcleak.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prgcleak.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/prseg.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prseg.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/prshm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prshm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/memory/prshma.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prshma.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/compile-et.pl - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/compile-et.pl freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/pralarm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pralarm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/pratom.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pratom.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prcountr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prcountr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prdtoa.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prdtoa.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prenv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prenv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prerr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prerr.et - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerr.et freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prerr.properties - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerr.properties freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prerror.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerror.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prerrortable.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerrortable.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prinit.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prinrval.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinrval.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/pripc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pripc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/pripcsem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pripcsem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prlog2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prlog2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prlong.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prlong.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prnetdb.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prnetdb.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prolock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prolock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prrng.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prrng.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prsystem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prsystem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prthinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prthinfo.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prtime.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prtime.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prtpool.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prtpool.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/misc/prtrace.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prtrace.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/nspr.def - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/nspr.def freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/nspr.rc - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/nspr.rc freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/nspr_symvec.opt - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/nspr_symvec.opt freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/os2extra.def - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/os2extra.def freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/prvrsion.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/prvrsion.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/ptmisc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptmisc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/ptsynch.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptsynch.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/README - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/README freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/prucpu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prucpu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/prucv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prucv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/prulock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prulock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/prustack.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prustack.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/combined/pruthr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/pruthr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prcmon.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prcmon.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prcthr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prcthr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prdump.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prdump.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prmon.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prmon.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prrwlock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prrwlock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prsem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prsem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/src/threads/prtpd.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prtpd.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/README.TXT - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/README.TXT freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/accept.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/accept.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/acceptread.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/acceptread.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/acceptreademu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/acceptreademu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/addrstr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/addrstr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/affinity.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/affinity.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/alarm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/alarm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/anonfm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/anonfm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/append.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/append.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/atomic.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/atomic.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/attach.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/attach.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/bigfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bigfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/bigfile2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bigfile2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/bigfile3.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bigfile3.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/bug1test.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bug1test.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/cleanup.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cleanup.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/cltsrv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cltsrv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/concur.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/concur.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/cvar.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cvar.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/cvar2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cvar2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dbmalloc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dbmalloc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dbmalloc1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dbmalloc1.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dceemu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dceemu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/depend.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/depend.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/my.def - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/my.def freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/mygetval.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/mygetval.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dll/mysetval.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/mysetval.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dlltest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dlltest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/dtoa.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dtoa.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/env.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/env.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/errcodes.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/errcodes.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/errset.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/errset.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/exit.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/exit.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/fdcach.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/fdcach.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/fileio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/fileio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/foreign.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/foreign.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/forktest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/forktest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/formattm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/formattm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/freeif.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/freeif.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/fsync.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/fsync.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/getai.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/getai.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/gethost.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/gethost.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/getproto.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/getproto.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/i2l.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/i2l.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/initclk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/initclk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/inrval.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/inrval.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/instrumt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/instrumt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/intrio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/intrio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/intrupt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/intrupt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/io_timeout.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/io_timeout.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/io_timeoutk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/io_timeoutk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/io_timeoutu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/io_timeoutu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ioconthr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ioconthr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ipv6.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ipv6.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/join.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/join.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/joinkk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinkk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/joinku.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinku.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/joinuk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinuk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/joinuu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinuu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/layer.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/layer.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/lazyinit.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lazyinit.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/libfilename.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/libfilename.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/lltest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lltest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/lock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/lockfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lockfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/logger.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/logger.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/macbuild/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/makedir.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/makedir.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/many_cv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/many_cv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/mbcs.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/mbcs.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/multiacc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/multiacc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/multiwait.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/multiwait.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/nameshm1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nameshm1.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/nbconn.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nbconn.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/nblayer.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nblayer.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/nonblock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nonblock.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ntioto.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ntioto.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ntoh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ntoh.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/obsints.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/obsints.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/op_2long.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_2long.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/op_excl.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_excl.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/op_filnf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_filnf.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/op_filok.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_filok.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/op_noacc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_noacc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/op_nofil.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_nofil.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/openfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/openfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/parent.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/parent.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/peek.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/peek.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/perf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/perf.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/pipeping.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipeping.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/pipeping2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipeping2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/pipepong.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipepong.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/pipepong2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipepong2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/pipeself.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipeself.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/poll_er.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/poll_er.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/poll_nm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/poll_nm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/poll_to.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/poll_to.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/pollable.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pollable.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prftest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prftest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prftest1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prftest1.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prftest2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prftest2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/primblok.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/primblok.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/priotest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/priotest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/provider.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/provider.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prpoll.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prpoll.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prpollml.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prpollml.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prselect.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prselect.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/prttools.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prttools.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/randseed.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/randseed.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ranfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ranfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/rmdir.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/rmdir.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/runtests.ksh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/runtests.ksh freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/runtests.sh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/runtests.sh freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/runy2ktests.ksh - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/runy2ktests.ksh freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/rwlocktest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/rwlocktest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sel_spd.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sel_spd.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/selct_er.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selct_er.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/selct_nm.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selct_nm.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/selct_to.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selct_to.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/select2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/select2.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/selintr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selintr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sem.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sem.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sema.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sema.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/semaerr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semaerr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/semaerr1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semaerr1.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/semaping.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semaping.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/semapong.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semapong.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sendzlf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sendzlf.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/server_test.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/server_test.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/servr_kk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_kk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/servr_ku.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_ku.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/servr_uk.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_uk.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/servr_uu.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_uu.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/short_thread.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/short_thread.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sigpipe.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sigpipe.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sleep.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sleep.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/socket.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/socket.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sockopt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sockopt.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sockping.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sockping.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sockpong.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sockpong.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sprintf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sprintf.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sproc_ch.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sproc_ch.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/sproc_p.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sproc_p.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/stack.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/stack.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/stat.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/stat.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/stdio.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/stdio.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/str2addr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/str2addr.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/strod.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/strod.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/suspend.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/suspend.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/switch.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/switch.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/system.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/system.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/testbit.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/testbit.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/testfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/testfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/threads.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/threads.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/thrpool_client.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/thrpool_client.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/thrpool_server.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/thrpool_server.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/thruput.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/thruput.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/time.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/time.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/timemac.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/timemac.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/timetest.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/timetest.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/tmoacc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/tmoacc.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/tmocon.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/tmocon.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/tpd.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/tpd.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/udpsrv.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/udpsrv.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/ut_ttools.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ut_ttools.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/vercheck.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/vercheck.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/version.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/version.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/popfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popfile.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/popfind.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popfind.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/popfont.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popfont.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.h freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.ico - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.ico freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.rc - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.rc freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/w16gui/readme.1st - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/readme.1st freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/writev.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/writev.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/xnotify.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/xnotify.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/y2k.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/y2k.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/y2ktmo.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/y2ktmo.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/yield.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/yield.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/pr/tests/zerolen.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/pr/tests/zerolen.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/tools/ - copied from r3743, /freeswitch/trunk/libs/js/nsprpub/tools/ freeswitch/branches/knhor/trunk/libs/js/nsprpub/tools/.cvsignore - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/tools/.cvsignore freeswitch/branches/knhor/trunk/libs/js/nsprpub/tools/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/tools/Makefile.in freeswitch/branches/knhor/trunk/libs/js/nsprpub/tools/httpget.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/tools/httpget.c freeswitch/branches/knhor/trunk/libs/js/nsprpub/tools/tail.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/nsprpub/tools/tail.c freeswitch/branches/knhor/trunk/libs/js/shtool - copied unchanged from r3743, /freeswitch/trunk/libs/js/shtool freeswitch/branches/knhor/trunk/libs/js/src/ - copied from r3743, /freeswitch/trunk/libs/js/src/ freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/ - copied from r3743, /freeswitch/trunk/libs/js/src/fdlibm/ freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_acos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_acos.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_acosh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_acosh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_asin.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_asin.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_atan2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_atan2.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_atanh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_atanh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_cosh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_cosh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_exp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_exp.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_fmod.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_fmod.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_gamma.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_gamma.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_gamma_r.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_gamma_r.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_hypot.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_hypot.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_j0.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_j0.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_j1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_j1.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_jn.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_jn.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_lgamma.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_lgamma.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_lgamma_r.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_lgamma_r.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_log.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_log.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_log10.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_log10.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_pow.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_pow.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_rem_pio2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_rem_pio2.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_remainder.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_remainder.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_scalb.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_scalb.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_sinh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_sinh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/e_sqrt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/e_sqrt.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/fdlibm.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/fdlibm.h freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/k_cos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/k_cos.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/k_rem_pio2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/k_rem_pio2.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/k_sin.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/k_sin.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/k_standard.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/k_standard.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/k_tan.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/k_tan.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_asinh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_asinh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_atan.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_atan.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_cbrt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_cbrt.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_ceil.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_ceil.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_copysign.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_copysign.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_cos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_cos.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_erf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_erf.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_expm1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_expm1.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_fabs.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_fabs.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_finite.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_finite.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_floor.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_floor.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_frexp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_frexp.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_ilogb.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_ilogb.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_isnan.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_isnan.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_ldexp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_ldexp.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_lib_version.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_lib_version.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_log1p.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_log1p.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_logb.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_logb.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_matherr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_matherr.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_modf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_modf.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_nextafter.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_nextafter.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_rint.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_rint.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_scalbn.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_scalbn.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_signgam.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_signgam.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_significand.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_significand.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_sin.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_sin.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_tan.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_tan.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/s_tanh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/s_tanh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_acos.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_acos.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_acosh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_acosh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_asin.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_asin.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_atan2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_atan2.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_atanh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_atanh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_cosh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_cosh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_exp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_exp.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_fmod.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_fmod.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_gamma.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_gamma.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_gamma_r.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_gamma_r.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_hypot.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_hypot.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_j0.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_j0.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_j1.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_j1.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_jn.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_jn.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_lgamma.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_lgamma.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_lgamma_r.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_lgamma_r.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_log.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_log.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_log10.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_log10.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_pow.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_pow.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_remainder.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_remainder.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_scalb.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_scalb.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_sinh.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_sinh.c freeswitch/branches/knhor/trunk/libs/js/src/fdlibm/w_sqrt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/fdlibm/w_sqrt.c freeswitch/branches/knhor/trunk/libs/js/src/js.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/js.c freeswitch/branches/knhor/trunk/libs/js/src/js.msg - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/js.msg freeswitch/branches/knhor/trunk/libs/js/src/jsapi.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsapi.c freeswitch/branches/knhor/trunk/libs/js/src/jsapi.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsapi.h freeswitch/branches/knhor/trunk/libs/js/src/jsarena.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsarena.c freeswitch/branches/knhor/trunk/libs/js/src/jsarena.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsarena.h freeswitch/branches/knhor/trunk/libs/js/src/jsarray.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsarray.c freeswitch/branches/knhor/trunk/libs/js/src/jsarray.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsarray.h freeswitch/branches/knhor/trunk/libs/js/src/jsatom.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsatom.c freeswitch/branches/knhor/trunk/libs/js/src/jsatom.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsatom.h freeswitch/branches/knhor/trunk/libs/js/src/jsautocfg.hw - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsautocfg.hw freeswitch/branches/knhor/trunk/libs/js/src/jsbit.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsbit.h freeswitch/branches/knhor/trunk/libs/js/src/jsbool.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsbool.c freeswitch/branches/knhor/trunk/libs/js/src/jsbool.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsbool.h freeswitch/branches/knhor/trunk/libs/js/src/jsclist.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsclist.h freeswitch/branches/knhor/trunk/libs/js/src/jscntxt.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jscntxt.c freeswitch/branches/knhor/trunk/libs/js/src/jscntxt.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jscntxt.h freeswitch/branches/knhor/trunk/libs/js/src/jscompat.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jscompat.h freeswitch/branches/knhor/trunk/libs/js/src/jsconfig.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsconfig.h freeswitch/branches/knhor/trunk/libs/js/src/jscpucfg.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jscpucfg.c freeswitch/branches/knhor/trunk/libs/js/src/jscpucfg.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jscpucfg.h freeswitch/branches/knhor/trunk/libs/js/src/jsdate.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdate.c freeswitch/branches/knhor/trunk/libs/js/src/jsdate.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdate.h freeswitch/branches/knhor/trunk/libs/js/src/jsdbgapi.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdbgapi.c freeswitch/branches/knhor/trunk/libs/js/src/jsdbgapi.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdbgapi.h freeswitch/branches/knhor/trunk/libs/js/src/jsdhash.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdhash.c freeswitch/branches/knhor/trunk/libs/js/src/jsdhash.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdhash.h freeswitch/branches/knhor/trunk/libs/js/src/jsdso.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdso.c freeswitch/branches/knhor/trunk/libs/js/src/jsdso.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdso.h freeswitch/branches/knhor/trunk/libs/js/src/jsdtoa.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdtoa.c freeswitch/branches/knhor/trunk/libs/js/src/jsdtoa.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsdtoa.h freeswitch/branches/knhor/trunk/libs/js/src/jsemit.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsemit.c freeswitch/branches/knhor/trunk/libs/js/src/jsemit.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsemit.h freeswitch/branches/knhor/trunk/libs/js/src/jsexn.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsexn.c freeswitch/branches/knhor/trunk/libs/js/src/jsexn.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsexn.h freeswitch/branches/knhor/trunk/libs/js/src/jsfile.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsfile.c freeswitch/branches/knhor/trunk/libs/js/src/jsfile.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsfile.h freeswitch/branches/knhor/trunk/libs/js/src/jsfile.msg - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsfile.msg freeswitch/branches/knhor/trunk/libs/js/src/jsfun.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsfun.c freeswitch/branches/knhor/trunk/libs/js/src/jsfun.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsfun.h freeswitch/branches/knhor/trunk/libs/js/src/jsgc.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsgc.c freeswitch/branches/knhor/trunk/libs/js/src/jsgc.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsgc.h freeswitch/branches/knhor/trunk/libs/js/src/jshash.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jshash.c freeswitch/branches/knhor/trunk/libs/js/src/jshash.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jshash.h freeswitch/branches/knhor/trunk/libs/js/src/jsinterp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsinterp.c freeswitch/branches/knhor/trunk/libs/js/src/jsinterp.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsinterp.h freeswitch/branches/knhor/trunk/libs/js/src/jslibmath.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jslibmath.h freeswitch/branches/knhor/trunk/libs/js/src/jslock.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jslock.c freeswitch/branches/knhor/trunk/libs/js/src/jslock.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jslock.h freeswitch/branches/knhor/trunk/libs/js/src/jslog2.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jslog2.c freeswitch/branches/knhor/trunk/libs/js/src/jslong.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jslong.c freeswitch/branches/knhor/trunk/libs/js/src/jslong.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jslong.h freeswitch/branches/knhor/trunk/libs/js/src/jsmath.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsmath.c freeswitch/branches/knhor/trunk/libs/js/src/jsmath.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsmath.h freeswitch/branches/knhor/trunk/libs/js/src/jsnum.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsnum.c freeswitch/branches/knhor/trunk/libs/js/src/jsnum.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsnum.h freeswitch/branches/knhor/trunk/libs/js/src/jsobj.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsobj.c freeswitch/branches/knhor/trunk/libs/js/src/jsobj.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsobj.h freeswitch/branches/knhor/trunk/libs/js/src/jsopcode.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsopcode.c freeswitch/branches/knhor/trunk/libs/js/src/jsopcode.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsopcode.h freeswitch/branches/knhor/trunk/libs/js/src/jsopcode.tbl - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsopcode.tbl freeswitch/branches/knhor/trunk/libs/js/src/jsosdep.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsosdep.h freeswitch/branches/knhor/trunk/libs/js/src/jsotypes.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsotypes.h freeswitch/branches/knhor/trunk/libs/js/src/jsparse.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsparse.c freeswitch/branches/knhor/trunk/libs/js/src/jsparse.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsparse.h freeswitch/branches/knhor/trunk/libs/js/src/jsprf.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsprf.c freeswitch/branches/knhor/trunk/libs/js/src/jsprf.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsprf.h freeswitch/branches/knhor/trunk/libs/js/src/jsprvtd.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsprvtd.h freeswitch/branches/knhor/trunk/libs/js/src/jspubtd.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jspubtd.h freeswitch/branches/knhor/trunk/libs/js/src/jsregexp.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsregexp.c freeswitch/branches/knhor/trunk/libs/js/src/jsregexp.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsregexp.h freeswitch/branches/knhor/trunk/libs/js/src/jsscan.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsscan.c freeswitch/branches/knhor/trunk/libs/js/src/jsscan.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsscan.h freeswitch/branches/knhor/trunk/libs/js/src/jsscope.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsscope.c freeswitch/branches/knhor/trunk/libs/js/src/jsscope.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsscope.h freeswitch/branches/knhor/trunk/libs/js/src/jsscript.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsscript.c freeswitch/branches/knhor/trunk/libs/js/src/jsscript.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsscript.h freeswitch/branches/knhor/trunk/libs/js/src/jsshell.msg - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsshell.msg freeswitch/branches/knhor/trunk/libs/js/src/jsstddef.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsstddef.h freeswitch/branches/knhor/trunk/libs/js/src/jsstr.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsstr.c freeswitch/branches/knhor/trunk/libs/js/src/jsstr.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsstr.h freeswitch/branches/knhor/trunk/libs/js/src/jstypes.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jstypes.h freeswitch/branches/knhor/trunk/libs/js/src/jsutil.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsutil.c freeswitch/branches/knhor/trunk/libs/js/src/jsutil.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsutil.h freeswitch/branches/knhor/trunk/libs/js/src/jsxdrapi.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsxdrapi.c freeswitch/branches/knhor/trunk/libs/js/src/jsxdrapi.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsxdrapi.h freeswitch/branches/knhor/trunk/libs/js/src/jsxml.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsxml.c freeswitch/branches/knhor/trunk/libs/js/src/jsxml.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/jsxml.h freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/ - copied from r3743, /freeswitch/trunk/libs/js/src/perlconnect/ freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/JS.pm - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/JS.pm freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/JS.xs - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/JS.xs freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/MANIFEST - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/MANIFEST freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/Makefile.PL.in - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/Makefile.PL.in freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/PerlConnect.pm - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/PerlConnect.pm freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/jsperl.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/jsperl.c freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/jsperl.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/jsperl.h freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/jsperlpvt.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/jsperlpvt.h freeswitch/branches/knhor/trunk/libs/js/src/perlconnect/typemap - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/perlconnect/typemap freeswitch/branches/knhor/trunk/libs/js/src/prmjtime.c - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/prmjtime.c freeswitch/branches/knhor/trunk/libs/js/src/prmjtime.h - copied unchanged from r3743, /freeswitch/trunk/libs/js/src/prmjtime.h freeswitch/branches/knhor/trunk/libs/pcre/ (props changed) - copied from r3743, /freeswitch/trunk/libs/pcre/ freeswitch/branches/knhor/trunk/libs/pcre/AUTHORS - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/AUTHORS freeswitch/branches/knhor/trunk/libs/pcre/COPYING - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/COPYING freeswitch/branches/knhor/trunk/libs/pcre/ChangeLog - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/ChangeLog freeswitch/branches/knhor/trunk/libs/pcre/INSTALL - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/INSTALL freeswitch/branches/knhor/trunk/libs/pcre/LICENCE - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/LICENCE freeswitch/branches/knhor/trunk/libs/pcre/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/Makefile.in freeswitch/branches/knhor/trunk/libs/pcre/NEWS - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/NEWS freeswitch/branches/knhor/trunk/libs/pcre/NON-UNIX-USE - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/NON-UNIX-USE freeswitch/branches/knhor/trunk/libs/pcre/README - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/README freeswitch/branches/knhor/trunk/libs/pcre/RunGrepTest.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/RunGrepTest.in freeswitch/branches/knhor/trunk/libs/pcre/RunTest.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/RunTest.in freeswitch/branches/knhor/trunk/libs/pcre/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/config.guess freeswitch/branches/knhor/trunk/libs/pcre/config.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/config.h.in freeswitch/branches/knhor/trunk/libs/pcre/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/config.sub freeswitch/branches/knhor/trunk/libs/pcre/configure - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/configure freeswitch/branches/knhor/trunk/libs/pcre/configure.ac - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/configure.ac freeswitch/branches/knhor/trunk/libs/pcre/dftables.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/dftables.c freeswitch/branches/knhor/trunk/libs/pcre/doc/ - copied from r3743, /freeswitch/trunk/libs/pcre/doc/ freeswitch/branches/knhor/trunk/libs/pcre/doc/Tech.Notes - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/Tech.Notes freeswitch/branches/knhor/trunk/libs/pcre/doc/html/ - copied from r3743, /freeswitch/trunk/libs/pcre/doc/html/ freeswitch/branches/knhor/trunk/libs/pcre/doc/html/index.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/index.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_compile.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_compile.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_compile2.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_compile2.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_config.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_config.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_copy_named_substring.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_copy_named_substring.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_copy_substring.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_copy_substring.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_dfa_exec.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_dfa_exec.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_exec.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_exec.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_free_substring.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_free_substring.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_free_substring_list.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_free_substring_list.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_fullinfo.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_fullinfo.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_get_named_substring.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_get_named_substring.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_get_stringnumber.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_get_stringnumber.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_get_stringtable_entries.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_get_stringtable_entries.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_get_substring.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_get_substring.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_get_substring_list.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_get_substring_list.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_info.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_info.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_maketables.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_maketables.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_refcount.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_refcount.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_study.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_study.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcre_version.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcre_version.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcreapi.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcreapi.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrebuild.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrebuild.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrecallout.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrecallout.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrecompat.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrecompat.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrecpp.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrecpp.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcregrep.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcregrep.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrematching.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrematching.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrepartial.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrepartial.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrepattern.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrepattern.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcreperform.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcreperform.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcreposix.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcreposix.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcreprecompile.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcreprecompile.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcresample.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcresample.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcrestack.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcrestack.html freeswitch/branches/knhor/trunk/libs/pcre/doc/html/pcretest.html - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/html/pcretest.html freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre.txt - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre.txt freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_compile.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_compile.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_compile2.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_compile2.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_config.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_config.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_copy_named_substring.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_copy_named_substring.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_copy_substring.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_copy_substring.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_dfa_exec.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_dfa_exec.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_exec.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_exec.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_free_substring.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_free_substring.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_free_substring_list.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_free_substring_list.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_fullinfo.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_fullinfo.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_get_named_substring.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_get_named_substring.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_get_stringnumber.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_get_stringnumber.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_get_stringtable_entries.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_get_stringtable_entries.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_get_substring.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_get_substring.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_get_substring_list.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_get_substring_list.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_info.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_info.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_maketables.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_maketables.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_refcount.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_refcount.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_study.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_study.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcre_version.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcre_version.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcreapi.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcreapi.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrebuild.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrebuild.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrecallout.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrecallout.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrecompat.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrecompat.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrecpp.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrecpp.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcregrep.1 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcregrep.1 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcregrep.txt - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcregrep.txt freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrematching.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrematching.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrepartial.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrepartial.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrepattern.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrepattern.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcreperform.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcreperform.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcreposix.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcreposix.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcreprecompile.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcreprecompile.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcresample.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcresample.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcrestack.3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcrestack.3 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcretest.1 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcretest.1 freeswitch/branches/knhor/trunk/libs/pcre/doc/pcretest.txt - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/pcretest.txt freeswitch/branches/knhor/trunk/libs/pcre/doc/perltest.txt - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/doc/perltest.txt freeswitch/branches/knhor/trunk/libs/pcre/install-sh - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/install-sh freeswitch/branches/knhor/trunk/libs/pcre/libpcre.def - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/libpcre.def freeswitch/branches/knhor/trunk/libs/pcre/libpcre.pc.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/libpcre.pc.in freeswitch/branches/knhor/trunk/libs/pcre/libpcreposix.def - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/libpcreposix.def freeswitch/branches/knhor/trunk/libs/pcre/ltmain.sh - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/ltmain.sh freeswitch/branches/knhor/trunk/libs/pcre/makevp.bat - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/makevp.bat freeswitch/branches/knhor/trunk/libs/pcre/mkinstalldirs - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/mkinstalldirs freeswitch/branches/knhor/trunk/libs/pcre/pcre-config.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre-config.in freeswitch/branches/knhor/trunk/libs/pcre/pcre.def - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre.def freeswitch/branches/knhor/trunk/libs/pcre/pcre.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre.h freeswitch/branches/knhor/trunk/libs/pcre/pcre_compile.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_compile.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_config.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_config.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_dfa_exec.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_dfa_exec.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_exec.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_exec.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_fullinfo.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_fullinfo.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_get.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_get.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_globals.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_globals.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_info.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_info.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_internal.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_internal.h freeswitch/branches/knhor/trunk/libs/pcre/pcre_maketables.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_maketables.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_ord2utf8.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_ord2utf8.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_printint.src - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_printint.src freeswitch/branches/knhor/trunk/libs/pcre/pcre_refcount.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_refcount.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_scanner.cc - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_scanner.cc freeswitch/branches/knhor/trunk/libs/pcre/pcre_scanner.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_scanner.h freeswitch/branches/knhor/trunk/libs/pcre/pcre_scanner_unittest.cc - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_scanner_unittest.cc freeswitch/branches/knhor/trunk/libs/pcre/pcre_stringpiece.cc - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_stringpiece.cc freeswitch/branches/knhor/trunk/libs/pcre/pcre_stringpiece.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_stringpiece.h.in freeswitch/branches/knhor/trunk/libs/pcre/pcre_stringpiece_unittest.cc - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_stringpiece_unittest.cc freeswitch/branches/knhor/trunk/libs/pcre/pcre_study.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_study.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_tables.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_tables.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_try_flipped.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_try_flipped.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_ucp_searchfuncs.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_ucp_searchfuncs.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_valid_utf8.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_valid_utf8.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_version.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_version.c freeswitch/branches/knhor/trunk/libs/pcre/pcre_xclass.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcre_xclass.c freeswitch/branches/knhor/trunk/libs/pcre/pcrecpp.cc - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcrecpp.cc freeswitch/branches/knhor/trunk/libs/pcre/pcrecpp.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcrecpp.h freeswitch/branches/knhor/trunk/libs/pcre/pcrecpp_unittest.cc - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcrecpp_unittest.cc freeswitch/branches/knhor/trunk/libs/pcre/pcrecpparg.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcrecpparg.h.in freeswitch/branches/knhor/trunk/libs/pcre/pcredemo.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcredemo.c freeswitch/branches/knhor/trunk/libs/pcre/pcregrep.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcregrep.c freeswitch/branches/knhor/trunk/libs/pcre/pcreposix.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcreposix.c freeswitch/branches/knhor/trunk/libs/pcre/pcreposix.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcreposix.h freeswitch/branches/knhor/trunk/libs/pcre/pcretest.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/pcretest.c freeswitch/branches/knhor/trunk/libs/pcre/perltest - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/perltest freeswitch/branches/knhor/trunk/libs/pcre/testdata/ - copied from r3743, /freeswitch/trunk/libs/pcre/testdata/ freeswitch/branches/knhor/trunk/libs/pcre/testdata/grepinput - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/grepinput freeswitch/branches/knhor/trunk/libs/pcre/testdata/grepinputx - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/grepinputx freeswitch/branches/knhor/trunk/libs/pcre/testdata/greplist - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/greplist freeswitch/branches/knhor/trunk/libs/pcre/testdata/grepoutput - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/grepoutput freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput1 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput1 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput2 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput2 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput3 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput4 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput4 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput5 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput5 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput6 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput6 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput7 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput7 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput8 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput8 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testinput9 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testinput9 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput1 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput1 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput2 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput2 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput3 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput3 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput4 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput4 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput5 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput5 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput6 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput6 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput7 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput7 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput8 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput8 freeswitch/branches/knhor/trunk/libs/pcre/testdata/testoutput9 - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/testdata/testoutput9 freeswitch/branches/knhor/trunk/libs/pcre/ucp.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/ucp.h freeswitch/branches/knhor/trunk/libs/pcre/ucpinternal.h - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/ucpinternal.h freeswitch/branches/knhor/trunk/libs/pcre/ucptable.c - copied unchanged from r3743, /freeswitch/trunk/libs/pcre/ucptable.c freeswitch/branches/knhor/trunk/libs/sqlite/ (props changed) - copied from r3743, /freeswitch/trunk/libs/sqlite/ freeswitch/branches/knhor/trunk/libs/sqlite/Makefile.in - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/Makefile.in freeswitch/branches/knhor/trunk/libs/sqlite/Makefile.linux-gcc - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/Makefile.linux-gcc freeswitch/branches/knhor/trunk/libs/sqlite/README - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/README freeswitch/branches/knhor/trunk/libs/sqlite/VERSION - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/VERSION freeswitch/branches/knhor/trunk/libs/sqlite/aclocal.m4 - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/aclocal.m4 freeswitch/branches/knhor/trunk/libs/sqlite/addopcodes.awk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/addopcodes.awk freeswitch/branches/knhor/trunk/libs/sqlite/art/ - copied from r3743, /freeswitch/trunk/libs/sqlite/art/ freeswitch/branches/knhor/trunk/libs/sqlite/art/2005osaward.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/art/2005osaward.gif freeswitch/branches/knhor/trunk/libs/sqlite/art/SQLite.eps - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/art/SQLite.eps freeswitch/branches/knhor/trunk/libs/sqlite/art/SQLite.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/art/SQLite.gif freeswitch/branches/knhor/trunk/libs/sqlite/art/SQLiteLogo3.tiff - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/art/SQLiteLogo3.tiff freeswitch/branches/knhor/trunk/libs/sqlite/art/tmp/ - copied from r3743, /freeswitch/trunk/libs/sqlite/art/tmp/ freeswitch/branches/knhor/trunk/libs/sqlite/config.guess - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/config.guess freeswitch/branches/knhor/trunk/libs/sqlite/config.sub - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/config.sub freeswitch/branches/knhor/trunk/libs/sqlite/configure - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/configure freeswitch/branches/knhor/trunk/libs/sqlite/configure.ac - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/configure.ac freeswitch/branches/knhor/trunk/libs/sqlite/contrib/ - copied from r3743, /freeswitch/trunk/libs/sqlite/contrib/ freeswitch/branches/knhor/trunk/libs/sqlite/contrib/sqlitecon.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/contrib/sqlitecon.tcl freeswitch/branches/knhor/trunk/libs/sqlite/doc/ - copied from r3743, /freeswitch/trunk/libs/sqlite/doc/ freeswitch/branches/knhor/trunk/libs/sqlite/doc/lemon.html - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/doc/lemon.html freeswitch/branches/knhor/trunk/libs/sqlite/doc/report1.txt - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/doc/report1.txt freeswitch/branches/knhor/trunk/libs/sqlite/ext/ - copied from r3743, /freeswitch/trunk/libs/sqlite/ext/ freeswitch/branches/knhor/trunk/libs/sqlite/ext/README.txt - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/README.txt freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/ - copied from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/ freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/README.txt - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/README.txt freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1.c freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1.h freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1_hash.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1_hash.c freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1_hash.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1_hash.h freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1_porter.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1_porter.c freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1_tokenizer.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1_tokenizer.h freeswitch/branches/knhor/trunk/libs/sqlite/ext/fts1/fts1_tokenizer1.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ext/fts1/fts1_tokenizer1.c freeswitch/branches/knhor/trunk/libs/sqlite/install-sh - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/install-sh freeswitch/branches/knhor/trunk/libs/sqlite/ltmain.sh - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/ltmain.sh freeswitch/branches/knhor/trunk/libs/sqlite/main.mk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/main.mk freeswitch/branches/knhor/trunk/libs/sqlite/mkdll.sh - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/mkdll.sh freeswitch/branches/knhor/trunk/libs/sqlite/mkopcodec.awk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/mkopcodec.awk freeswitch/branches/knhor/trunk/libs/sqlite/mkopcodeh.awk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/mkopcodeh.awk freeswitch/branches/knhor/trunk/libs/sqlite/mkso.sh - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/mkso.sh freeswitch/branches/knhor/trunk/libs/sqlite/notes/ - copied from r3743, /freeswitch/trunk/libs/sqlite/notes/ freeswitch/branches/knhor/trunk/libs/sqlite/publish.sh - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/publish.sh freeswitch/branches/knhor/trunk/libs/sqlite/spec.template - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/spec.template freeswitch/branches/knhor/trunk/libs/sqlite/sqlite.pc.in - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/sqlite.pc.in freeswitch/branches/knhor/trunk/libs/sqlite/sqlite3.1 - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/sqlite3.1 freeswitch/branches/knhor/trunk/libs/sqlite/sqlite3.pc.in - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/sqlite3.pc.in freeswitch/branches/knhor/trunk/libs/sqlite/src/ - copied from r3743, /freeswitch/trunk/libs/sqlite/src/ freeswitch/branches/knhor/trunk/libs/sqlite/src/alter.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/alter.c freeswitch/branches/knhor/trunk/libs/sqlite/src/analyze.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/analyze.c freeswitch/branches/knhor/trunk/libs/sqlite/src/attach.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/attach.c freeswitch/branches/knhor/trunk/libs/sqlite/src/auth.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/auth.c freeswitch/branches/knhor/trunk/libs/sqlite/src/btree.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/btree.c freeswitch/branches/knhor/trunk/libs/sqlite/src/btree.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/btree.h freeswitch/branches/knhor/trunk/libs/sqlite/src/build.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/build.c freeswitch/branches/knhor/trunk/libs/sqlite/src/callback.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/callback.c freeswitch/branches/knhor/trunk/libs/sqlite/src/complete.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/complete.c freeswitch/branches/knhor/trunk/libs/sqlite/src/date.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/date.c freeswitch/branches/knhor/trunk/libs/sqlite/src/delete.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/delete.c freeswitch/branches/knhor/trunk/libs/sqlite/src/ex/ - copied from r3743, /freeswitch/trunk/libs/sqlite/src/ex/ freeswitch/branches/knhor/trunk/libs/sqlite/src/expr.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/expr.c freeswitch/branches/knhor/trunk/libs/sqlite/src/func.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/func.c freeswitch/branches/knhor/trunk/libs/sqlite/src/hash.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/hash.c freeswitch/branches/knhor/trunk/libs/sqlite/src/hash.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/hash.h freeswitch/branches/knhor/trunk/libs/sqlite/src/insert.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/insert.c freeswitch/branches/knhor/trunk/libs/sqlite/src/legacy.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/legacy.c freeswitch/branches/knhor/trunk/libs/sqlite/src/loadext.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/loadext.c freeswitch/branches/knhor/trunk/libs/sqlite/src/main.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/main.c freeswitch/branches/knhor/trunk/libs/sqlite/src/os.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os.c freeswitch/branches/knhor/trunk/libs/sqlite/src/os.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os.h freeswitch/branches/knhor/trunk/libs/sqlite/src/os_common.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os_common.h freeswitch/branches/knhor/trunk/libs/sqlite/src/os_os2.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os_os2.c freeswitch/branches/knhor/trunk/libs/sqlite/src/os_os2.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os_os2.h freeswitch/branches/knhor/trunk/libs/sqlite/src/os_unix.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os_unix.c freeswitch/branches/knhor/trunk/libs/sqlite/src/os_win.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/os_win.c freeswitch/branches/knhor/trunk/libs/sqlite/src/pager.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/pager.c freeswitch/branches/knhor/trunk/libs/sqlite/src/pager.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/pager.h freeswitch/branches/knhor/trunk/libs/sqlite/src/parse.y - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/parse.y freeswitch/branches/knhor/trunk/libs/sqlite/src/pragma.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/pragma.c freeswitch/branches/knhor/trunk/libs/sqlite/src/prepare.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/prepare.c freeswitch/branches/knhor/trunk/libs/sqlite/src/printf.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/printf.c freeswitch/branches/knhor/trunk/libs/sqlite/src/random.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/random.c freeswitch/branches/knhor/trunk/libs/sqlite/src/select.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/select.c freeswitch/branches/knhor/trunk/libs/sqlite/src/shell.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/shell.c freeswitch/branches/knhor/trunk/libs/sqlite/src/sqlite.h.in - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/sqlite.h.in freeswitch/branches/knhor/trunk/libs/sqlite/src/sqlite3ext.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/sqlite3ext.h freeswitch/branches/knhor/trunk/libs/sqlite/src/sqliteInt.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/sqliteInt.h freeswitch/branches/knhor/trunk/libs/sqlite/src/table.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/table.c freeswitch/branches/knhor/trunk/libs/sqlite/src/tclsqlite.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/tclsqlite.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test1.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test1.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test2.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test2.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test3.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test3.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test4.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test4.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test5.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test5.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test6.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test6.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test7.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test7.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test8.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test8.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_async.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_async.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_autoext.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_autoext.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_loadext.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_loadext.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_md5.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_md5.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_schema.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_schema.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_server.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_server.c freeswitch/branches/knhor/trunk/libs/sqlite/src/test_tclvar.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/test_tclvar.c freeswitch/branches/knhor/trunk/libs/sqlite/src/tokenize.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/tokenize.c freeswitch/branches/knhor/trunk/libs/sqlite/src/trigger.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/trigger.c freeswitch/branches/knhor/trunk/libs/sqlite/src/update.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/update.c freeswitch/branches/knhor/trunk/libs/sqlite/src/utf.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/utf.c freeswitch/branches/knhor/trunk/libs/sqlite/src/util.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/util.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vacuum.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vacuum.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbe.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbe.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbe.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbe.h freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbeInt.h - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbeInt.h freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbeapi.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbeapi.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbeaux.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbeaux.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbefifo.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbefifo.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vdbemem.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vdbemem.c freeswitch/branches/knhor/trunk/libs/sqlite/src/vtab.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/vtab.c freeswitch/branches/knhor/trunk/libs/sqlite/src/where.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/src/where.c freeswitch/branches/knhor/trunk/libs/sqlite/tclinstaller.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tclinstaller.tcl freeswitch/branches/knhor/trunk/libs/sqlite/test/ - copied from r3743, /freeswitch/trunk/libs/sqlite/test/ freeswitch/branches/knhor/trunk/libs/sqlite/test/aggerror.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/aggerror.test freeswitch/branches/knhor/trunk/libs/sqlite/test/all.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/all.test freeswitch/branches/knhor/trunk/libs/sqlite/test/alter.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/alter.test freeswitch/branches/knhor/trunk/libs/sqlite/test/alter2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/alter2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/alter3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/alter3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/altermalloc.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/altermalloc.test freeswitch/branches/knhor/trunk/libs/sqlite/test/analyze.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/analyze.test freeswitch/branches/knhor/trunk/libs/sqlite/test/async.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/async.test freeswitch/branches/knhor/trunk/libs/sqlite/test/async2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/async2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/attach.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/attach.test freeswitch/branches/knhor/trunk/libs/sqlite/test/attach2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/attach2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/attach3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/attach3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/attachmalloc.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/attachmalloc.test freeswitch/branches/knhor/trunk/libs/sqlite/test/auth.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/auth.test freeswitch/branches/knhor/trunk/libs/sqlite/test/auth2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/auth2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/autoinc.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/autoinc.test freeswitch/branches/knhor/trunk/libs/sqlite/test/autovacuum.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/autovacuum.test freeswitch/branches/knhor/trunk/libs/sqlite/test/autovacuum_crash.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/autovacuum_crash.test freeswitch/branches/knhor/trunk/libs/sqlite/test/autovacuum_ioerr.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/autovacuum_ioerr.test freeswitch/branches/knhor/trunk/libs/sqlite/test/autovacuum_ioerr2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/autovacuum_ioerr2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/avtrans.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/avtrans.test freeswitch/branches/knhor/trunk/libs/sqlite/test/between.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/between.test freeswitch/branches/knhor/trunk/libs/sqlite/test/bigfile.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/bigfile.test freeswitch/branches/knhor/trunk/libs/sqlite/test/bigrow.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/bigrow.test freeswitch/branches/knhor/trunk/libs/sqlite/test/bind.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/bind.test freeswitch/branches/knhor/trunk/libs/sqlite/test/bindxfer.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/bindxfer.test freeswitch/branches/knhor/trunk/libs/sqlite/test/blob.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/blob.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree7.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree7.test freeswitch/branches/knhor/trunk/libs/sqlite/test/btree8.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/btree8.test freeswitch/branches/knhor/trunk/libs/sqlite/test/busy.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/busy.test freeswitch/branches/knhor/trunk/libs/sqlite/test/capi2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/capi2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/capi3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/capi3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/capi3b.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/capi3b.test freeswitch/branches/knhor/trunk/libs/sqlite/test/cast.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/cast.test freeswitch/branches/knhor/trunk/libs/sqlite/test/check.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/check.test freeswitch/branches/knhor/trunk/libs/sqlite/test/collate1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/collate1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/collate2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/collate2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/collate3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/collate3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/collate4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/collate4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/collate5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/collate5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/collate6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/collate6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/colmeta.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/colmeta.test freeswitch/branches/knhor/trunk/libs/sqlite/test/conflict.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/conflict.test freeswitch/branches/knhor/trunk/libs/sqlite/test/corrupt.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/corrupt.test freeswitch/branches/knhor/trunk/libs/sqlite/test/corrupt2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/corrupt2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/crash.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/crash.test freeswitch/branches/knhor/trunk/libs/sqlite/test/date.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/date.test freeswitch/branches/knhor/trunk/libs/sqlite/test/default.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/default.test freeswitch/branches/knhor/trunk/libs/sqlite/test/delete.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/delete.test freeswitch/branches/knhor/trunk/libs/sqlite/test/delete2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/delete2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/delete3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/delete3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/descidx1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/descidx1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/descidx2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/descidx2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/descidx3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/descidx3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/diskfull.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/diskfull.test freeswitch/branches/knhor/trunk/libs/sqlite/test/distinctagg.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/distinctagg.test freeswitch/branches/knhor/trunk/libs/sqlite/test/enc.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/enc.test freeswitch/branches/knhor/trunk/libs/sqlite/test/enc2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/enc2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/enc3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/enc3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/expr.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/expr.test freeswitch/branches/knhor/trunk/libs/sqlite/test/fkey1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/fkey1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/format4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/format4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/fts1a.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/fts1a.test freeswitch/branches/knhor/trunk/libs/sqlite/test/fts1b.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/fts1b.test freeswitch/branches/knhor/trunk/libs/sqlite/test/fts1c.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/fts1c.test freeswitch/branches/knhor/trunk/libs/sqlite/test/fts1d.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/fts1d.test freeswitch/branches/knhor/trunk/libs/sqlite/test/fts1porter.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/fts1porter.test freeswitch/branches/knhor/trunk/libs/sqlite/test/func.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/func.test freeswitch/branches/knhor/trunk/libs/sqlite/test/hook.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/hook.test freeswitch/branches/knhor/trunk/libs/sqlite/test/in.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/in.test freeswitch/branches/knhor/trunk/libs/sqlite/test/index.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/index.test freeswitch/branches/knhor/trunk/libs/sqlite/test/index2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/index2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/index3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/index3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/insert.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/insert.test freeswitch/branches/knhor/trunk/libs/sqlite/test/insert2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/insert2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/insert3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/insert3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/interrupt.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/interrupt.test freeswitch/branches/knhor/trunk/libs/sqlite/test/intpkey.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/intpkey.test freeswitch/branches/knhor/trunk/libs/sqlite/test/ioerr.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/ioerr.test freeswitch/branches/knhor/trunk/libs/sqlite/test/join.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/join.test freeswitch/branches/knhor/trunk/libs/sqlite/test/join2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/join2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/join3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/join3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/join4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/join4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/join5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/join5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/journal1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/journal1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/lastinsert.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/lastinsert.test freeswitch/branches/knhor/trunk/libs/sqlite/test/laststmtchanges.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/laststmtchanges.test freeswitch/branches/knhor/trunk/libs/sqlite/test/like.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/like.test freeswitch/branches/knhor/trunk/libs/sqlite/test/limit.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/limit.test freeswitch/branches/knhor/trunk/libs/sqlite/test/loadext.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/loadext.test freeswitch/branches/knhor/trunk/libs/sqlite/test/loadext2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/loadext2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/lock.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/lock.test freeswitch/branches/knhor/trunk/libs/sqlite/test/lock2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/lock2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/lock3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/lock3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/main.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/main.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/malloc7.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/malloc7.test freeswitch/branches/knhor/trunk/libs/sqlite/test/manydb.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/manydb.test freeswitch/branches/knhor/trunk/libs/sqlite/test/memdb.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/memdb.test freeswitch/branches/knhor/trunk/libs/sqlite/test/memleak.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/memleak.test freeswitch/branches/knhor/trunk/libs/sqlite/test/minmax.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/minmax.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misc1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misc1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misc2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misc2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misc3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misc3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misc4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misc4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misc5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misc5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misc6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misc6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/misuse.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/misuse.test freeswitch/branches/knhor/trunk/libs/sqlite/test/notnull.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/notnull.test freeswitch/branches/knhor/trunk/libs/sqlite/test/null.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/null.test freeswitch/branches/knhor/trunk/libs/sqlite/test/pager.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/pager.test freeswitch/branches/knhor/trunk/libs/sqlite/test/pager2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/pager2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/pager3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/pager3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/pagesize.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/pagesize.test freeswitch/branches/knhor/trunk/libs/sqlite/test/pragma.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/pragma.test freeswitch/branches/knhor/trunk/libs/sqlite/test/printf.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/printf.test freeswitch/branches/knhor/trunk/libs/sqlite/test/progress.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/progress.test freeswitch/branches/knhor/trunk/libs/sqlite/test/quick.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/quick.test freeswitch/branches/knhor/trunk/libs/sqlite/test/quote.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/quote.test freeswitch/branches/knhor/trunk/libs/sqlite/test/reindex.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/reindex.test freeswitch/branches/knhor/trunk/libs/sqlite/test/rollback.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/rollback.test freeswitch/branches/knhor/trunk/libs/sqlite/test/rowid.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/rowid.test freeswitch/branches/knhor/trunk/libs/sqlite/test/safety.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/safety.test freeswitch/branches/knhor/trunk/libs/sqlite/test/schema.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/schema.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/select7.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/select7.test freeswitch/branches/knhor/trunk/libs/sqlite/test/server1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/server1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/shared.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/shared.test freeswitch/branches/knhor/trunk/libs/sqlite/test/shared2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/shared2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/shared3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/shared3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/shared_err.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/shared_err.test freeswitch/branches/knhor/trunk/libs/sqlite/test/sort.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/sort.test freeswitch/branches/knhor/trunk/libs/sqlite/test/subquery.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/subquery.test freeswitch/branches/knhor/trunk/libs/sqlite/test/subselect.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/subselect.test freeswitch/branches/knhor/trunk/libs/sqlite/test/sync.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/sync.test freeswitch/branches/knhor/trunk/libs/sqlite/test/table.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/table.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tableapi.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tableapi.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tclsqlite.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tclsqlite.test freeswitch/branches/knhor/trunk/libs/sqlite/test/temptable.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/temptable.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tester.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tester.tcl freeswitch/branches/knhor/trunk/libs/sqlite/test/thread1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/thread1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/thread2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/thread2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/threadtest1.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/threadtest1.c freeswitch/branches/knhor/trunk/libs/sqlite/test/threadtest2.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/threadtest2.c freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1435.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1435.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1443.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1443.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1444.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1444.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1449.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1449.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1473.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1473.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1501.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1501.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1512.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1512.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1514.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1514.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1536.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1536.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1537.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1537.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1567.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1567.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1644.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1644.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1667.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1667.test freeswitch/branches/knhor/trunk/libs/sqlite/test/tkt1873.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/tkt1873.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trace.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trace.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trans.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trans.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger7.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger7.test freeswitch/branches/knhor/trunk/libs/sqlite/test/trigger8.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/trigger8.test freeswitch/branches/knhor/trunk/libs/sqlite/test/types.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/types.test freeswitch/branches/knhor/trunk/libs/sqlite/test/types2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/types2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/types3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/types3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/unique.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/unique.test freeswitch/branches/knhor/trunk/libs/sqlite/test/update.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/update.test freeswitch/branches/knhor/trunk/libs/sqlite/test/utf16.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/utf16.test freeswitch/branches/knhor/trunk/libs/sqlite/test/utf16align.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/utf16align.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vacuum.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vacuum.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vacuum2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vacuum2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/varint.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/varint.test freeswitch/branches/knhor/trunk/libs/sqlite/test/view.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/view.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab1.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab1.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab3.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab4.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab4.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab5.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab5.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab6.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab6.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab7.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab7.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab9.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab9.test freeswitch/branches/knhor/trunk/libs/sqlite/test/vtab_err.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/vtab_err.test freeswitch/branches/knhor/trunk/libs/sqlite/test/where.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/where.test freeswitch/branches/knhor/trunk/libs/sqlite/test/where2.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/where2.test freeswitch/branches/knhor/trunk/libs/sqlite/test/where3.test - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/test/where3.test freeswitch/branches/knhor/trunk/libs/sqlite/tool/ - copied from r3743, /freeswitch/trunk/libs/sqlite/tool/ freeswitch/branches/knhor/trunk/libs/sqlite/tool/diffdb.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/diffdb.c freeswitch/branches/knhor/trunk/libs/sqlite/tool/lemon.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/lemon.c freeswitch/branches/knhor/trunk/libs/sqlite/tool/lempar.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/lempar.c freeswitch/branches/knhor/trunk/libs/sqlite/tool/memleak.awk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/memleak.awk freeswitch/branches/knhor/trunk/libs/sqlite/tool/memleak2.awk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/memleak2.awk freeswitch/branches/knhor/trunk/libs/sqlite/tool/memleak3.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/memleak3.tcl freeswitch/branches/knhor/trunk/libs/sqlite/tool/mkkeywordhash.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/mkkeywordhash.c freeswitch/branches/knhor/trunk/libs/sqlite/tool/mkopts.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/mkopts.tcl freeswitch/branches/knhor/trunk/libs/sqlite/tool/omittest.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/omittest.tcl freeswitch/branches/knhor/trunk/libs/sqlite/tool/opcodeDoc.awk - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/opcodeDoc.awk freeswitch/branches/knhor/trunk/libs/sqlite/tool/report1.txt - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/report1.txt freeswitch/branches/knhor/trunk/libs/sqlite/tool/showdb.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/showdb.c freeswitch/branches/knhor/trunk/libs/sqlite/tool/showjournal.c - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/showjournal.c freeswitch/branches/knhor/trunk/libs/sqlite/tool/space_used.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/space_used.tcl freeswitch/branches/knhor/trunk/libs/sqlite/tool/spaceanal.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/spaceanal.tcl freeswitch/branches/knhor/trunk/libs/sqlite/tool/speedtest.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/speedtest.tcl freeswitch/branches/knhor/trunk/libs/sqlite/tool/speedtest2.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/tool/speedtest2.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/ - copied from r3743, /freeswitch/trunk/libs/sqlite/www/ freeswitch/branches/knhor/trunk/libs/sqlite/www/arch.fig - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch.fig freeswitch/branches/knhor/trunk/libs/sqlite/www/arch.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/arch.png - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch.png freeswitch/branches/knhor/trunk/libs/sqlite/www/arch.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/arch2.fig - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch2.fig freeswitch/branches/knhor/trunk/libs/sqlite/www/arch2.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch2.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/arch2b.fig - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/arch2b.fig freeswitch/branches/knhor/trunk/libs/sqlite/www/audit.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/audit.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/autoinc.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/autoinc.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/c_interface.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/c_interface.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/capi3.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/capi3.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/capi3ref.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/capi3ref.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/changes.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/changes.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/common.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/common.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/compile.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/compile.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/conflict.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/conflict.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/copyright-release.html - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/copyright-release.html freeswitch/branches/knhor/trunk/libs/sqlite/www/copyright-release.pdf - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/copyright-release.pdf freeswitch/branches/knhor/trunk/libs/sqlite/www/copyright.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/copyright.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/datatype3.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/datatype3.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/datatypes.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/datatypes.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/different.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/different.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/direct1b.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/direct1b.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/docs.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/docs.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/download.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/download.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/dynload.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/dynload.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/faq.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/faq.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/fileformat.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/fileformat.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/formatchng.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/formatchng.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/fullscanb.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/fullscanb.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/index-ex1-x-b.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/index-ex1-x-b.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/index.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/index.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/indirect1b1.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/indirect1b1.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/lang.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/lang.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/lockingv3.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/lockingv3.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/mingw.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/mingw.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/nulls.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/nulls.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/oldnews.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/oldnews.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/omitted.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/omitted.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/opcode.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/opcode.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/optimizer.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/optimizer.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/optimizing.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/optimizing.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/optoverview.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/optoverview.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/pragma.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/pragma.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/quickstart.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/quickstart.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/shared.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/shared.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/sharedcache.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/sharedcache.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/speed.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/speed.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/sqlite.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/sqlite.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/support.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/support.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/table-ex1b2.gif - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/table-ex1b2.gif freeswitch/branches/knhor/trunk/libs/sqlite/www/tclsqlite.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/tclsqlite.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/vdbe.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/vdbe.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/version3.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/version3.tcl freeswitch/branches/knhor/trunk/libs/sqlite/www/whentouse.tcl - copied unchanged from r3743, /freeswitch/trunk/libs/sqlite/www/whentouse.tcl freeswitch/branches/knhor/trunk/libs/win32/sqlite/keywordhash.h - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/keywordhash.h freeswitch/branches/knhor/trunk/libs/win32/sqlite/opcodes.c - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/opcodes.c freeswitch/branches/knhor/trunk/libs/win32/sqlite/opcodes.h - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/opcodes.h freeswitch/branches/knhor/trunk/libs/win32/sqlite/parse.c - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/parse.c freeswitch/branches/knhor/trunk/libs/win32/sqlite/parse.h - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/parse.h freeswitch/branches/knhor/trunk/libs/win32/sqlite/sqlite3.def - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/sqlite3.def freeswitch/branches/knhor/trunk/libs/win32/sqlite/sqlite3.h - copied unchanged from r3743, /freeswitch/trunk/libs/win32/sqlite/sqlite3.h freeswitch/branches/knhor/trunk/scripts/pizza.js - copied unchanged from r3743, /freeswitch/trunk/scripts/pizza.js Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/Freeswitch.sln freeswitch/branches/knhor/trunk/INSTALL freeswitch/branches/knhor/trunk/Makefile.am freeswitch/branches/knhor/trunk/Makefile.in freeswitch/branches/knhor/trunk/build/buildlib.sh freeswitch/branches/knhor/trunk/build/config/compile freeswitch/branches/knhor/trunk/build/config/config.guess freeswitch/branches/knhor/trunk/build/config/config.sub freeswitch/branches/knhor/trunk/build/config/depcomp freeswitch/branches/knhor/trunk/build/config/install-sh freeswitch/branches/knhor/trunk/build/config/ltmain.sh freeswitch/branches/knhor/trunk/build/config/missing freeswitch/branches/knhor/trunk/configure freeswitch/branches/knhor/trunk/configure.in freeswitch/branches/knhor/trunk/generic_mod.mk freeswitch/branches/knhor/trunk/libs/iax/INSTALL freeswitch/branches/knhor/trunk/libs/iax/Makefile.in freeswitch/branches/knhor/trunk/libs/iax/aclocal.m4 freeswitch/branches/knhor/trunk/libs/iax/build/config.guess freeswitch/branches/knhor/trunk/libs/iax/build/config.sub freeswitch/branches/knhor/trunk/libs/iax/build/depcomp freeswitch/branches/knhor/trunk/libs/iax/build/install-sh freeswitch/branches/knhor/trunk/libs/iax/build/ltmain.sh freeswitch/branches/knhor/trunk/libs/iax/build/missing freeswitch/branches/knhor/trunk/libs/iax/configure freeswitch/branches/knhor/trunk/libs/iax/configure.in freeswitch/branches/knhor/trunk/libs/iax/src/Makefile.in freeswitch/branches/knhor/trunk/libs/iax/src/iax.c freeswitch/branches/knhor/trunk/libs/libdingaling/INSTALL freeswitch/branches/knhor/trunk/libs/libdingaling/Makefile.in freeswitch/branches/knhor/trunk/libs/libdingaling/aclocal.m4 freeswitch/branches/knhor/trunk/libs/libdingaling/build/compile freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.guess freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.sub freeswitch/branches/knhor/trunk/libs/libdingaling/build/depcomp freeswitch/branches/knhor/trunk/libs/libdingaling/build/install-sh freeswitch/branches/knhor/trunk/libs/libdingaling/build/ltmain.sh freeswitch/branches/knhor/trunk/libs/libdingaling/build/missing freeswitch/branches/knhor/trunk/libs/libdingaling/configure freeswitch/branches/knhor/trunk/libs/libdingaling/configure.in freeswitch/branches/knhor/trunk/libs/libdingaling/src/config.h.in freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.c freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.h freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj freeswitch/branches/knhor/trunk/libs/win32/apr-util/xml.vcproj freeswitch/branches/knhor/trunk/libs/win32/apr/libapr.vcproj freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj freeswitch/branches/knhor/trunk/libs/win32/pcre/libpcre.vcproj freeswitch/branches/knhor/trunk/libs/win32/pcre/pcre_chartables.c.vcproj freeswitch/branches/knhor/trunk/libs/win32/sqlite/sqlite.vcproj freeswitch/branches/knhor/trunk/src/include/switch.h freeswitch/branches/knhor/trunk/src/include/switch_am_config.h.in freeswitch/branches/knhor/trunk/src/include/switch_channel.h freeswitch/branches/knhor/trunk/src/include/switch_core.h freeswitch/branches/knhor/trunk/src/include/switch_event.h freeswitch/branches/knhor/trunk/src/include/switch_ivr.h freeswitch/branches/knhor/trunk/src/include/switch_log.h freeswitch/branches/knhor/trunk/src/include/switch_platform.h freeswitch/branches/knhor/trunk/src/include/switch_types.h freeswitch/branches/knhor/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g711/Makefile freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/sm.mak freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile freeswitch/branches/knhor/trunk/src/switch_channel.c freeswitch/branches/knhor/trunk/src/switch_console.c freeswitch/branches/knhor/trunk/src/switch_core.c freeswitch/branches/knhor/trunk/src/switch_ivr.c freeswitch/branches/knhor/trunk/src/switch_loadable_module.c freeswitch/branches/knhor/trunk/src/switch_log.c freeswitch/branches/knhor/trunk/src/switch_rtp.c Log: Merged revisions 3679-3743 via svnmerge from trunk without conference changes Modified: freeswitch/branches/knhor/trunk/Freeswitch.sln ============================================================================== --- freeswitch/branches/knhor/trunk/Freeswitch.sln (original) +++ freeswitch/branches/knhor/trunk/Freeswitch.sln Tue Dec 19 22:00:59 2006 @@ -3,22 +3,22 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" @@ -28,42 +28,42 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" ProjectSection(ProjectDependencies) = postProject - {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xmpp_event", "src\mod\event_handlers\mod_xmpp_event\mod_xmpp_event.vcproj", "{F10BE67C-A8FF-4CB2-AF29-D46D2590DC59}" ProjectSection(ProjectDependencies) = postProject - {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "src\mod\applications\mod_bridgecall\mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_test", "src\mod\event_handlers\mod_event_test\mod_event_test.vcproj", "{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" @@ -73,28 +73,28 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "src\mod\applications\mod_playback\mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" ProjectSection(ProjectDependencies) = postProject - {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} = {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} = {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" @@ -104,24 +104,24 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "src\mod\timers\mod_softtimer\mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectSection(ProjectDependencies) = postProject - {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" @@ -144,19 +144,19 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ivrtest", "src\mod\applications\mod_ivrtest\mod_ivrtest.vcproj", "{419AA391-5F3F-4BFE-A869-9D154D62A792}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}" @@ -170,28 +170,28 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}" ProjectSection(ProjectDependencies) = postProject - {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}" @@ -200,15 +200,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" @@ -230,36 +229,36 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_echo", "src\mod\applications\mod_echo\mod_echo.vcproj", "{0E2C6395-13B9-46E5-9264-8859D346018D}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}" ProjectSection(ProjectDependencies) = postProject - {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" ProjectSection(ProjectDependencies) = postProject - {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}" @@ -273,56 +272,56 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} - {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr", "src\mod\event_handlers\mod_cdr\mod_cdr.vcproj", "{3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" @@ -341,63 +340,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "libs\win32\sqlite\sqlite.vcproj", "{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}" - ProjectSection(ProjectDependencies) = postProject - {6B9217D6-8259-4817-B8A5-2FEAD349EDEB} = {6B9217D6-8259-4817-B8A5-2FEAD349EDEB} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "libs\win32\pcre\libpcre.vcproj", "{8D04B550-D240-4A44-8A18-35DA3F7038D9}" ProjectSection(ProjectDependencies) = postProject {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94} - {91695C7C-7AD1-4782-9727-508F82D9C577} = {91695C7C-7AD1-4782-9727-508F82D9C577} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" - ProjectSection(ProjectDependencies) = postProject - {91695C7C-7AD1-4782-9727-508F82D9C577} = {91695C7C-7AD1-4782-9727-508F82D9C577} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\libresample\libresample.vcproj", "{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" - ProjectSection(ProjectDependencies) = postProject - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" ProjectSection(ProjectDependencies) = postProject {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F} - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" ProjectSection(ProjectDependencies) = postProject - {E969F3E0-1043-482A-AD49-787B8356BA92} = {E969F3E0-1043-482A-AD49-787B8356BA92} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F} - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR", "libs\win32\Download APR.vcproj", "{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR-Iconv", "libs\win32\Download APR-Iconv.vcproj", "{5786D51D-1C6A-4BE1-8804-29954DB5258F}" - ProjectSection(ProjectDependencies) = postProject - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR-Util", "libs\win32\Download APR-Util.vcproj", "{E969F3E0-1043-482A-AD49-787B8356BA92}" - ProjectSection(ProjectDependencies) = postProject - {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F} - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PCRE", "libs\win32\Download PCRE.vcproj", "{91695C7C-7AD1-4782-9727-508F82D9C577}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SQLITE", "libs\win32\Download SQLITE.vcproj", "{6B9217D6-8259-4817-B8A5-2FEAD349EDEB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.vcproj", "{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.vcproj", "{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}" @@ -428,8 +395,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}" ProjectSection(ProjectDependencies) = postProject - {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}" @@ -455,73 +422,62 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}" ProjectSection(ProjectDependencies) = postProject - {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPIDERMONKEY", "libs\win32\Download SPIDERMONKEY.vcproj", "{B0AA13FC-636C-45A7-8EAE-663220679A75}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdlibm", "libs\win32\js\fdlibm.vcproj", "{76D0A759-9C07-42D4-90A9-82AE15462C95}" - ProjectSection(ProjectDependencies) = postProject - {B0AA13FC-636C-45A7-8EAE-663220679A75} = {B0AA13FC-636C-45A7-8EAE-663220679A75} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}" - ProjectSection(ProjectDependencies) = postProject - {B0AA13FC-636C-45A7-8EAE-663220679A75} = {B0AA13FC-636C-45A7-8EAE-663220679A75} - {76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_park", "src\mod\applications\mod_park\mod_park.vcproj", "{2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SOFIA", "libs\win32\Download SOFIA.vcproj", "{8B2CE7D1-77EF-45ED-927D-82147805440B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject - {8B2CE7D1-77EF-45ED-927D-82147805440B} = {8B2CE7D1-77EF-45ED-927D-82147805440B} - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} + {8B2CE7D1-77EF-45ED-927D-82147805440B} = {8B2CE7D1-77EF-45ED-927D-82147805440B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" @@ -533,68 +489,71 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSwitch.NET", "src\dotnet\FreeSwitch.NET.csproj", "{251CAABC-16C3-4593-A491-603B908094E0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_etpan", "src\mod\languages\mod_spidermonkey_etpan\mod_spidermonkey_etpan.vcproj", "{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download ETPAN", "libs\win32\Download ETPAN.vcproj", "{EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}" @@ -604,26 +563,14 @@ {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} = {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsangoma", "libs\libsangoma\libsangoma.vcproj", "{7E60CC2D-E818-4712-8F16-C0E6EC64982F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wanpipe", "src\mod\endpoints\mod_wanpipe\mod_wanpipe.vcproj", "{DEB84241-385F-471F-A6B6-0C93FBB3B03D}" - ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {7E60CC2D-E818-4712-8F16-C0E6EC64982F} = {7E60CC2D-E818-4712-8F16-C0E6EC64982F} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Global @@ -830,26 +777,6 @@ {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32 - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Debug|Win32.Build.0 = Debug|Win32 - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Release|Win32.ActiveCfg = Release|Win32 - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Release|Win32.Build.0 = Release|Win32 - {5786D51D-1C6A-4BE1-8804-29954DB5258F}.Debug|Win32.ActiveCfg = Debug|Win32 - {5786D51D-1C6A-4BE1-8804-29954DB5258F}.Debug|Win32.Build.0 = Debug|Win32 - {5786D51D-1C6A-4BE1-8804-29954DB5258F}.Release|Win32.ActiveCfg = Release|Win32 - {5786D51D-1C6A-4BE1-8804-29954DB5258F}.Release|Win32.Build.0 = Release|Win32 - {E969F3E0-1043-482A-AD49-787B8356BA92}.Debug|Win32.ActiveCfg = Debug|Win32 - {E969F3E0-1043-482A-AD49-787B8356BA92}.Debug|Win32.Build.0 = Debug|Win32 - {E969F3E0-1043-482A-AD49-787B8356BA92}.Release|Win32.ActiveCfg = Release|Win32 - {E969F3E0-1043-482A-AD49-787B8356BA92}.Release|Win32.Build.0 = Release|Win32 - {91695C7C-7AD1-4782-9727-508F82D9C577}.Debug|Win32.ActiveCfg = Debug|Win32 - {91695C7C-7AD1-4782-9727-508F82D9C577}.Debug|Win32.Build.0 = Debug|Win32 - {91695C7C-7AD1-4782-9727-508F82D9C577}.Release|Win32.ActiveCfg = Release|Win32 - {91695C7C-7AD1-4782-9727-508F82D9C577}.Release|Win32.Build.0 = Release|Win32 - {6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Debug|Win32.Build.0 = Debug|Win32 - {6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Release|Win32.ActiveCfg = Release|Win32 - {6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Release|Win32.Build.0 = Release|Win32 {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.ActiveCfg = Debug|Win32 {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.Build.0 = Debug|Win32 {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.ActiveCfg = Release|Win32 @@ -918,14 +845,6 @@ {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32 {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.ActiveCfg = Release|Win32 {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32 - {B0AA13FC-636C-45A7-8EAE-663220679A75}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0AA13FC-636C-45A7-8EAE-663220679A75}.Debug|Win32.Build.0 = Debug|Win32 - {B0AA13FC-636C-45A7-8EAE-663220679A75}.Release|Win32.ActiveCfg = Release|Win32 - {B0AA13FC-636C-45A7-8EAE-663220679A75}.Release|Win32.Build.0 = Release|Win32 - {76D0A759-9C07-42D4-90A9-82AE15462C95}.Debug|Win32.ActiveCfg = Debug|Win32 - {76D0A759-9C07-42D4-90A9-82AE15462C95}.Debug|Win32.Build.0 = Debug|Win32 - {76D0A759-9C07-42D4-90A9-82AE15462C95}.Release|Win32.ActiveCfg = Release|Win32 - {76D0A759-9C07-42D4-90A9-82AE15462C95}.Release|Win32.Build.0 = Release|Win32 {204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32 {204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32 {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32 @@ -1012,10 +931,6 @@ {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Debug|Win32.Build.0 = Debug|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Release|Win32.ActiveCfg = Release|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Release|Win32.Build.0 = Release|Win32 - {7E60CC2D-E818-4712-8F16-C0E6EC64982F}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E60CC2D-E818-4712-8F16-C0E6EC64982F}.Release|Win32.ActiveCfg = Release|Win32 - {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Release|Win32.ActiveCfg = Release|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.ActiveCfg = Debug|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32 @@ -1057,7 +972,6 @@ {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} - {DEB84241-385F-471F-A6B6-0C93FBB3B03D} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {2D57D093-3F8D-4729-AD9A-68E945C200A5} {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} @@ -1086,7 +1000,6 @@ {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {76D0A759-9C07-42D4-90A9-82AE15462C95} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -1094,7 +1007,6 @@ {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {7E60CC2D-E818-4712-8F16-C0E6EC64982F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {0C808854-54D1-4230-BFF5-77B5FD905000} {7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000} @@ -1106,11 +1018,6 @@ {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} - {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {E969F3E0-1043-482A-AD49-787B8356BA92} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {91695C7C-7AD1-4782-9727-508F82D9C577} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {6B9217D6-8259-4817-B8A5-2FEAD349EDEB} = {C120A020-773F-4EA3-923F-B67AF28B750D} {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D} {F8C28DF9-D76A-449E-A621-D97D869974DA} = {C120A020-773F-4EA3-923F-B67AF28B750D} {985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D} @@ -1118,7 +1025,6 @@ {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D} {831F76E8-D288-4C54-9B6D-281D9436CCC7} = {C120A020-773F-4EA3-923F-B67AF28B750D} {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {B0AA13FC-636C-45A7-8EAE-663220679A75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B2CE7D1-77EF-45ED-927D-82147805440B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} = {C120A020-773F-4EA3-923F-B67AF28B750D} Modified: freeswitch/branches/knhor/trunk/INSTALL ============================================================================== --- freeswitch/branches/knhor/trunk/INSTALL (original) +++ freeswitch/branches/knhor/trunk/INSTALL Tue Dec 19 22:00:59 2006 @@ -1,47 +1,231 @@ -**************************************** NOTICE ******************************* -You MUST own the destination path of /usr/local/freeswitch for the project to -build properly! The alternative is to pick a different prefix with ./configure ---prefix=/my/special/place . -******************************************************************************* +Installation Instructions +************************* -UNIX: - You will need 'wget' installed in your path so the build system - can download the dependancies. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Software Foundation, Inc. -1) Prepare Automake - ./configure +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. -2) Edit modules.conf and adjust to taste. +Basic Installation +================== -3) Choose one of the following: +These are generic installation instructions. - *) Build The Entire Project (reccommended) - make installall + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). - *) Do it yourself step by step: - make - make install - make modules - make install_mod + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. - *) Rebuild all the dependancies - make megaclean + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. - *) Build freeswitch without automatically installing the support libraries (you will need to manually build them all): - make nodepends +The simplest way to compile this package is: -Windows 32: + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. - Requires: Microsoft Visual Studio 2005 or - Visual C++ 2005 Express Edition and Platform SDK - Internet connectivity to download dependency libraries - -1) Open /w32/vsnet/Freeswitch.sln + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. -2) Choose Release or Debug build + 2. Type `make' to compile the package. -3) Build solution or your choice of modules using the ide. - - - + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + +By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + Modified: freeswitch/branches/knhor/trunk/Makefile.am ============================================================================== --- freeswitch/branches/knhor/trunk/Makefile.am (original) +++ freeswitch/branches/knhor/trunk/Makefile.am Tue Dec 19 22:00:59 2006 @@ -1,44 +1,28 @@ - - EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu foreign NAME=freeswitch PREFIX=$(prefix) + +AM_CFLAGS = $(new_AM_CFLAGS) +AM_CPPFLAGS = $(AM_CFLAGS) +AM_LDFLAGS = $(new_AM_LDFLAGS) + APR_CONFIG=$(prefix)/bin/apr-1-config APU_CONFIG=$(prefix)/bin/apu-1-config -AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags --includes) -I${prefix}/include/srtp -AM_LDFLAGS = -L$(PREFIX)/lib +AM_CFLAGS += -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags --includes) -I${prefix}/include/srtp +AM_LDFLAGS += -L$(PREFIX)/lib AM_LDFLAGS += $(shell $(APR_CONFIG) --link-ld --libs ) AM_CFLAGS += $(shell $(APU_CONFIG) --includes) AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs ) -AM_LDFLAGS += -lm -L/usr/local/lib/db42 -L/usr/local/lib +AM_LDFLAGS += -lm -L/usr/local/lib/db42 -L/usr/local/lib +AM_LDFLAGS += -lsqlite3 -lpcre OSARCH=$(shell uname -s) -if ISLINUX -AM_LDFLAGS += -Wl,-E -endif if CRASHPROT AM_CFLAGS += -DCRASH_PROT endif -AM_CFGARGS = -if IS64BITLINUX -AM_CFLAGS += -m64 -march=k8 -fPIC -D_64BIT_MACHINE_ -AM_CFGARGS += --enable-64bit -endif - -#put elsif win here -if ISMAC -SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace -AM_CFLAGS += -DMACOSX -DYNAMIC_LIB_EXTEN=dylib -else -SOLINK=-shared -Xlinker -x -DYNAMIC_LIB_EXTEN=so -endif - -AM_CFLAGS += -fPIC -Wall AM_CFLAGS +=-I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include -I$(PREFIX)/include AM_CFLAGS += -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" AM_CFLAGS += -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" @@ -127,9 +111,9 @@ lib_LTLIBRARIES = libfreeswitch.la -libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 +libfreeswitch_la_CFLAGS = $(AM_CFLAGS) libfreeswitch_la_LDFLAGS = -version-info 1:0:0 -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre +libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h bin_PROGRAMS = freeswitch @@ -163,14 +147,14 @@ @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) mkdir -p $(PREFIX) - ./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX) - ./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX) + ./build/buildlib.sh . install sqlite --prefix=$(PREFIX) --disable-tcl --enable-threadsafe + ./build/buildlib.sh . install apr --prefix=$(PREFIX) + ./build/buildlib.sh . install apr-util --with-apr=../apr --prefix=$(PREFIX) ./build/buildlib.sh . install libresample --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX) - ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) - ./build/buildlib.sh . install pcre-6.7.tar.gz --prefix=$(PREFIX) +# ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) + ./build/buildlib.sh . install pcre --prefix=$(PREFIX) rm build/freeswitch.env @@ -187,7 +171,7 @@ @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" - @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" + @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done @@ -228,7 +212,7 @@ @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" - @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" + @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @@ -251,7 +235,7 @@ -e "s,@INSTALL\@,$(INSTALL)," \ -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \ \ - -e "s|@CFLAGS\@|$(CFLAGS) -fPIC $(shell $(APR_CONFIG) --cflags --cppflags)|" \ + -e "s|@CFLAGS\@|$(CFLAGS) $(shell $(APR_CONFIG) --cflags --cppflags)|" \ -e "s|@INCLUDES\@|-I$(PREFIX)/include $(shell $(APR_CONFIG) --includes) $(shell $(APU_CONFIG) --includes)|" \ -e "s|@SOLINK\@|$(SOLINK)|" \ -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \ Modified: freeswitch/branches/knhor/trunk/Makefile.in ============================================================================== --- freeswitch/branches/knhor/trunk/Makefile.in (original) +++ freeswitch/branches/knhor/trunk/Makefile.in Tue Dec 19 22:00:59 2006 @@ -41,11 +41,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ISLINUX_TRUE@am__append_1 = -Wl,-E -@CRASHPROT_TRUE@am__append_2 = -DCRASH_PROT -@IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_ -@IS64BITLINUX_TRUE@am__append_4 = --enable-64bit -@ISMAC_TRUE@am__append_5 = -DMACOSX +@CRASHPROT_TRUE@am__append_1 = -DCRASH_PROT bin_PROGRAMS = freeswitch$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -58,7 +54,14 @@ build/config/ltmain.sh build/config/missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = \ + $(top_srcdir)/build/config/ax_compiler_vendor.m4 \ + $(top_srcdir)/build/config/ax_cflags_warn_all_ansi.m4 \ + $(top_srcdir)/build/config/ax_cc_maxopt.m4 \ + $(top_srcdir)/build/config/ax_check_compiler_flags.m4 \ + $(top_srcdir)/build/config/ac_gcc_archflag.m4 \ + $(top_srcdir)/build/config/ac_gcc_x86_cpuid.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -159,6 +162,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -192,11 +196,15 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PRTDIAG = @PRTDIAG@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOLINK = @SOLINK@ STRIP = @STRIP@ VERSION = @VERSION@ +WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@ +WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -233,6 +241,8 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +new_AM_CFLAGS = @new_AM_CFLAGS@ +new_AM_LDFLAGS = @new_AM_LDFLAGS@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -245,14 +255,11 @@ AUTOMAKE_OPTS = gnu foreign NAME = freeswitch PREFIX = $(prefix) -APR_CONFIG = $(prefix)/bin/apr-1-config -APU_CONFIG = $(prefix)/bin/apu-1-config -AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags \ - --cppflags --includes) -I${prefix}/include/srtp $(shell \ - $(APU_CONFIG) --includes) $(am__append_2) $(am__append_3) \ - $(am__append_5) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \ - -I$(PWD)/src/include -I$(PREFIX)/include \ - -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \ +AM_CFLAGS = $(new_AM_CFLAGS) -I$(PREFIX)/include $(shell $(APR_CONFIG) \ + --cflags --cppflags --includes) -I${prefix}/include/srtp \ + $(shell $(APU_CONFIG) --includes) $(am__append_1) \ + -I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include \ + -I$(PREFIX)/include -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \ -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \ -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \ -DSWITCH_DB_DIR=\"$(PREFIX)/db\" \ @@ -260,17 +267,13 @@ -DSWITCH_SCRIPT_DIR=\"$(PREFIX)/scripts\" \ -DSWITCH_HTDOCS_DIR=\"$(PREFIX)/htdocs\" \ -DSWITCH_GRAMMAR_DIR=\"$(PREFIX)/grammar\" -AM_LDFLAGS = -L$(PREFIX)/lib $(shell $(APR_CONFIG) --link-ld --libs ) \ - $(shell $(APU_CONFIG) --link-ld --libs ) -lm \ - -L/usr/local/lib/db42 -L/usr/local/lib $(am__append_1) +AM_CPPFLAGS = $(AM_CFLAGS) +AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(PREFIX)/lib $(shell $(APR_CONFIG) \ + --link-ld --libs ) $(shell $(APU_CONFIG) --link-ld --libs ) \ + -lm -L/usr/local/lib/db42 -L/usr/local/lib -lsqlite3 -lpcre +APR_CONFIG = $(prefix)/bin/apr-1-config +APU_CONFIG = $(prefix)/bin/apu-1-config OSARCH = $(shell uname -s) -AM_CFGARGS = $(am__append_4) -@ISMAC_FALSE@SOLINK = -shared -Xlinker -x - -#put elsif win here -@ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace -@ISMAC_FALSE@DYNAMIC_LIB_EXTEN = so -@ISMAC_TRUE@DYNAMIC_LIB_EXTEN = dylib libfreeswitch_la_SOURCES = \ src/include/switch_am_config.h\ src/include/switch.h\ @@ -345,9 +348,9 @@ BUILT_SOURCES = version depends CLEANFILES = src/include/switch_version.h scripts/fsxs lib_LTLIBRARIES = libfreeswitch.la -libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 +libfreeswitch_la_CFLAGS = $(AM_CFLAGS) libfreeswitch_la_LDFLAGS = -version-info 1:0:0 -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre +libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h bin_SCRIPTS = scripts/fsxs freeswitch_SOURCES = src/switch.c\ @@ -1083,14 +1086,14 @@ @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) mkdir -p $(PREFIX) - ./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX) - ./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX) + ./build/buildlib.sh . install sqlite --prefix=$(PREFIX) --disable-tcl --enable-threadsafe + ./build/buildlib.sh . install apr --prefix=$(PREFIX) + ./build/buildlib.sh . install apr-util --with-apr=../apr --prefix=$(PREFIX) ./build/buildlib.sh . install libresample --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX) - ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) - ./build/buildlib.sh . install pcre-6.7.tar.gz --prefix=$(PREFIX) +# ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) + ./build/buildlib.sh . install pcre --prefix=$(PREFIX) rm build/freeswitch.env modules: $(NAME) @@ -1106,7 +1109,7 @@ @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" - @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" + @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done @@ -1147,7 +1150,7 @@ @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" - @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" + @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @@ -1170,7 +1173,7 @@ -e "s,@INSTALL\@,$(INSTALL)," \ -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \ \ - -e "s|@CFLAGS\@|$(CFLAGS) -fPIC $(shell $(APR_CONFIG) --cflags --cppflags)|" \ + -e "s|@CFLAGS\@|$(CFLAGS) $(shell $(APR_CONFIG) --cflags --cppflags)|" \ -e "s|@INCLUDES\@|-I$(PREFIX)/include $(shell $(APR_CONFIG) --includes) $(shell $(APU_CONFIG) --includes)|" \ -e "s|@SOLINK\@|$(SOLINK)|" \ -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \ Modified: freeswitch/branches/knhor/trunk/build/buildlib.sh ============================================================================== --- freeswitch/branches/knhor/trunk/build/buildlib.sh (original) +++ freeswitch/branches/knhor/trunk/build/buildlib.sh Tue Dec 19 22:00:59 2006 @@ -61,7 +61,7 @@ fi fi if [ -f $uncompressed/.complete ] ; then -if [ ! -n "$(find $uncompressed/.complete -prune -newer $uncompressed)" ]; then +if [ $uncompressed/.complete -ot $uncompressed ]; then if [ ! -f $root/.nothanks ] ; then echo remove stale .complete rm $uncompressed/.complete @@ -105,3 +105,4 @@ fi exit 0 + Modified: freeswitch/branches/knhor/trunk/build/config/compile ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/compile (original) +++ freeswitch/branches/knhor/trunk/build/config/compile Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -47,11 +47,11 @@ Report bugs to <bug-automake(a)gnu.org>. EOF - exit $? + exit 0 ;; -v | --v*) echo "compile $scriptversion" - exit $? + exit 0 ;; esac @@ -125,8 +125,6 @@ if test -f "$cofile"; then mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" Modified: freeswitch/branches/knhor/trunk/build/config/config.guess ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/config.guess (original) +++ freeswitch/branches/knhor/trunk/build/config/config.guess Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,15 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Originally written by Per Bothner <per(a)bothner.com>. # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. @@ -55,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -68,11 +66,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -125,7 +123,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi(a)noc.rutgers.edu 1994-08-24) @@ -198,20 +196,55 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -264,43 +297,37 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -308,32 +335,32 @@ else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -342,10 +369,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -357,10 +384,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -371,40 +398,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -428,33 +455,32 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -470,29 +496,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -500,7 +526,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -515,18 +541,14 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -540,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,19 +645,9 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +655,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,166 +687,158 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + exit 0 ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -852,7 +856,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -871,14 +875,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -892,7 +896,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -900,25 +904,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -936,15 +940,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -972,18 +976,15 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -991,27 +992,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1019,16 +1020,15 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` @@ -1046,73 +1046,73 @@ else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit ;; + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit ;; + exit 0 ;; paragon:*:*:*) echo i860-intel-osf1 - exit ;; + exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,65 +1120,61 @@ else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel(a)ccMail.Census.GOV> echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes(a)openmarket.com>. # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf(a)swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green(a)stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green(a)stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1186,7 +1182,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1194,25 +1190,22 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1223,44 +1216,38 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1292,7 +1279,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1381,12 +1368,11 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1395,22 +1381,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1421,9 +1407,7 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gue… -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be Modified: freeswitch/branches/knhor/trunk/build/config/config.sub ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/config.sub (original) +++ freeswitch/branches/knhor/trunk/build/config/config.sub Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +21,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. # @@ -71,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -84,11 +83,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -100,7 +99,7 @@ *local*) # First pass through any local machine types. echo $1 - exit ;; + exit 0;; * ) break ;; @@ -232,14 +231,13 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -248,7 +246,6 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -257,28 +254,23 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ | msp430 \ | ns16k | ns32k \ - | or32 \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -306,7 +298,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bfin-* | bs2000-* \ + | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -318,7 +310,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -327,7 +319,6 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -336,7 +327,6 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -344,23 +334,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -502,10 +489,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -771,8 +754,9 @@ basic_machine=hppa1.1-oki os=-proelf ;; - openrisc | openrisc-*) + or32 | or32-*) basic_machine=or32-unknown + os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1045,10 +1029,6 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1098,9 +1078,12 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1187,8 +1170,7 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1206,7 +1188,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1315,9 +1297,6 @@ -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1395,9 +1374,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1569,7 +1545,7 @@ esac echo $basic_machine$os -exit +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Modified: freeswitch/branches/knhor/trunk/build/config/depcomp ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/depcomp (original) +++ freeswitch/branches/knhor/trunk/build/config/depcomp Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2004-05-31.23 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to <bug-automake(a)gnu.org>. EOF - exit $? + exit 0 ;; -v | --v*) echo "depcomp $scriptversion" - exit $? + exit 0 ;; esac @@ -287,43 +287,36 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -467,8 +460,7 @@ done "$@" -E | - sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | + sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Modified: freeswitch/branches/knhor/trunk/build/config/install-sh ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/install-sh (original) +++ freeswitch/branches/knhor/trunk/build/config/install-sh Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit $?;; + --help) echo "$usage"; exit 0;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit $?;; + --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,8 +226,7 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS pathcomp= @@ -296,7 +295,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 + (exit 1); exit } else : @@ -307,12 +306,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit 1; } + fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit 0 + (exit 0); exit } # Local variables: Modified: freeswitch/branches/knhor/trunk/build/config/ltmain.sh ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/ltmain.sh (original) +++ freeswitch/branches/knhor/trunk/build/config/ltmain.sh Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +33,9 @@ # function. progpath="$0" +# RH: define SED for historic ltconfig's generated by Libtool 1.3 +[ -z "$SED" ] && SED=sed + # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -43,14 +46,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.18 -TIMESTAMP=" (1.1220.2.245 2005/05/16 08:55:27)" +VERSION=1.5.6 +TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -112,9 +110,8 @@ fi # Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -133,7 +130,6 @@ execute_dlfiles= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" -quote_scanset='[[~#^*{};<>?'"'"' ]' ##################################### # Shell function definitions: @@ -145,8 +141,7 @@ # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -func_win32_libid () -{ +func_win32_libid () { win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -186,13 +181,12 @@ # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. # arg is usually of the form 'gcc ...' -func_infer_tag () -{ +func_infer_tag () { if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -213,7 +207,7 @@ for arg in $CC; do # Double-quote args containing other shell metacharacters. case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -244,108 +238,6 @@ esac fi } - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi -} - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" -} # End of Shell function definitions ##################################### @@ -416,10 +308,10 @@ --version) $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." + $echo "Copyright (C) 2003 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? + exit $EXIT_SUCCESS ;; --config) @@ -428,7 +320,7 @@ for tagname in $taglist; do ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit $? + exit $EXIT_SUCCESS ;; --debug) @@ -453,7 +345,7 @@ else $echo "disable static libraries" fi - exit $? + exit $EXIT_SUCCESS ;; --finish) mode="finish" ;; @@ -510,7 +402,7 @@ # Infer the operation mode. if test -z "$mode"; then $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 + $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 case $nonopt in *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link @@ -627,7 +519,7 @@ # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -658,11 +550,8 @@ case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; esac @@ -735,15 +624,6 @@ esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") - qlibobj="\"$qlibobj\"" ;; - esac - if test "X$libobj" != "X$qlibobj"; then - $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - exit $EXIT_FAILURE - fi objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -816,17 +696,12 @@ $run $rm $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + $echo $srcfile > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") - qsrcfile="\"$qsrcfile\"" ;; - esac $run $rm "$libobj" "${libobj}T" @@ -848,10 +723,10 @@ fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" else # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" fi if test ! -d "${xdir}$objdir"; then @@ -931,9 +806,9 @@ if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" else - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1111,7 +986,7 @@ arg="$1" shift case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test ;; *) qarg=$arg ;; @@ -1355,13 +1230,6 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; *) eval "$prev=\"\$arg\"" prev= @@ -1420,14 +1288,6 @@ continue ;; - -framework) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - -inst-prefix-dir) prev=inst_prefix continue @@ -1488,7 +1348,7 @@ # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1499,7 +1359,7 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -1509,20 +1369,8 @@ continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1531,19 +1379,18 @@ continue ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) - + # gcc -m* arguments should be passed to the linker via $compiler_flags + # in order to pass architecture information to the linker + # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. + -m*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -1659,7 +1506,7 @@ for flag in $args; do IFS="$save_ifs" case $flag in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") flag="\"$flag\"" ;; esac @@ -1677,7 +1524,7 @@ for flag in $args; do IFS="$save_ifs" case $flag in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") flag="\"$flag\"" ;; esac @@ -1710,7 +1557,7 @@ # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -1844,7 +1691,7 @@ # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -2011,7 +1858,7 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + deplibs="$deplib $deplibs" fi continue ;; @@ -2020,6 +1867,10 @@ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 continue fi + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do for search_ext in .la $std_shrext .so .a; do @@ -2130,22 +1981,7 @@ fi case $linkmode in lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then + if test "$deplibs_check_method" != pass_all; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" @@ -2219,9 +2055,7 @@ # it will not redefine variables installed, or shouldnotlink installed=yes shouldnotlink=no - avoidtemprpath= - # Read the .la file case $lib in */* | *\\*) . $lib ;; @@ -2319,19 +2153,11 @@ dir="$libdir" absdir="$libdir" fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -2404,7 +2230,7 @@ if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; @@ -2848,13 +2674,13 @@ *) continue ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in *" $depdepl "*) ;; *) deplibs="$depdepl $deplibs" ;; esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; + esac done fi # link_all_deplibs != no fi # linkmode = lib @@ -3118,27 +2944,27 @@ # Check that each of the things are valid numbers. case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3164,7 +2990,7 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3370,7 +3196,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -3852,13 +3678,67 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -3907,7 +3787,6 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -3917,7 +3796,7 @@ delfiles= last_robj= k=1 - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$save_output-${k}.$objext # Loop over the list of objects to be linked. for obj in $save_libobjs do @@ -3937,9 +3816,9 @@ # the last one created. eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$save_output-${k}.$objext k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$save_output-${k}.$objext objlist=$obj len=1 fi @@ -3959,13 +3838,13 @@ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" fi - # Set up a command to remove the reloadable object files + # Set up a command to remove the reloadale object files # after they are used. i=0 while test "$i" -lt "$k" do i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" + delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" done $echo "creating a temporary reloadable object file: $output" @@ -4097,10 +3976,64 @@ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi @@ -4362,12 +4295,12 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"' else - $run eval "${SED} -e 's/$[ ][.*^$]$/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + $run eval "${SED} -e 's/$[][.*^$]$/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' + $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi fi @@ -4419,26 +4352,7 @@ #endif /* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ const char *name; lt_ptr address; } @@ -4667,7 +4581,7 @@ esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` + cwrappersource=`$echo ${objdir}/lt-${output}.c` cwrapper=`$echo ${output}.exe` $rm $cwrappersource $cwrapper trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -4900,7 +4814,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" @@ -5077,73 +4991,71 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + # Add in members from convenience archives. + for xlib in $addlibs; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + done fi # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && @@ -5157,7 +5069,20 @@ objlist= concat_cmds= save_oldobjs=$oldobjs - + # GNU ar 2.10+ was changed to match POSIX; thus no paths are + # encoded into archives. This makes 'ar r' malfunction in + # this piecewise linking case whenever conflicting object + # names appear in distinct ar calls; check, warn and compensate. + if (for obj in $save_oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 + $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 + AR_FLAGS=cq + fi # Is there a better way of finding the last object in the list? for obj in $save_oldobjs do @@ -5369,7 +5294,7 @@ # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5385,7 +5310,7 @@ # Aesthetically quote it. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5433,7 +5358,7 @@ # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *$quote_scanset* | *]* | *\|* | *\&* | *$* | *$* | "") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -6472,7 +6397,7 @@ $echo $echo "Try \`$modename --help' for more information about other modes." -exit $? +exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting Modified: freeswitch/branches/knhor/trunk/build/config/missing ============================================================================== --- freeswitch/branches/knhor/trunk/build/config/missing (original) +++ freeswitch/branches/knhor/trunk/build/config/missing Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake(a)gnu.org>." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 touch $file ;; Modified: freeswitch/branches/knhor/trunk/configure ============================================================================== --- freeswitch/branches/knhor/trunk/configure (original) +++ freeswitch/branches/knhor/trunk/configure Tue Dec 19 22:00:59 2006 @@ -466,7 +466,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE new_AM_CFLAGS new_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1037,6 +1037,12 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-optimization Set if you want us to add max optimising compiler + flags + --enable-portable-binary + disable compiler optimizations that would produce + unportable binaries + --enable-debug build with debug information --enable-crash-protection Compile with CRASH Protection Optional Packages: @@ -1047,6 +1053,8 @@ both] --with-tags[=TAGS] include additional configurations [automatic] + --with-gcc-arch=<arch> use architecture <arch> for gcc -march/-mtune, + instead of guessing Some influential environment variables: CC C compiler command @@ -1954,6 +1962,13 @@ +#Set default language +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3815,7 +3830,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3818 "configure"' > conftest.$ac_ext + echo '#line 3833 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5387,7 +5402,7 @@ # Provide some information about the compiler. -echo "$as_me:5390:" \ +echo "$as_me:5405:" \ "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 @@ -6421,11 +6436,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6424: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6439: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6428: \$? = $ac_status" >&5 + echo "$as_me:6443: \$? = $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 @@ -6654,11 +6669,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6672: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6661: \$? = $ac_status" >&5 + echo "$as_me:6676: \$? = $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 @@ -6714,11 +6729,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6717: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6732: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6721: \$? = $ac_status" >&5 + echo "$as_me:6736: \$? = $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 @@ -8048,7 +8063,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8051 "configure"' > conftest.$ac_ext + echo '#line 8066 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8919,7 +8934,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8922 "configure" +#line 8937 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9017,7 +9032,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9020 "configure" +#line 9035 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11196,11 +11211,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11199: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11214: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11203: \$? = $ac_status" >&5 + echo "$as_me:11218: \$? = $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 @@ -11256,11 +11271,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11259: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11274: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11263: \$? = $ac_status" >&5 + echo "$as_me:11278: \$? = $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 @@ -11767,7 +11782,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11770 "configure"' > conftest.$ac_ext + echo '#line 11785 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12638,7 +12653,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12641 "configure" +#line 12656 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12736,7 +12751,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12739 "configure" +#line 12754 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13563,11 +13578,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13566: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13581: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13570: \$? = $ac_status" >&5 + echo "$as_me:13585: \$? = $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 @@ -13623,11 +13638,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13626: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13641: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13630: \$? = $ac_status" >&5 + echo "$as_me:13645: \$? = $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 @@ -14937,7 +14952,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14940 "configure"' > conftest.$ac_ext + echo '#line 14955 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15678,11 +15693,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15681: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15696: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15685: \$? = $ac_status" >&5 + echo "$as_me:15700: \$? = $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 @@ -15911,11 +15926,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15914: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15929: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15918: \$? = $ac_status" >&5 + echo "$as_me:15933: \$? = $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 @@ -15971,11 +15986,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15974: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15989: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15978: \$? = $ac_status" >&5 + echo "$as_me:15993: \$? = $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 @@ -17305,7 +17320,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17308 "configure"' > conftest.$ac_ext + echo '#line 17323 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18176,7 +18191,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18179 "configure" +#line 18194 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18274,7 +18289,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18277 "configure" +#line 18292 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19289,6 +19304,1396 @@ +#Check for compiler vendor + +echo "$as_me:$LINENO: checking for C compiler vendor" >&5 +echo $ECHO_N "checking for C compiler vendor... $ECHO_C" >&6 +if test "${ax_cv_c_compiler_vendor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ax_cv_c_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + +#if !($vencpp) + thisisanerror; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done + +fi +echo "$as_me:$LINENO: result: $ax_cv_c_compiler_vendor" >&5 +echo "${ECHO_T}$ax_cv_c_compiler_vendor" >&6 + + +# Optimize +# Check whether --enable-optimization or --disable-optimization was given. +if test "${enable_optimization+set}" = set; then + enableval="$enable_optimization" + enable_optimizer="$enableval" +else + enable_optimizer="no" +fi; + +if test "${enable_optimizer}" = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define OPTIMZER +_ACEOF + + + + + +# Check whether --enable-portable-binary or --disable-portable-binary was given. +if test "${enable_portable_binary+set}" = set; then + enableval="$enable_portable_binary" + acx_maxopt_portable=$withval +else + acx_maxopt_portable=no +fi; + +# Try to determine "good" native compiler flags if none specified via CFLAGS +if test "$ac_test_CFLAGS" != "set"; then + CFLAGS="" + case $ax_cv_c_compiler_vendor in + dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host" + if test "x$acx_maxopt_portable" = xno; then + CFLAGS="$CFLAGS -arch host" + fi;; + + sun) CFLAGS="-native -fast -xO5 -dalign -xc99=all" + if test "x$acx_maxopt_portable" = xyes; then + CFLAGS="$CFLAGS -xarch=generic" + fi;; + + hp) CFLAGS="+Oall +Optrs_ansi +DSnative" + if test "x$acx_maxopt_portable" = xyes; then + CFLAGS="$CFLAGS +DAportable" + fi;; + + ibm) if test "x$acx_maxopt_portable" = xno; then + xlc_opt="-qarch=auto -qtune=auto" + else + xlc_opt="-qtune=auto" + fi + echo "$as_me:$LINENO: checking whether C compiler accepts $xlc_opt" >&5 +echo $ECHO_N "checking whether C compiler accepts $xlc_opt... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$xlc_opt" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="-O3 -qansialias -w $xlc_opt" +else + CFLAGS="-O3 -qansialias -w" + echo "******************************************************" + echo "* You seem to have the IBM C compiler. It is *" + echo "* recommended for best performance that you use: *" + echo "* *" + echo "* CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *" + echo "* ^^^ ^^^ *" + echo "* where xxx is pwr2, pwr3, 604, or whatever kind of *" + echo "* CPU you have. (Set the CFLAGS environment var. *" + echo "* and re-run configure.) For more info, man cc. *" + echo "******************************************************" +fi + + ;; + + intel) CFLAGS="-O3 -ansi_alias" + if test "x$acx_maxopt_portable" = xno; then + icc_archflag=unknown + icc_flags="" + case $host_cpu in + i686*|x86_64*) + # icc accepts gcc assembly syntax, so these should work: + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5 +echo $ECHO_N "checking for x86 cpuid 0 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_0=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 0, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5 +echo $ECHO_N "checking for x86 cpuid 1 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_1=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 1, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_1" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG + *:756e6547:*:*) # Intel + case $ax_cv_gcc_x86_cpuid_1 in + *6a?:*[234]:*:*|*6[789b]?:*:*:*) icc_flags="-xK";; + *f3[347]:*:*:*|*f41347:*:*:*) icc_flags="-xP -xN -xW -xK";; + *f??:*:*:*) icc_flags="-xN -xW -xK";; + esac ;; + esac ;; + esac + if test "x$icc_flags" != x; then + for flag in $icc_flags; do + echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +echo $ECHO_N "checking whether C compiler accepts $flag... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$flag" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + icc_archflag=$flag; break +else + : +fi + + done + fi + echo "$as_me:$LINENO: checking for icc architecture flag" >&5 +echo $ECHO_N "checking for icc architecture flag... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $icc_archflag" >&5 +echo "${ECHO_T}$icc_archflag" >&6 + if test "x$icc_archflag" != xunknown; then + CFLAGS="$CFLAGS $icc_archflag" + fi + fi + ;; + + gnu) + # default optimization flags for gcc on all systems + CFLAGS="-O3 -fomit-frame-pointer" + + # -malign-double for x86 systems + echo "$as_me:$LINENO: checking whether C compiler accepts -malign-double" >&5 +echo $ECHO_N "checking whether C compiler accepts -malign-double... $ECHO_C" >&6 +if test "${ax_cv_c_flags__malign_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_save_FLAGS=$CFLAGS + CFLAGS="-malign-double" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_flags__malign_double=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_c_flags__malign_double=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +fi + +eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="$CFLAGS -malign-double" +else + : +fi + + + # -fstrict-aliasing for gcc-2.95+ + echo "$as_me:$LINENO: checking whether C compiler accepts -fstrict-aliasing" >&5 +echo $ECHO_N "checking whether C compiler accepts -fstrict-aliasing... $ECHO_C" >&6 +if test "${ax_cv_c_flags__fstrict_aliasing+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_save_FLAGS=$CFLAGS + CFLAGS="-fstrict-aliasing" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_flags__fstrict_aliasing=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_c_flags__fstrict_aliasing=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +fi + +eval ax_check_compiler_flags=$ax_cv_c_flags__fstrict_aliasing +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="$CFLAGS -fstrict-aliasing" +else + : +fi + + + # note that we enable "unsafe" fp optimization with other compilers, too + echo "$as_me:$LINENO: checking whether C compiler accepts -ffast-math" >&5 +echo $ECHO_N "checking whether C compiler accepts -ffast-math... $ECHO_C" >&6 +if test "${ax_cv_c_flags__ffast_math+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_save_FLAGS=$CFLAGS + CFLAGS="-ffast-math" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_flags__ffast_math=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_c_flags__ffast_math=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +fi + +eval ax_check_compiler_flags=$ax_cv_c_flags__ffast_math +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="$CFLAGS -ffast-math" +else + : +fi + + + + + +# Check whether --with-gcc-arch or --without-gcc-arch was given. +if test "${with_gcc_arch+set}" = set; then + withval="$with_gcc_arch" + ax_gcc_arch=$withval +else + ax_gcc_arch=yes +fi; + +echo "$as_me:$LINENO: checking for gcc architecture flag" >&5 +echo $ECHO_N "checking for gcc architecture flag... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 +if test "${ax_cv_gcc_archflag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +ax_cv_gcc_archflag="unknown" + +if test "$GCC" = yes; then + +if test "x$ax_gcc_arch" = xyes; then +ax_gcc_arch="" +if test "$cross_compiling" = no; then +case $host_cpu in + i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5 +echo $ECHO_N "checking for x86 cpuid 0 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_0=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 0, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5 +echo $ECHO_N "checking for x86 cpuid 1 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_1=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 1, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_1" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + case $ax_cv_gcc_x86_cpuid_0 in + *:756e6547:*:*) # Intel + case $ax_cv_gcc_x86_cpuid_1 in + *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;; + *5??:*:*:*) ax_gcc_arch=pentium ;; + *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; + *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; + *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; + *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; + *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; + *6??:*:*:*) ax_gcc_arch=pentiumpro ;; + *f3[347]:*:*:*|*f41347:*:*:*) + case $host_cpu in + x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;; + *) ax_gcc_arch="prescott pentium4 pentiumpro" ;; + esac ;; + *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";; + esac ;; + *:68747541:*:*) # AMD + case $ax_cv_gcc_x86_cpuid_1 in + *5[67]?:*:*:*) ax_gcc_arch=k6 ;; + *5[8d]?:*:*:*) ax_gcc_arch="k6-2 k6" ;; + *5[9]?:*:*:*) ax_gcc_arch="k6-3 k6" ;; + *60?:*:*:*) ax_gcc_arch=k7 ;; + *6[12]?:*:*:*) ax_gcc_arch="athlon k7" ;; + *6[34]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;; + *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;; + *6[68a]?:*:*:*) + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 0x80000006 output" >&5 +echo $ECHO_N "checking for x86 cpuid 0x80000006 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_0x80000006+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_0x80000006=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 0x80000006, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_0x80000006=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0x80000006" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + # L2 cache size + case $ax_cv_gcc_x86_cpuid_0x80000006 in + *:*:*[1-9a-f]??????:*) # (L2 = ecx >> 16) >= 256 + ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;; + *) ax_gcc_arch="athlon-4 athlon k7" ;; + esac ;; + *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; + *f5?:*:*:*) ax_gcc_arch="opteron k8" ;; + *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;; + *f??:*:*:*) ax_gcc_arch="k8" ;; + esac ;; + *:746e6543:*:*) # IDT + case $ax_cv_gcc_x86_cpuid_1 in + *54?:*:*:*) ax_gcc_arch=winchip-c6 ;; + *58?:*:*:*) ax_gcc_arch=winchip2 ;; + *6[78]?:*:*:*) ax_gcc_arch=c3 ;; + *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;; + esac ;; + esac + if test x"$ax_gcc_arch" = x; then # fallback + case $host_cpu in + i586*) ax_gcc_arch=pentium ;; + i686*) ax_gcc_arch=pentiumpro ;; + esac + fi + ;; + + sparc*) + # Extract the first word of "prtdiag", so it can be a program name with args. +set dummy prtdiag; 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_PRTDIAG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PRTDIAG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PRTDIAG="$PRTDIAG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PRTDIAG="$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 + + test -z "$ac_cv_path_PRTDIAG" && ac_cv_path_PRTDIAG="prtdiag" + ;; +esac +fi +PRTDIAG=$ac_cv_path_PRTDIAG + +if test -n "$PRTDIAG"; then + echo "$as_me:$LINENO: result: $PRTDIAG" >&5 +echo "${ECHO_T}$PRTDIAG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` + cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters` + case $cputype in + *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; + *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; + *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;; + *supersparc*|*tms390z5[05]*) ax_gcc_arch="supersparc v8" ;; + *hypersparc*|*rt62[056]*) ax_gcc_arch="hypersparc v8" ;; + *cypress*) ax_gcc_arch=cypress ;; + esac ;; + + alphaev5) ax_gcc_arch=ev5 ;; + alphaev56) ax_gcc_arch=ev56 ;; + alphapca56) ax_gcc_arch="pca56 ev56" ;; + alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;; + alphaev6) ax_gcc_arch=ev6 ;; + alphaev67) ax_gcc_arch=ev67 ;; + alphaev68) ax_gcc_arch="ev68 ev67" ;; + alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;; + alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;; + alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;; + + powerpc*) + cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null` + cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'` + case $cputype in + *750*) ax_gcc_arch="750 G3" ;; + *740[0-9]*) ax_gcc_arch="$cputype 7400 G4" ;; + *74[4-5][0-9]*) ax_gcc_arch="$cputype 7450 G4" ;; + *74[0-9][0-9]*) ax_gcc_arch="$cputype G4" ;; + *970*) ax_gcc_arch="970 G5 power4";; + *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";; + *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";; + 603ev|8240) ax_gcc_arch="$cputype 603e 603";; + *) ax_gcc_arch=$cputype ;; + esac + ax_gcc_arch="$ax_gcc_arch powerpc" + ;; +esac +fi # not cross-compiling +fi # guess arch + +if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then +for arch in $ax_gcc_arch; do + if test "x$acx_maxopt_portable" = xyes; then # if we require portable code + flags="-mtune=$arch" + # -mcpu=$arch and m$arch generate nonportable code on every arch except + # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. + case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac + else + flags="-march=$arch -mcpu=$arch -m$arch" + fi + for flag in $flags; do + echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +echo $ECHO_N "checking whether C compiler accepts $flag... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$flag" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + ax_cv_gcc_archflag=$flag; break +else + : +fi + + done + test "x$ax_cv_gcc_archflag" = xunknown || break +done +fi + +fi # $GCC=yes + +fi + +echo "$as_me:$LINENO: checking for gcc architecture flag" >&5 +echo $ECHO_N "checking for gcc architecture flag... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $ax_cv_gcc_archflag" >&5 +echo "${ECHO_T}$ax_cv_gcc_archflag" >&6 +if test "x$ax_cv_gcc_archflag" = xunknown; then + : +else + CFLAGS="$CFLAGS $ax_cv_gcc_archflag" +fi + + ;; + esac + + if test -z "$CFLAGS"; then + echo "" + echo "********************************************************" + echo "* WARNING: Don't know the best CFLAGS for this system *" + echo "* Use ./configure CFLAGS=... to specify your own flags *" + echo "* (otherwise, a default of CFLAGS=-O3 will be used) *" + echo "********************************************************" + echo "" + CFLAGS="-O3" + fi + + echo "$as_me:$LINENO: checking whether C compiler accepts $CFLAGS" >&5 +echo $ECHO_N "checking whether C compiler accepts $CFLAGS... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + : +else + + echo "" + echo "********************************************************" + echo "* WARNING: The guessed CFLAGS don't seem to work with *" + echo "* your compiler. *" + echo "* Use ./configure CFLAGS=... to specify your own flags *" + echo "********************************************************" + echo "" + CFLAGS="" + +fi + + +fi + +fi + +# Enable debugging +# Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" + enable_debug="$enable_debug" +else + enable_debug="yes" +fi; + +if test "${enable_debug}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define DEBUG +_ACEOF + + echo "$as_me:$LINENO: checking CFLAGS for maximum ansi warnings" >&5 +echo $ECHO_N "checking CFLAGS for maximum ansi warnings... $ECHO_C" >&6 +if test "${ac_cv_cflags_warn_all_ansi+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_cflags_warn_all_ansi="no, unknown" + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_save_CFLAGS="$CFLAGS" +# IRIX C compiler: +# -use_readonly_const is the default for IRIX C, +# puts them into .rodata, but they are copied later. +# need to be "-G0 -rdatashared" for strictmode but +# I am not sure what effect that has really. - guidod +for ac_arg in "-pedantic % -Wall -std=c99 -pedantic" "-xstrconst % -v -Xc -xc99=all" "-std1 % -verbose -w0 -warnprotos -std1" " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" " % -ansi -ansiE -fullwarn" "+ESlit % +w1 -Aa" "-Xc % -pvctl,fullmsg -Xc" "-h conform % -h msglevel 2 -h conform" # +do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_cflags_warn_all_ansi=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done + CFLAGS="$ac_save_CFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all_ansi" >&5 +echo "${ECHO_T}$ac_cv_cflags_warn_all_ansi" >&6 +case ".$ac_cv_cflags_warn_all_ansi" in + .ok|.ok,*) ;; + .|.no|.no,*) + ;; + *) + if echo " $CFLAGS " | grep " $ac_cv_cflags_warn_all_ansi " 2>&1 >/dev/null + then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_warn_all_ansi") >&5 + (: CFLAGS does contain $ac_cv_cflags_warn_all_ansi) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all_ansi\"") >&5 + (: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all_ansi") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CFLAGS="$CFLAGS $ac_cv_cflags_warn_all_ansi" + fi + ;; +esac + +fi + + + +if test "${enable_debug}" = "yes"; then + WANT_DEBUG_TRUE= + WANT_DEBUG_FALSE='#' +else + WANT_DEBUG_TRUE='#' + WANT_DEBUG_FALSE= +fi + + + +case "$host" in + *-solaris2*) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + IN_LINE="" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-DPATH_MAX=2048 -fPIC" + new_AM_LDFLAGS="" + IN_LINE=inline + fi + DYNAMIC_LIB_EXTEN="so" + ;; + *-darwin*) + if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-dynamic -bundle -force-flat-namespace" + new_AM_CFLAGS="-DMACOSX" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="dylib" + IN_LINE=inline + ;; + x86_64-*-linux-gnu) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; + i*6-*-linux-gnu) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + fi + IN_LINE=inline + DYNAMIC_LIB_EXTEN="so" + ;; + *) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; +esac + + + + + +cat >>confdefs.h <<_ACEOF +#define inline $IN_LINE +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define __inline__ $IN_LINE +_ACEOF + + + # Checks for header files. @@ -21163,13 +22568,13 @@ yes) cat >>confdefs.h <<\_ACEOF -#define __BYTE_ORDER __BIG_ENDIAN +#define SWITCH_BYTE_ORDER __BIG_ENDIAN _ACEOF ;; no) cat >>confdefs.h <<\_ACEOF -#define __BYTE_ORDER __LITTLE_ENDIAN +#define SWITCH_BYTE_ORDER __LITTLE_ENDIAN _ACEOF ;; *) @@ -21181,16 +22586,6 @@ esac -cat >>confdefs.h <<\_ACEOF -#define __LITTLE_ENDIAN 1234 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define __BIG_ENDIAN 4321 -_ACEOF - - # Check whether --enable-crash-protection or --disable-crash-protection was given. if test "${enable_crash_protection+set}" = set; then enableval="$enable_crash_protection" @@ -21243,10 +22638,6 @@ IS64BITLINUX_FALSE= fi -# AM_CONDITIONAL(ISSUNOS, [test `uname -s` = SunOS]) -# AM_CONDITIONAL(ISSUN64, [test `isainfo -b` = 64]) -# AM_CONDITIONAL(ISSUNSPARC, [test `isainfo -n` = sparcv9]) -# AM_CONDITIONAL(ISGCC, [test `echo $GCC` = true]) ac_config_files="$ac_config_files src/include/switch_version.h" cat >confcache <<\_ACEOF @@ -21361,6 +22752,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${WANT_DEBUG_TRUE}" && test -z "${WANT_DEBUG_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WANT_DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WANT_DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${CRASHPROT_TRUE}" && test -z "${CRASHPROT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"CRASHPROT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -21987,6 +23385,13 @@ s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t +s,@PRTDIAG@,$PRTDIAG,;t t +s,@WANT_DEBUG_TRUE@,$WANT_DEBUG_TRUE,;t t +s,@WANT_DEBUG_FALSE@,$WANT_DEBUG_FALSE,;t t +s,@new_AM_CFLAGS@,$new_AM_CFLAGS,;t t +s,@new_AM_LDFLAGS@,$new_AM_LDFLAGS,;t t +s,@SOLINK@,$SOLINK,;t t +s,@DYNAMIC_LIB_EXTEN@,$DYNAMIC_LIB_EXTEN,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@CRASHPROT_TRUE@,$CRASHPROT_TRUE,;t t s,@CRASHPROT_FALSE@,$CRASHPROT_FALSE,;t t Modified: freeswitch/branches/knhor/trunk/configure.in ============================================================================== --- freeswitch/branches/knhor/trunk/configure.in (original) +++ freeswitch/branches/knhor/trunk/configure.in Tue Dec 19 22:00:59 2006 @@ -10,6 +10,8 @@ AC_PREFIX_DEFAULT(/usr/local/freeswitch) +#Set default language +AC_LANG_C # Checks for programs. AC_PROG_CC AC_PROG_AWK @@ -17,6 +19,100 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL +#Check for compiler vendor +AX_COMPILER_VENDOR + +# Optimize +AC_ARG_ENABLE(optimization, +[AC_HELP_STRING([--enable-optimization],[Set if you want us to add max optimising compiler flags])],[enable_optimizer="$enableval"],[enable_optimizer="no"]) + +if test "${enable_optimizer}" = "yes" ; then + AC_DEFINE([OPTIMZER],[],[Enable Optimization.]) + AX_CC_MAXOPT +fi + +# Enable debugging +AC_ARG_ENABLE(debug, +[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"]) + +if test "${enable_debug}" = "yes"; then + AC_DEFINE([DEBUG],[],[Enable extra debugging.]) + AX_CFLAGS_WARN_ALL_ANSI +fi + +AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) + + +case "$host" in + *-solaris2*) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + IN_LINE="" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-DPATH_MAX=2048 -fPIC" + new_AM_LDFLAGS="" + IN_LINE=inline + fi + DYNAMIC_LIB_EXTEN="so" + ;; + *-darwin*) + if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-dynamic -bundle -force-flat-namespace" + new_AM_CFLAGS="-DMACOSX" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="dylib" + IN_LINE=inline + ;; + x86_64-*-linux-gnu) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; + i*6-*-linux-gnu) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + fi + IN_LINE=inline + DYNAMIC_LIB_EXTEN="so" + ;; + *) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; +esac +AC_SUBST(new_AM_CFLAGS) +AC_SUBST(new_AM_LDFLAGS) +AC_SUBST(SOLINK) +AC_SUBST(DYNAMIC_LIB_EXTEN) +AC_DEFINE_UNQUOTED([inline],[$IN_LINE],[sunpro is bad at inline]) +AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline]) + + # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC @@ -36,9 +132,7 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep]) -AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) -AC_DEFINE([__LITTLE_ENDIAN],1234,[for the places where it is not defined]) -AC_DEFINE([__BIG_ENDIAN],4321,[for the places where it is not defined]) +AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) AC_ARG_ENABLE(crash-protection, [ --enable-crash-protection Compile with CRASH Protection],,[enable_crash_prot="no"]) @@ -50,9 +144,5 @@ AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux]) AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64]) -# AM_CONDITIONAL(ISSUNOS, [test `uname -s` = SunOS]) -# AM_CONDITIONAL(ISSUN64, [test `isainfo -b` = 64]) -# AM_CONDITIONAL(ISSUNSPARC, [test `isainfo -n` = sparcv9]) -# AM_CONDITIONAL(ISGCC, [test `echo $GCC` = true]) AC_OUTPUT([src/include/switch_version.h]) Modified: freeswitch/branches/knhor/trunk/generic_mod.mk ============================================================================== --- freeswitch/branches/knhor/trunk/generic_mod.mk (original) +++ freeswitch/branches/knhor/trunk/generic_mod.mk Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) clean: Modified: freeswitch/branches/knhor/trunk/libs/iax/INSTALL ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/INSTALL (original) +++ freeswitch/branches/knhor/trunk/libs/iax/INSTALL Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives @@ -102,16 +102,16 @@ Installation Names ================== -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular @@ -159,7 +159,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the `--target=TYPE' option to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -189,13 +189,8 @@ ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). `configure' Invocation ====================== Modified: freeswitch/branches/knhor/trunk/libs/iax/Makefile.in ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/Makefile.in (original) +++ freeswitch/branches/knhor/trunk/libs/iax/Makefile.in Tue Dec 19 22:00:59 2006 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -268,13 +268,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -286,7 +280,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -294,13 +288,7 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -321,7 +309,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ Modified: freeswitch/branches/knhor/trunk/libs/iax/aclocal.m4 ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/aclocal.m4 (original) +++ freeswitch/branches/knhor/trunk/libs/iax/aclocal.m4 Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +143,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,7 +163,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -183,17 +182,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -234,56 +231,11 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -356,15 +308,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -533,7 +485,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -584,22 +536,6 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -631,7 +567,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -641,10 +577,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then $2=yes fi fi @@ -670,16 +604,11 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized + # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi else $2=yes fi @@ -738,55 +667,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && @@ -812,7 +697,7 @@ # _LT_AC_CHECK_DLFCN -# ------------------ +# -------------------- AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -820,7 +705,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- +# ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -886,19 +771,17 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); }] EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; + x$lt_unknown|x*) $3 ;; esac else : # compilation failed @@ -910,7 +793,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ---------------------- +# ------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -981,7 +864,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -994,7 +877,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + LDFLAGS="$LDFLAGS $link_static_flag" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -1042,7 +925,7 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -1054,13 +937,11 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -1124,8 +1005,8 @@ [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -1292,7 +1173,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[[45]]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1320,8 +1201,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -1351,7 +1231,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -1374,7 +1254,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -1409,17 +1289,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -1437,19 +1308,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -1469,7 +1335,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -1509,18 +1375,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1578,10 +1432,27 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1642,13 +1513,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -1686,6 +1552,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1711,7 +1584,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -1744,29 +1617,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1780,11 +1630,6 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -1809,9 +1654,6 @@ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -1838,9 +1680,7 @@ case $tagname in CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" @@ -1902,7 +1742,7 @@ # AC_LIBTOOL_WIN32_DLL # -------------------- -# declare package support for building win32 DLLs +# declare package support for building win32 dll's AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ])# AC_LIBTOOL_WIN32_DLL @@ -1940,7 +1780,7 @@ # AC_DISABLE_SHARED # ----------------- -# set the default shared flag to --disable-shared +#- set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -2076,7 +1916,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -2186,7 +2026,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -2218,7 +2058,7 @@ AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU lds only accept -v. +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -2245,15 +2085,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac ])# AC_PROG_LD_RELOAD_FLAG @@ -2287,7 +2118,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[[45]]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -2310,13 +2141,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -2332,7 +2163,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -2348,11 +2179,6 @@ esac ;; -interix3*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -2365,6 +2191,15 @@ # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; @@ -2387,10 +2222,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -2398,11 +2235,15 @@ lt_cv_deplibs_check_method=pass_all ;; +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' @@ -2423,13 +2264,10 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -2449,43 +2287,36 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" break ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; esac - fi - done - IFS="$lt_save_ifs" + esac + fi done + IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" @@ -2517,13 +2348,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. +# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in @@ -2542,13 +2373,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. +# --enable-ltdl-install to the configure arguments. Note that LIBLTDL +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# DIRECTORY is not provided and an installed libltdl is not found, it is +# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' +# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +# quotes!). If your package is not flat and you're not using automake, +# define top_builddir and top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl @@ -2586,21 +2417,10 @@ # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +AC_REQUIRE([AC_PROG_CXXCPP]) _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([AC_PROG_CXX]) -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -fi -])# _LT_AC_PROG_CXXCPP # AC_LIBTOOL_F77 # -------------- @@ -2640,7 +2460,7 @@ # AC_LIBTOOL_RC -# ------------- +# -------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -2673,10 +2493,37 @@ _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE +# +# Check for any special shared library compilation flags. +# +_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +if test "$GCC" = no; then + case $host_os in + sco3.2v5*) + _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' + ;; + esac +fi +if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then + AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : + else + AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) + _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no + fi +fi + +# +# Check to make sure the static flag actually works. +# +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) + + AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) @@ -2685,9 +2532,9 @@ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF +AC_LIBTOOL_DLOPEN_SELF($1) -# Report which library types will actually be built +# Report which librarie types wil actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -2696,7 +2543,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -2709,6 +2556,43 @@ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi + ;; + darwin* | rhapsody*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi ;; esac AC_MSG_RESULT([$enable_shared]) @@ -2734,7 +2618,7 @@ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +AC_REQUIRE([AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -2746,7 +2630,6 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= @@ -2764,7 +2647,7 @@ _LT_AC_TAGVAR(compiler_lib_search_path, $1)= # Source file extension for C++ test sources. -ac_ext=cpp +ac_ext=cc # Object file extension for compiled C++ test sources. objext=o @@ -2774,15 +2657,11 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -2793,18 +2672,18 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - $as_unset lt_cv_prog_gnu_ld + unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - $as_unset lt_cv_path_LD + unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -2893,7 +2772,6 @@ ;; esac done - ;; esac exp_sym_flag='-bexport' @@ -2912,7 +2790,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -2931,12 +2809,8 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -2963,12 +2837,12 @@ _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -2977,26 +2851,16 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach <jrb3(a)best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - chorus*) case $cc_basename in *) @@ -3015,7 +2879,7 @@ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -3024,81 +2888,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + darwin* | rhapsody*) + if test "$GXX" = yes; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' + ;; + esac fi - ;; + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + dgux*) case $cc_basename in - ec++*) + ec++) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - ghcx*) + ghcx) # Green Hills C++ Compiler # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3109,14 +2962,14 @@ ;; esac ;; - freebsd[[12]]*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3133,11 +2986,11 @@ # location of the library. case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC*) + aCC) _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -3147,7 +3000,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -3161,23 +3014,34 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; + ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; *) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, @@ -3187,18 +3051,15 @@ esac case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + aCC) + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -3216,13 +3077,10 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + case "$host_cpu" in + ia64*|hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -3235,25 +3093,11 @@ ;; esac ;; - interix3*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; irix5* | irix6*) case $cc_basename in - CC*) + CC) # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -3264,7 +3108,7 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi @@ -3277,7 +3121,7 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3302,41 +3146,17 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc*) + icpc) # Intel C++ with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) + cxx) # Compaq C++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' @@ -3367,7 +3187,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -3388,25 +3208,9 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - ;; osf3*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3422,14 +3226,14 @@ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx*) + cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3447,7 +3251,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3466,7 +3270,7 @@ ;; osf4* | osf5*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3481,17 +3285,17 @@ # the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx*) + cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ $rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -3510,7 +3314,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3531,14 +3335,27 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; + sco*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - lcc*) + lcc) # Lucid # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3551,33 +3368,36 @@ ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # linker. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -3585,7 +3405,7 @@ # in the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ;; - gcx*) + gcx) # Green Hills C++ Compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' @@ -3623,63 +3443,12 @@ ;; esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3712,6 +3481,8 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -3729,7 +3500,7 @@ ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ +# ------------------------ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary @@ -3783,7 +3554,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" for p in `eval $output_verbose_link_cmd`; do case $p in @@ -3859,37 +3630,13 @@ $rm -f confest.$objext -# PORTME: override above test on systems where it is broken -ifelse([$1],[CXX], -[case $host_os in -interix3*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_AC_TAGVAR(predep_objects,$1)= - _LT_AC_TAGVAR(postdep_objects,$1)= - _LT_AC_TAGVAR(postdeps,$1)= - ;; - -solaris*) - case $cc_basename in - CC*) - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' - ;; - esac - ;; -esac -]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac ])# AC_LIBTOOL_POSTDEP_PREDEP # AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- +# ------------------------ # Ensure that the configuration vars for the C compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -3933,16 +3680,12 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -3952,7 +3695,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -3961,9 +3704,7 @@ fi ;; aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi + test "$enable_shared" = yes && enable_static=no ;; esac AC_MSG_RESULT([$enable_shared]) @@ -3973,6 +3714,8 @@ test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" @@ -3982,7 +3725,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP + AC_LIBTOOL_CONFIG($1) AC_LANG_POP @@ -4010,27 +3755,20 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) @@ -4038,6 +3776,8 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -4047,7 +3787,7 @@ # AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- +# -------------------------- # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -4071,16 +3811,11 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes AC_LIBTOOL_CONFIG($1) @@ -4110,7 +3845,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -4216,7 +3951,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -4227,11 +3962,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" +Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # The names of the tagged configurations supported by this script. available_tags= @@ -4262,13 +3997,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -4279,9 +4008,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -4347,7 +4073,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -4621,6 +4347,9 @@ # Regexp to match symbols that can be accessed directly from C. sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$' +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \2\3 \3' + # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'" @@ -4642,31 +4371,15 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; osf*) symcode='[[BCDEGQRST]]' ;; -solaris*) +solaris* | sysv5*) symcode='[[BDRT]]' ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; sysv4) symcode='[[DFNSTU]]' ;; @@ -4689,11 +4402,8 @@ # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -4849,10 +4559,6 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic @@ -4861,7 +4567,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) ;; *) @@ -4886,28 +4592,18 @@ ;; chorus*) case $cc_basename in - cxch68*) + cxch68) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; dgux*) case $cc_basename in - ec++*) + ec++) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; - ghcx*) + ghcx) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -4915,22 +4611,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC*) + CC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; - aCC*) + aCC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -4943,13 +4639,9 @@ ;; esac ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC*) + CC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' # CC pic flag -KPIC is the default. @@ -4960,24 +4652,18 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # KAI C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc* | ecpc*) + icpc) # Intel C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) + cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -4994,7 +4680,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) @@ -5005,14 +4691,14 @@ ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC*) + KCC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ;; - RCC*) + RCC) # Rational C++ 2.4.1 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; - cxx*) + cxx) # Digital/Compaq C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -5026,15 +4712,24 @@ ;; psos*) ;; + sco*) + case $cc_basename in + CC) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + *) + ;; + esac + ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ;; - gcx*) + gcx) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ;; @@ -5044,12 +4739,12 @@ ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - lcc*) + lcc) # Lucid _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -5059,7 +4754,7 @@ ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -5067,14 +4762,7 @@ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac + unixware*) ;; vxworks*) ;; @@ -5121,11 +4809,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -5142,7 +4825,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -5168,16 +4851,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -5189,7 +4862,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -5213,19 +4886,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. @@ -5240,15 +4906,15 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + sco3.2v5*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' + ;; + solaris*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac ;; sunos4*) @@ -5257,7 +4923,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5270,17 +4936,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5308,7 +4963,7 @@ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= @@ -5317,16 +4972,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -5351,7 +4996,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[[^ ]]*$ [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -5394,8 +5039,7 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) + case $host_os in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -5405,10 +5049,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -5419,27 +5059,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -5490,10 +5109,10 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -5502,58 +5121,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - _LT_AC_TAGVAR(ld_shlibs, $1)=no + ld_shlibs=no fi ;; - interix3*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -5564,7 +5137,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<EOF 1>&2 @@ -5585,33 +5158,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -5619,6 +5165,31 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" + fi + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -5629,11 +5200,16 @@ ;; esac - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -5645,7 +5221,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5679,7 +5255,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -5698,7 +5273,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -5717,12 +5292,8 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -5730,11 +5301,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -5748,12 +5319,12 @@ # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -5762,11 +5333,13 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -5779,7 +5352,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi[[45]]*) + bsdi4*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -5800,57 +5373,57 @@ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + fix_srcfile_path='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -5884,7 +5457,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -5907,62 +5480,47 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + ;; *) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' @@ -6010,7 +5568,6 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else @@ -6056,7 +5613,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6064,15 +5621,21 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; + sco3.2v5*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -6081,18 +5644,8 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6149,45 +5702,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + sysv4.2uw2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + sysv5*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -6205,6 +5749,11 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -6232,7 +5781,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v verstring= @@ -6358,7 +5906,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -6383,17 +5931,29 @@ fi done done -]) SED=$lt_cv_path_SED +]) AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# -*- Autoconf -*- +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Generated from amversion.in; do not edit by hand. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -6405,16 +5965,27 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) + [AM_AUTOMAKE_VERSION([1.9.2])]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# AM_AUX_DIR_EXPAND -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -6460,17 +6031,27 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. -# serial 7 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 6 + # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -6493,16 +6074,27 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) +# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 8 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's @@ -6510,6 +6102,7 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -6649,17 +6242,28 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- +# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. -#serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -6717,20 +6321,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 12 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 11 + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -6831,28 +6446,52 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. -# serial 2 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -6866,16 +6505,27 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -6918,17 +6568,28 @@ rm -f confinc confmf ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 4 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -6953,16 +6614,27 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -7016,16 +6688,27 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -7049,17 +6732,29 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to make sure that the build environment is sane. +# -# serial 4 +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -7101,14 +6796,25 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_STRIP -# --------------------- + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -7131,13 +6837,25 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2004 Free Software Foundation, Inc. -# serial 2 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + # _AM_PROG_TAR(FORMAT) # -------------------- Modified: freeswitch/branches/knhor/trunk/libs/iax/build/config.guess ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/build/config.guess (original) +++ freeswitch/branches/knhor/trunk/libs/iax/build/config.guess Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,15 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Originally written by Per Bothner <per(a)bothner.com>. # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. @@ -55,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -68,11 +66,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -125,7 +123,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi(a)noc.rutgers.edu 1994-08-24) @@ -198,20 +196,55 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -264,43 +297,37 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -308,32 +335,32 @@ else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -342,10 +369,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -357,10 +384,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -371,40 +398,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -428,33 +455,32 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -470,29 +496,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -500,7 +526,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -515,18 +541,14 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -540,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,19 +645,9 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +655,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,166 +687,158 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + exit 0 ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -852,7 +856,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -871,14 +875,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -892,7 +896,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -900,25 +904,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -936,15 +940,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -972,18 +976,15 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -991,27 +992,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1019,16 +1020,15 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` @@ -1046,73 +1046,73 @@ else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit ;; + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit ;; + exit 0 ;; paragon:*:*:*) echo i860-intel-osf1 - exit ;; + exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,65 +1120,61 @@ else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel(a)ccMail.Census.GOV> echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes(a)openmarket.com>. # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf(a)swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green(a)stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green(a)stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1186,7 +1182,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1194,25 +1190,22 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1223,44 +1216,38 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1292,7 +1279,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1381,12 +1368,11 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1395,22 +1381,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1421,9 +1407,7 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gue… -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be Modified: freeswitch/branches/knhor/trunk/libs/iax/build/config.sub ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/build/config.sub (original) +++ freeswitch/branches/knhor/trunk/libs/iax/build/config.sub Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +21,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. # @@ -71,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -84,11 +83,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -100,7 +99,7 @@ *local*) # First pass through any local machine types. echo $1 - exit ;; + exit 0;; * ) break ;; @@ -232,14 +231,13 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -248,7 +246,6 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -257,28 +254,23 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ | msp430 \ | ns16k | ns32k \ - | or32 \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -306,7 +298,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bfin-* | bs2000-* \ + | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -318,7 +310,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -327,7 +319,6 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -336,7 +327,6 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -344,23 +334,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -502,10 +489,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -771,8 +754,9 @@ basic_machine=hppa1.1-oki os=-proelf ;; - openrisc | openrisc-*) + or32 | or32-*) basic_machine=or32-unknown + os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1045,10 +1029,6 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1098,9 +1078,12 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1187,8 +1170,7 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1206,7 +1188,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1315,9 +1297,6 @@ -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1395,9 +1374,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1569,7 +1545,7 @@ esac echo $basic_machine$os -exit +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Modified: freeswitch/branches/knhor/trunk/libs/iax/build/depcomp ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/build/depcomp (original) +++ freeswitch/branches/knhor/trunk/libs/iax/build/depcomp Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2004-05-31.23 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to <bug-automake(a)gnu.org>. EOF - exit $? + exit 0 ;; -v | --v*) echo "depcomp $scriptversion" - exit $? + exit 0 ;; esac @@ -287,43 +287,36 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -467,8 +460,7 @@ done "$@" -E | - sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | + sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Modified: freeswitch/branches/knhor/trunk/libs/iax/build/install-sh ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/build/install-sh (original) +++ freeswitch/branches/knhor/trunk/libs/iax/build/install-sh Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit $?;; + --help) echo "$usage"; exit 0;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit $?;; + --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,8 +226,7 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS pathcomp= @@ -296,7 +295,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 + (exit 1); exit } else : @@ -307,12 +306,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit 1; } + fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit 0 + (exit 0); exit } # Local variables: Modified: freeswitch/branches/knhor/trunk/libs/iax/build/ltmain.sh ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/build/ltmain.sh (original) +++ freeswitch/branches/knhor/trunk/libs/iax/build/ltmain.sh Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +33,9 @@ # function. progpath="$0" +# RH: define SED for historic ltconfig's generated by Libtool 1.3 +[ -z "$SED" ] && SED=sed + # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -43,14 +46,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.22 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" +VERSION=1.5.6 +TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -88,15 +86,14 @@ Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/$[\\`\\"$\\\\]$/\\\1/g' # test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - SP2NL='tr \040 \012' - NL2SP='tr \015\012 \040\040' +case `echo A|tr A '\301'` in + A) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" ;; - *) # EBCDIC based system - SP2NL='tr \100 \n' - NL2SP='tr \r\n \100\100' + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" ;; esac @@ -113,9 +110,8 @@ fi # Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -132,8 +128,6 @@ show="$echo" show_help= execute_dlfiles= -duplicate_deps=no -preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -141,51 +135,13 @@ # Shell function definitions: # This seems to be the best place for them -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } - fi - - $echo "X$my_tmpdir" | $Xsed -} - - # func_win32_libid arg # return the library type of file 'arg' # # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -func_win32_libid () -{ +func_win32_libid () { win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -196,11 +152,12 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac + sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` + if test "X$win32_nmres" = "Ximport" ; then + win32_libid_type="x86 archive import" + else + win32_libid_type="x86 archive static" + fi fi ;; *DLL*) @@ -224,8 +181,7 @@ # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. # arg is usually of the form 'gcc ...' -func_infer_tag () -{ +func_infer_tag () { if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -282,116 +238,12 @@ esac fi } - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi -} - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" -} # End of Shell function definitions ##################################### # Darwin sucks eval std_shrext=\"$shrext_cmds\" -disable_libs=no - # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -456,10 +308,10 @@ --version) $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." + $echo "Copyright (C) 2003 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? + exit $EXIT_SUCCESS ;; --config) @@ -468,7 +320,7 @@ for tagname in $taglist; do ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit $? + exit $EXIT_SUCCESS ;; --debug) @@ -493,7 +345,7 @@ else $echo "disable static libraries" fi - exit $? + exit $EXIT_SUCCESS ;; --finish) mode="finish" ;; @@ -508,11 +360,7 @@ preserve_args="$preserve_args $arg" ;; - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" - ;; + --tag) prevopt="--tag" prev=tag ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -544,18 +392,6 @@ exit $EXIT_FAILURE fi -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac - # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -566,7 +402,7 @@ # Infer the operation mode. if test -z "$mode"; then $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 + $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 case $nonopt in *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link @@ -632,7 +468,7 @@ for arg do - case $arg_mode in + case "$arg_mode" in arg ) # do not "continue". Instead, add this to base_compile lastarg="$arg" @@ -714,10 +550,7 @@ case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. + # in scan sets, so we specify it separately. *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; @@ -791,14 +624,6 @@ esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -871,17 +696,12 @@ $run $rm $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + $echo $srcfile > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac $run $rm "$libobj" "${libobj}T" @@ -903,18 +723,18 @@ fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" else # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" fi if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $exit_status + status=$? + if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $status fi fi @@ -986,9 +806,9 @@ if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" else - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1117,7 +937,6 @@ no_install=no objs= non_pic_objects= - notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1146,15 +965,14 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi - prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi - prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes + prefer_static_libs=yes break ;; esac @@ -1329,11 +1147,6 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1417,13 +1230,6 @@ prev= continue ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; *) eval "$prev=\"\$arg\"" prev= @@ -1482,18 +1288,6 @@ continue ;; - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - -inst-prefix-dir) prev=inst_prefix continue @@ -1520,8 +1314,7 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" + exit $EXIT_FAILURE fi dir="$absdir" ;; @@ -1535,15 +1328,10 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac ;; esac continue @@ -1552,15 +1340,15 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-os2*) + *-*-mingw* | *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1568,19 +1356,10 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -1590,20 +1369,8 @@ continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1612,19 +1379,13 @@ continue ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) - + # gcc -m* arguments should be passed to the linker via $compiler_flags + # in order to pass architecture information to the linker + # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. + -m*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` @@ -1635,7 +1396,9 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" + if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" + fi continue ;; @@ -1873,11 +1636,6 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1983,9 +1741,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status + status=$? + if test "$status" -ne 0 && test ! -d "$output_objdir"; then + exit $status fi fi @@ -2048,6 +1806,7 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2099,7 +1858,7 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + deplibs="$deplib $deplibs" fi continue ;; @@ -2108,6 +1867,10 @@ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 continue fi + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do for search_ext in .la $std_shrext .so .a; do @@ -2218,22 +1981,7 @@ fi case $linkmode in lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then + if test "$deplibs_check_method" != pass_all; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" @@ -2283,7 +2031,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 + $echo "$modename: cannot find the library \`$lib'" 1>&2 exit $EXIT_FAILURE fi @@ -2307,9 +2055,7 @@ # it will not redefine variables installed, or shouldnotlink installed=yes shouldnotlink=no - avoidtemprpath= - # Read the .la file case $lib in */* | *\\*) . $lib ;; @@ -2407,19 +2153,11 @@ dir="$libdir" absdir="$libdir" fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -2492,12 +2230,12 @@ if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; + *) temp_rpath="$temp_rpath $dir" ;; esac fi @@ -2534,12 +2272,8 @@ fi link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2652,15 +2386,11 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-sco3.2v5* ) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -2691,7 +2421,7 @@ add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case $libdir in + case "$libdir" in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2764,7 +2494,7 @@ add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case $libdir in + case "$libdir" in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2825,6 +2555,8 @@ fi fi else + convenience="$convenience $dir/$old_library" + old_convenience="$old_convenience $dir/$old_library" deplibs="$dir/$old_library $deplibs" link_static=yes fi @@ -2942,13 +2674,13 @@ *) continue ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in *" $depdepl "*) ;; *) deplibs="$depdepl $deplibs" ;; esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; + esac done fi # link_all_deplibs != no fi # linkmode = lib @@ -3212,27 +2944,27 @@ # Check that each of the things are valid numbers. case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3258,7 +2990,7 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3411,9 +3143,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` + deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done if test -n "$xrpath"; then @@ -3464,15 +3196,10 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then @@ -3515,11 +3242,11 @@ int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs + $LTCC -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do - name=`expr $i : '-l$.*$'` + name="`expr $i : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3556,11 +3283,11 @@ # Error occurred in the first compile. Let's try to salvage # the situation: Compile a separate program for each library. for i in $deplibs; do - name=`expr $i : '-l$.*$'` + name="`expr $i : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i + $LTCC -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3608,7 +3335,7 @@ set dummy $deplibs_check_method file_magic_regex=`expr "$deplibs_check_method" : "$2 $.*$"` for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l$.*$'` + name="`expr $a_deplib : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3677,7 +3404,7 @@ set dummy $deplibs_check_method match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"` for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l$.*$'` + name="`expr $a_deplib : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3807,35 +3534,6 @@ deplibs=$newdeplibs fi - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3919,7 +3617,6 @@ fi lib="$output_objdir/$realname" - linknames= for link do linknames="$linknames $link" @@ -3948,9 +3645,6 @@ # The command line is too long to execute in one step. $show "using reloadable object file for export list..." skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break fi done IFS="$save_ifs" @@ -3984,13 +3678,67 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -4020,8 +3768,7 @@ fi fi - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else @@ -4040,7 +3787,6 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -4050,13 +3796,13 @@ delfiles= last_robj= k=1 - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$save_output-${k}.$objext # Loop over the list of objects to be linked. for obj in $save_libobjs do eval test_cmds=\"$reload_cmds $objlist $last_robj\" if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + { len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len"; }; then objlist="$objlist $obj" else @@ -4070,9 +3816,9 @@ # the last one created. eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$save_output-${k}.$objext k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$save_output-${k}.$objext objlist=$obj len=1 fi @@ -4092,13 +3838,13 @@ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" fi - # Set up a command to remove the reloadable object files + # Set up a command to remove the reloadale object files # after they are used. i=0 while test "$i" -lt "$k" do i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" + delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" done $echo "creating a temporary reloadable object file: $output" @@ -4146,30 +3892,13 @@ IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } + $run eval "$cmd" || exit $? done IFS="$save_ifs" # Restore the uninstalled library and exit if test "$mode" = relink; then $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi - exit $EXIT_SUCCESS fi @@ -4247,10 +3976,64 @@ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi @@ -4351,35 +4134,6 @@ ;; esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4424,15 +4178,10 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac ;; esac done @@ -4546,25 +4295,13 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac + $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"' else - $run eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + $run eval "${SED} -e 's/$[][.*^$]$/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' + $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac fi fi @@ -4615,26 +4352,7 @@ #endif /* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ const char *name; lt_ptr address; } @@ -4681,29 +4399,16 @@ esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - esac + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4728,7 +4433,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - exit_status=$? + status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4736,7 +4441,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $exit_status + exit $status fi if test -n "$shlibpath_var"; then @@ -4876,12 +4581,10 @@ esac case $host in *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + cwrappersource=`$echo ${objdir}/lt-${output}.c` + cwrapper=`$echo ${output}.exe` + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource <<EOF @@ -4906,9 +4609,6 @@ #include <malloc.h> #include <stdarg.h> #include <assert.h> -#include <string.h> -#include <ctype.h> -#include <sys/stat.h> #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4919,20 +4619,16 @@ #endif #ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' +#define DIR_SEPARATOR '/' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif +#define HAVE_DOS_BASED_FILE_SYSTEM +#ifndef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' #endif +#endif #ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) @@ -4941,32 +4637,17 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); +char * basename (const char *name); +char * fnqualify(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4976,51 +4657,29 @@ char **newargz; int i; - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); + program_name = (char *) xstrdup ((char *) basename (argv[0])); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <<EOF - newargz[0] = (char *) xstrdup("$SHELL"); + cat >> $cwrappersource <<EOF + newargz[0] = "$SHELL"; EOF - cat >> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); + cat >> $cwrappersource <<"EOF" + newargz[1] = fnqualify(argv[0]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; - - for (i=0; i<argc+1; i++) - { - DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); - ; - } - EOF - case $host_os in - mingw*) - cat >> $cwrappersource <<EOF - execv("$SHELL",(char const **)newargz); -EOF - ;; - *) - cat >> $cwrappersource <<EOF + cat >> $cwrappersource <<EOF execv("$SHELL",newargz); EOF - ;; - esac - cat >> $cwrappersource <<"EOF" - return 127; + cat >> $cwrappersource <<"EOF" } void * @@ -5040,148 +4699,48 @@ ; } -const char * -base_name (const char *name) +char * +basename (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') + if (isalpha (name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return base; + return (char *) base; } -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ char * -find_executable (const char* wrapper) +fnqualify(const char *path) { - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ + size_t size; + char *p; char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + assert(path != NULL); - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ + /* Is it qualified already? */ #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { + if (isalpha (path[0]) && path[1] == ':') + return xstrdup (path); #endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif + if (IS_DIR_SEPARATOR (path[0])) + return xstrdup (path); - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ + /* prepend the current directory */ + /* doesn't handle '~' */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; + size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ + p = XMALLOC(char, size); + sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); + return p; } char * @@ -5225,16 +4784,16 @@ va_end (ap); } EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC -s -o $cwrapper $cwrappersource + ;; + esac + $rm $output + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ #! $SHELL @@ -5255,7 +4814,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" @@ -5384,13 +4943,13 @@ # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} + exec \$progdir\\\\\$program \${1+\"\$@\"} " ;; *) $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} + exec \$progdir/\$program \${1+\"\$@\"} " ;; esac @@ -5400,7 +4959,7 @@ fi else # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 exit $EXIT_FAILURE @@ -5432,73 +4991,71 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + # Add in members from convenience archives. + for xlib in $addlibs; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + done fi # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && @@ -5512,7 +5069,20 @@ objlist= concat_cmds= save_oldobjs=$oldobjs - + # GNU ar 2.10+ was changed to match POSIX; thus no paths are + # encoded into archives. This makes 'ar r' malfunction in + # this piecewise linking case whenever conflicting object + # names appear in distinct ar calls; check, warn and compensate. + if (for obj in $save_oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 + $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 + AR_FLAGS=cq + fi # Is there a better way of finding the last object in the list? for obj in $save_oldobjs do @@ -5523,7 +5093,7 @@ oldobjs="$objlist $obj" objlist="$objlist $obj" eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + if len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len"; then : else @@ -5720,11 +5290,11 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then + $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5733,14 +5303,14 @@ shift else install_prog= - arg=$nonopt + arg="$nonopt" fi # The real first argument should be the name of the installation program. # Aesthetically quote it. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5758,31 +5328,28 @@ do if test -n "$dest"; then files="$files $dest" - dest=$arg + dest="$arg" continue fi case $arg in -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; + -f) prev="-f" ;; + -g) prev="-g" ;; + -m) prev="-m" ;; + -o) prev="-o" ;; -s) stripme=" -s" continue ;; - -*) - ;; + -*) ;; + *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then prev= else - dest=$arg + dest="$arg" continue fi ;; @@ -5791,7 +5358,7 @@ # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5960,14 +5527,11 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. for linkname do if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" fi done fi @@ -5980,16 +5544,7 @@ IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } + $run eval "$cmd" || exit $? done IFS="$save_ifs" fi @@ -6083,15 +5638,17 @@ notinst_deplibs= relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; + case $file in + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac # Check the variables that should have been set. @@ -6119,21 +5676,34 @@ done relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; + case $file in + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac outputname= if test "$fast_install" = no && test -n "$relink_command"; then if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` + tmpdir="/tmp" + test -n "$TMPDIR" && tmpdir="$TMPDIR" + tmpdir="$tmpdir/libtool-$$" + save_umask=`umask` + umask 0077 + if $mkdir "$tmpdir"; then + umask $save_umask + else + umask $save_umask + $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 + continue + fi file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. @@ -6157,7 +5727,7 @@ fi # remove .exe since cygwin /usr/bin/install will append another - # one anyway + # one anyways case $install_prog,$host in */usr/bin/install*,*cygwin*) case $file:$destfile in @@ -6257,7 +5827,7 @@ # Exit here if they wanted silent mode. test "$show" = : && exit $EXIT_SUCCESS - $echo "X----------------------------------------------------------------------" | $Xsed + $echo "----------------------------------------------------------------------" $echo "Libraries have been installed in:" for libdir in $libdirs; do $echo " $libdir" @@ -6290,7 +5860,7 @@ $echo $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed + $echo "----------------------------------------------------------------------" exit $EXIT_SUCCESS ;; @@ -6507,17 +6077,9 @@ rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) + if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. cmds=$postuninstall_cmds @@ -6550,8 +6112,7 @@ IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. - ;; - esac + fi fi ;; @@ -6836,7 +6397,7 @@ $echo $echo "Try \`$modename --help' for more information about other modes." -exit $? +exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6850,11 +6411,12 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared +build_libtool_libs=no +build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static +build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: Modified: freeswitch/branches/knhor/trunk/libs/iax/build/missing ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/build/missing (original) +++ freeswitch/branches/knhor/trunk/libs/iax/build/missing Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake(a)gnu.org>." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 touch $file ;; Modified: freeswitch/branches/knhor/trunk/libs/iax/configure ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/configure (original) +++ freeswitch/branches/knhor/trunk/libs/iax/configure Tue Dec 19 22:00:59 2006 @@ -278,15 +278,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -3206,7 +3206,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3231,10 +3231,10 @@ fi done done +SED=$lt_cv_path_SED fi -SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3311,7 +3311,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -3345,7 +3345,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -3375,15 +3375,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -3394,43 +3385,36 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" break ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; esac - fi - done - IFS="$lt_save_ifs" + esac + fi done + IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -3477,7 +3461,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[45]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -3500,13 +3484,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3522,7 +3506,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -3538,11 +3522,6 @@ esac ;; -interix3*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -3555,6 +3534,15 @@ # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; @@ -3577,10 +3565,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -3588,11 +3578,15 @@ lt_cv_deplibs_check_method=pass_all ;; +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' @@ -3613,13 +3607,10 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -3637,9 +3628,6 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC @@ -3675,7 +3663,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3678 "configure"' > conftest.$ac_ext + echo '#line 3666 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3718,7 +3706,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -3831,27 +3819,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - esac need_locks="$enable_libtool_lock" @@ -4944,12 +4912,7 @@ fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5179,9 +5142,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -fi - ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5274,7 +5235,7 @@ # Provide some information about the compiler. -echo "$as_me:5277:" \ +echo "$as_me:5238:" \ "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 @@ -5464,55 +5425,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && @@ -5558,6 +5475,9 @@ # Regexp to match symbols that can be accessed directly from C. sympat='$[_A-Za-z][_A-Za-z0-9]*$' +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \2\3 \3' + # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'" @@ -5579,31 +5499,15 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; irix* | nonstopux*) symcode='[BCDEGRST]' ;; osf*) symcode='[BCDEGQRST]' ;; -solaris*) +solaris* | sysv5*) symcode='[BDRT]' ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; sysv4) symcode='[DFNSTU]' ;; @@ -5626,11 +5530,8 @@ # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]$$symcode$symcode*$[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]$$symcode$symcode*$[ ][ ]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -5792,7 +5693,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g' # Same as above, but do not quote variable references. @@ -5812,7 +5713,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -6069,7 +5970,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -6089,26 +5989,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -6134,7 +6023,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -6196,7 +6085,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -6291,28 +6180,71 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +# +# Check for any special shared library compilation flags. +# +lt_prog_cc_shlib= +if test "$GCC" = no; then + case $host_os in + sco3.2v5*) + lt_prog_cc_shlib='-belf' + ;; + esac +fi +if test -n "$lt_prog_cc_shlib"; then + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 +echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} + if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : + else + { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 +echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} + lt_cv_prog_cc_can_build_shared=no + fi +fi -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +# +# Check to make sure the static flag actually works. +# +echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_prog_compiler_static" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + + + lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then @@ -6334,20 +6266,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6340: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6272: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6344: \$? = $ac_status" >&5 + echo "$as_me:6276: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -6408,11 +6338,6 @@ lt_prog_compiler_pic='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -6429,7 +6354,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -6455,16 +6380,6 @@ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -6476,7 +6391,7 @@ lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -6500,19 +6415,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. @@ -6527,15 +6435,15 @@ lt_prog_compiler_static='-non_shared' ;; + sco3.2v5*) + lt_prog_compiler_pic='-Kpic' + lt_prog_compiler_static='-dn' + ;; + solaris*) + lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac ;; sunos4*) @@ -6544,7 +6452,7 @@ lt_prog_compiler_static='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -6557,17 +6465,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - uts4*) lt_prog_compiler_pic='-pic' lt_prog_compiler_static='-Bstatic' @@ -6602,20 +6499,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6505: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6612: \$? = $ac_status" >&5 + echo "$as_me:6509: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works=yes fi fi @@ -6636,7 +6531,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= @@ -6646,48 +6541,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes - fi - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 - -if test x"$lt_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o+set}" = set; then @@ -6706,25 +6559,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6712: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6565: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6716: \$? = $ac_status" >&5 + echo "$as_me:6569: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -6800,16 +6651,6 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -6820,10 +6661,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -6834,27 +6671,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -6905,10 +6721,10 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -6917,58 +6733,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no fi ;; - interix3*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -6979,7 +6749,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <<EOF 1>&2 @@ -7000,33 +6770,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -7034,6 +6777,31 @@ hardcode_shlibpath_var=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds="$tmp_archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -7044,11 +6812,16 @@ ;; esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -7060,7 +6833,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -7094,7 +6867,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -7113,7 +6885,7 @@ link_all_deplibs=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -7132,12 +6904,8 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -7145,11 +6913,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -7214,12 +6982,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -7279,11 +7047,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + whole_archive_flag_spec=' ' archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -7296,7 +7066,7 @@ ld_shlibs=no ;; - bsdi[45]*) + bsdi4*) export_dynamic_flag_spec=-rdynamic ;; @@ -7322,52 +7092,52 @@ ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then archive_cmds_need_lc=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; @@ -7401,7 +7171,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7424,62 +7194,47 @@ export_dynamic_flag_spec='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: hardcode_direct=no hardcode_shlibpath_var=no ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + hardcode_shlibpath_var=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: hardcode_direct=yes export_dynamic_flag_spec='${wl}-E' @@ -7527,7 +7282,6 @@ hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -7573,7 +7327,7 @@ allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -7581,15 +7335,21 @@ hardcode_libdir_separator=: ;; + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) no_undefined_flag=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -7598,18 +7358,8 @@ hardcode_shlibpath_var=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs=yes ;; @@ -7666,45 +7416,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no + sysv4.2uw2*) + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=no hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no + sysv5*) + no_undefined_flag=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec= hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -7723,6 +7464,11 @@ echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -7755,7 +7501,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -7888,7 +7633,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -7916,8 +7661,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -7947,7 +7691,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -7970,7 +7714,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -8005,17 +7749,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -8033,19 +7768,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -8065,7 +7795,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -8105,18 +7835,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -8174,10 +7892,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 7899 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -8238,13 +7977,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -8282,6 +8016,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -8307,7 +8048,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -8340,29 +8081,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -8378,17 +8096,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct" != no && @@ -9038,7 +8751,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -9054,7 +8767,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9057 "configure" +#line 8770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9111,8 +8824,6 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); } @@ -9122,12 +8833,12 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; esac else : # compilation failed @@ -9142,7 +8853,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + LDFLAGS="$LDFLAGS $link_static_flag" echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then @@ -9154,7 +8865,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9157 "configure" +#line 8868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9211,8 +8922,6 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); } @@ -9222,12 +8931,12 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; esac else : # compilation failed @@ -9260,7 +8969,7 @@ fi -# Report which library types will actually be built +# Report which librarie types wil actually be built echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $can_build_shared" >&5 @@ -9272,7 +8981,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -9285,6 +8994,43 @@ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi + ;; + darwin* | rhapsody*) + if test "$GCC" = yes; then + archive_cmds_need_lc=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='-all_load $convenience' + link_all_deplibs=yes + else + ld_shlibs=no + fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -9310,7 +9056,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -9414,7 +9160,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -9425,11 +9171,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" +Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # The names of the tagged configurations supported by this script. available_tags= @@ -9459,13 +9205,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -9476,9 +9216,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler @@ -9544,7 +9281,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -9809,9 +9546,6 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -9842,9 +9576,7 @@ case $tagname in CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9864,7 +9596,6 @@ hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported hardcode_automatic_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -9882,7 +9613,7 @@ compiler_lib_search_path_CXX= # Source file extension for C++ test sources. -ac_ext=cpp +ac_ext=cc # Object file extension for compiled C++ test sources. objext=o @@ -9892,34 +9623,17 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -9930,28 +9644,19 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - $as_unset lt_cv_prog_gnu_ld + unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - $as_unset lt_cv_path_LD + unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately if test "$GXX" = yes; then @@ -10021,7 +9726,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -10055,7 +9760,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -10146,7 +9851,6 @@ ;; esac done - ;; esac exp_sym_flag='-bexport' @@ -10165,7 +9869,7 @@ link_all_deplibs_CXX=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -10184,12 +9888,8 @@ hardcode_libdir_flag_spec_CXX='-L$libdir' hardcode_libdir_separator_CXX= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -10267,12 +9967,12 @@ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -10332,26 +10032,16 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_CXX=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + whole_archive_flag_spec_CXX=' ' archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach <jrb3(a)best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - chorus*) case $cc_basename in *) @@ -10370,7 +10060,7 @@ enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -10379,81 +10069,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs_CXX=no fi ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + darwin* | rhapsody*) + if test "$GXX" = yes; then + archive_cmds_need_lc_CXX=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_CXX='-undefined dynamic_lookup' + ;; + esac fi - ;; + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='-all_load $convenience' + link_all_deplibs_CXX=yes + else + ld_shlibs_CXX=no + fi + ;; + dgux*) case $cc_basename in - ec++*) + ec++) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - ghcx*) + ghcx) # Green Hills C++ Compiler # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -10464,14 +10143,14 @@ ;; esac ;; - freebsd[12]*) + freebsd12*) # C++ shared libraries reported to be fairly broken before switch to ELF ld_shlibs_CXX=no ;; freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -10488,11 +10167,11 @@ # location of the library. case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC*) + aCC) archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -10502,7 +10181,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -10516,23 +10195,34 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_CXX='+b $libdir' + hardcode_libdir_separator_CXX=: ;; + ia64*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; *) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no ;; + ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; *) hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, @@ -10542,18 +10232,15 @@ esac case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + aCC) + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -10571,13 +10258,10 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + case "$host_cpu" in + ia64*|hppa*64*) + archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -10590,25 +10274,11 @@ ;; esac ;; - interix3*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; irix5* | irix6*) case $cc_basename in - CC*) + CC) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -10619,7 +10289,7 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi @@ -10632,7 +10302,7 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -10657,41 +10327,17 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc*) + icpc) # Intel C++ with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac archive_cmds_need_lc_CXX=no + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) + cxx) # Compaq C++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' @@ -10722,7 +10368,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -10743,25 +10389,9 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - ;; osf3*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -10777,14 +10407,14 @@ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx*) + cxx) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -10802,7 +10432,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -10821,7 +10451,7 @@ ;; osf4* | osf5*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -10836,17 +10466,17 @@ # the KAI C++ compiler. old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx*) + cxx) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ $rm $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -10865,7 +10495,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -10886,14 +10516,27 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; + sco*) + archive_cmds_need_lc_CXX=no + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - lcc*) + lcc) # Lucid # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -10906,33 +10549,36 @@ ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; + solaris2.0-5 | solaris2.0-5.*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # linker. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -10940,7 +10586,7 @@ # in the archive. old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ;; - gcx*) + gcx) # Green Hills C++ Compiler archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' @@ -10978,63 +10624,12 @@ ;; esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -11087,7 +10682,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" for p in `eval $output_verbose_link_cmd`; do case $p in @@ -11163,29 +10758,6 @@ $rm -f confest.$objext -# PORTME: override above test on systems where it is broken -case $host_os in -interix3*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -solaris*) - case $cc_basename in - CC*) - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' - ;; - esac - ;; -esac - - case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac @@ -11233,10 +10805,6 @@ # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; sysv4*MP*) if test -d /usr/nec; then lt_prog_compiler_pic_CXX=-Kconform_pic @@ -11245,7 +10813,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) ;; *) @@ -11270,28 +10838,18 @@ ;; chorus*) case $cc_basename in - cxch68*) + cxch68) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; dgux*) case $cc_basename in - ec++*) + ec++) lt_prog_compiler_pic_CXX='-KPIC' ;; - ghcx*) + ghcx) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-pic' ;; @@ -11299,22 +10857,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC*) + CC) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; - aCC*) + aCC) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in + lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -11327,13 +10885,9 @@ ;; esac ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC*) + CC) lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-non_shared' # CC pic flag -KPIC is the default. @@ -11344,24 +10898,18 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # KAI C++ Compiler lt_prog_compiler_wl_CXX='--backend -Wl,' lt_prog_compiler_pic_CXX='-fPIC' ;; - icpc* | ecpc*) + icpc) # Intel C++ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; - pgCC*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) + cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -11378,7 +10926,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) lt_prog_compiler_pic_CXX='-W c,exportall' ;; *) @@ -11389,14 +10937,14 @@ ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC*) + KCC) lt_prog_compiler_wl_CXX='--backend -Wl,' ;; - RCC*) + RCC) # Rational C++ 2.4.1 lt_prog_compiler_pic_CXX='-pic' ;; - cxx*) + cxx) # Digital/Compaq C++ lt_prog_compiler_wl_CXX='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -11410,15 +10958,24 @@ ;; psos*) ;; + sco*) + case $cc_basename in + CC) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + *) + ;; + esac + ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' lt_prog_compiler_wl_CXX='-Qoption ld ' ;; - gcx*) + gcx) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-PIC' ;; @@ -11428,12 +10985,12 @@ ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x lt_prog_compiler_pic_CXX='-pic' lt_prog_compiler_static_CXX='-Bstatic' ;; - lcc*) + lcc) # Lucid lt_prog_compiler_pic_CXX='-pic' ;; @@ -11443,7 +11000,7 @@ ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -11451,14 +11008,7 @@ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac + unixware*) ;; vxworks*) ;; @@ -11491,20 +11041,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11047: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11501: \$? = $ac_status" >&5 + echo "$as_me:11051: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works_CXX=yes fi fi @@ -11525,7 +11073,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= @@ -11535,48 +11083,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes - fi - else - lt_prog_compiler_static_works_CXX=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 - -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then @@ -11595,25 +11101,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11601: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11107: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11605: \$? = $ac_status" >&5 + echo "$as_me:11111: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o_CXX=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -11668,7 +11172,7 @@ export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[^ ]*$ [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -11679,6 +11183,11 @@ echo "${ECHO_T}$ld_shlibs_CXX" >&6 test "$ld_shlibs_CXX" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -11711,7 +11220,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX compiler_flags=-v linker_flags=-v verstring= @@ -11844,7 +11352,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11872,8 +11380,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -11903,7 +11410,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -11926,7 +11433,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -11961,17 +11468,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -11989,19 +11487,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -12021,7 +11514,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -12061,18 +11554,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -12130,10 +11611,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 11618 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12194,13 +11696,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -12238,6 +11735,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -12263,7 +11767,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -12296,29 +11800,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12334,17 +11815,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_CXX" != no && @@ -12376,7 +11852,842 @@ enable_fast_install=needless fi +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 12489 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 12587 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh # with your package, and you will get complaints that there are @@ -12390,7 +12701,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -12491,13 +12802,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -12508,9 +12813,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_CXX @@ -12576,7 +12878,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -12853,43 +13155,17 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC compiler_F77=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $can_build_shared" >&5 @@ -12901,7 +13177,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -12910,9 +13186,7 @@ fi ;; aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi + test "$enable_shared" = yes && enable_static=no ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -12925,6 +13199,8 @@ echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 +test "$ld_shlibs_F77" = no && can_build_shared=no + GCC_F77="$G77" LD_F77="$LD" @@ -12971,11 +13247,6 @@ lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -12992,7 +13263,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -13018,16 +13289,6 @@ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_F77='-qnocommon' - lt_prog_compiler_wl_F77='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -13039,7 +13300,7 @@ lt_prog_compiler_wl_F77='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -13063,19 +13324,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. @@ -13090,15 +13344,15 @@ lt_prog_compiler_static_F77='-non_shared' ;; + sco3.2v5*) + lt_prog_compiler_pic_F77='-Kpic' + lt_prog_compiler_static_F77='-dn' + ;; + solaris*) + lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac ;; sunos4*) @@ -13107,7 +13361,7 @@ lt_prog_compiler_static_F77='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -13120,17 +13374,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; - uts4*) lt_prog_compiler_pic_F77='-pic' lt_prog_compiler_static_F77='-Bstatic' @@ -13165,20 +13408,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13171: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13414: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13175: \$? = $ac_status" >&5 + echo "$as_me:13418: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works_F77=yes fi fi @@ -13199,7 +13440,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_F77= @@ -13209,48 +13450,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes - fi - else - lt_prog_compiler_static_works_F77=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 - -if test x"$lt_prog_compiler_static_works_F77" = xyes; then - : -else - lt_prog_compiler_static_F77= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then @@ -13269,25 +13468,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13275: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13474: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13279: \$? = $ac_status" >&5 + echo "$as_me:13478: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o_F77=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -13363,16 +13560,6 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -13383,10 +13570,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -13397,27 +13580,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -13468,10 +13630,10 @@ allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -13480,58 +13642,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs_F77=no + ld_shlibs=no fi ;; - interix3*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs_F77=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -13542,7 +13658,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no cat <<EOF 1>&2 @@ -13563,33 +13679,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - sunos4*) archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -13597,6 +13686,31 @@ hardcode_shlibpath_var_F77=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_F77="$tmp_archive_cmds" + fi + else + ld_shlibs_F77=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -13607,11 +13721,16 @@ ;; esac - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= + if test "$ld_shlibs_F77" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -13623,7 +13742,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_F77=unsupported @@ -13657,7 +13776,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -13676,7 +13794,7 @@ link_all_deplibs_F77=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -13695,12 +13813,8 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_libdir_separator_F77= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -13708,11 +13822,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -13767,12 +13881,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -13822,11 +13936,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_F77=' ${wl}-bernotok' allow_undefined_flag_F77=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_F77=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' + whole_archive_flag_spec_F77=' ' archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -13839,7 +13955,7 @@ ld_shlibs_F77=no ;; - bsdi[45]*) + bsdi4*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -13860,57 +13976,57 @@ old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then archive_cmds_need_lc_F77=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_F77='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' + whole_archive_flag_spec_F77='-all_load $convenience' link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_F77=no - ;; - esac + ld_shlibs_F77=no fi ;; @@ -13944,7 +14060,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -13967,62 +14083,47 @@ export_dynamic_flag_spec_F77='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_F77='+b $libdir' + hardcode_libdir_separator_F77=: hardcode_direct_F77=no hardcode_shlibpath_var_F77=no ;; + ia64*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + ;; *) + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: hardcode_direct_F77=yes export_dynamic_flag_spec_F77='${wl}-E' @@ -14070,7 +14171,6 @@ hardcode_shlibpath_var_F77=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' export_dynamic_flag_spec_F77='${wl}-E' else @@ -14116,7 +14216,7 @@ allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_F77='-rpath $libdir' @@ -14124,15 +14224,21 @@ hardcode_libdir_separator_F77=: ;; + sco3.2v5*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + export_dynamic_flag_spec_F77='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -14141,18 +14247,8 @@ hardcode_shlibpath_var_F77=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_F77=yes ;; @@ -14209,45 +14305,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no + sysv4.2uw2*) + archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_minus_L_F77=no hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag_F77='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_F77=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no + sysv5*) + no_undefined_flag_F77=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec_F77= hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -14266,6 +14353,11 @@ echo "${ECHO_T}$ld_shlibs_F77" >&6 test "$ld_shlibs_F77" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -14298,7 +14390,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 compiler_flags=-v linker_flags=-v verstring= @@ -14431,7 +14522,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14459,8 +14550,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -14490,7 +14580,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -14513,7 +14603,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -14548,17 +14638,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -14576,19 +14657,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -14608,7 +14684,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -14648,18 +14724,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -14717,10 +14781,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 14788 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -14781,13 +14866,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14825,6 +14905,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -14850,7 +14937,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -14883,29 +14970,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14921,17 +14985,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ - test "X$hardcode_automatic_F77" = "Xyes" ; then + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_F77" != no && @@ -14963,7 +15022,37 @@ enable_fast_install=needless fi +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh # with your package, and you will get complaints that there are @@ -14977,7 +15066,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -15078,13 +15167,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -15095,9 +15178,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_F77 @@ -15163,7 +15243,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -15401,56 +15481,27 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC compiler_GCJ=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no -old_archive_cmds_GCJ=$old_archive_cmds - lt_prog_compiler_no_builtin_flag_GCJ= if test "$GCC" = yes; then @@ -15472,20 +15523,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15478: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15529: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15482: \$? = $ac_status" >&5 + echo "$as_me:15533: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -15546,11 +15595,6 @@ lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -15567,7 +15611,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -15593,16 +15637,6 @@ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_GCJ='-qnocommon' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -15614,7 +15648,7 @@ lt_prog_compiler_wl_GCJ='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -15638,19 +15672,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-fpic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. @@ -15665,15 +15692,15 @@ lt_prog_compiler_static_GCJ='-non_shared' ;; + sco3.2v5*) + lt_prog_compiler_pic_GCJ='-Kpic' + lt_prog_compiler_static_GCJ='-dn' + ;; + solaris*) + lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_GCJ='-Qoption ld ';; - *) - lt_prog_compiler_wl_GCJ='-Wl,';; - esac ;; sunos4*) @@ -15682,7 +15709,7 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -15695,17 +15722,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_can_build_shared_GCJ=no - ;; - uts4*) lt_prog_compiler_pic_GCJ='-pic' lt_prog_compiler_static_GCJ='-Bstatic' @@ -15740,20 +15756,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15746: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15762: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15750: \$? = $ac_status" >&5 + echo "$as_me:15766: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works_GCJ=yes fi fi @@ -15774,7 +15788,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_GCJ= @@ -15784,48 +15798,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes - fi - else - lt_prog_compiler_static_works_GCJ=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 - -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then - : -else - lt_prog_compiler_static_GCJ= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then @@ -15844,25 +15816,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15850: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15822: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15854: \$? = $ac_status" >&5 + echo "$as_me:15826: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o_GCJ=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -15938,16 +15908,6 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -15958,10 +15918,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -15972,27 +15928,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -16043,10 +15978,10 @@ allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -16055,58 +15990,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; - interix3*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs_GCJ=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -16117,7 +16006,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no cat <<EOF 1>&2 @@ -16138,33 +16027,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_GCJ=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - esac - ;; - sunos4*) archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -16172,6 +16034,31 @@ hardcode_shlibpath_var_GCJ=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_GCJ="$tmp_archive_cmds" + fi + else + ld_shlibs_GCJ=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -16182,11 +16069,16 @@ ;; esac - if test "$ld_shlibs_GCJ" = no; then - runpath_var= - hardcode_libdir_flag_spec_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= + if test "$ld_shlibs_GCJ" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -16198,7 +16090,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_GCJ=unsupported @@ -16232,7 +16124,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -16251,7 +16142,7 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -16270,12 +16161,8 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_libdir_separator_GCJ= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -16283,11 +16170,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -16352,12 +16239,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -16417,11 +16304,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_GCJ=' ${wl}-bernotok' allow_undefined_flag_GCJ=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_GCJ=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ='$convenience' + whole_archive_flag_spec_GCJ=' ' archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -16434,7 +16323,7 @@ ld_shlibs_GCJ=no ;; - bsdi[45]*) + bsdi4*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -16455,57 +16344,57 @@ old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then archive_cmds_need_lc_GCJ=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='' + whole_archive_flag_spec_GCJ='-all_load $convenience' link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_GCJ=no - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -16539,7 +16428,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16562,62 +16451,47 @@ export_dynamic_flag_spec_GCJ='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' + hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no ;; + ia64*) + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + ;; *) + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=yes export_dynamic_flag_spec_GCJ='${wl}-E' @@ -16665,7 +16539,6 @@ hardcode_shlibpath_var_GCJ=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' export_dynamic_flag_spec_GCJ='${wl}-E' else @@ -16711,7 +16584,7 @@ allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_GCJ='-rpath $libdir' @@ -16719,15 +16592,21 @@ hardcode_libdir_separator_GCJ=: ;; + sco3.2v5*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + export_dynamic_flag_spec_GCJ='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -16736,18 +16615,8 @@ hardcode_shlibpath_var_GCJ=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_GCJ=yes ;; @@ -16804,45 +16673,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no + sysv4.2uw2*) + archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=no hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_GCJ=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_GCJ='${wl}-z,text' - allow_undefined_flag_GCJ='${wl}-z,nodefs' - archive_cmds_need_lc_GCJ=no + sysv5*) + no_undefined_flag_GCJ=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec_GCJ= hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -16861,6 +16721,11 @@ echo "${ECHO_T}$ld_shlibs_GCJ" >&6 test "$ld_shlibs_GCJ" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -16893,7 +16758,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_GCJ - pic_flag=$lt_prog_compiler_pic_GCJ compiler_flags=-v linker_flags=-v verstring= @@ -17026,7 +16890,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17054,8 +16918,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -17085,7 +16948,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -17108,7 +16971,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -17143,17 +17006,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -17171,19 +17025,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -17203,7 +17052,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -17243,18 +17092,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -17312,10 +17149,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 17156 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17376,13 +17234,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -17420,6 +17273,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -17445,7 +17305,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -17478,29 +17338,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17516,17 +17353,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_GCJ" != no && @@ -17558,7 +17390,842 @@ enable_fast_install=needless fi +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 18027 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 18125 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh # with your package, and you will get complaints that there are @@ -17572,7 +18239,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -17673,13 +18340,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -17690,9 +18351,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_GCJ @@ -17758,7 +18416,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18002,42 +18660,15 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -18053,7 +18684,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18154,13 +18785,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18171,9 +18796,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_RC @@ -18239,7 +18861,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -19912,13 +20534,11 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - FUNC_DEF=__func__ IN_LINE="" elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline - FUNC_DEF=__PRETTY_FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" ;; @@ -19930,19 +20550,16 @@ fi DYNAMIC_LIB_EXTEN="dylib" IN_LINE=inline - FUNC_DEF=__PRETTY_FUNCTION__ ;; x86_64-*-linux-gnu) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" - FUNC_DEF=__PRETTY_FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline @@ -19952,25 +20569,31 @@ SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" new_AM_LDFLAGS="" - FUNC_DEF=__PRETTY_FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; + *) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; esac - - -cat >>confdefs.h <<_ACEOF -#define __FUNCTION__ $FUNC_DEF -_ACEOF cat >>confdefs.h <<_ACEOF Modified: freeswitch/branches/knhor/trunk/libs/iax/configure.in ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/configure.in (original) +++ freeswitch/branches/knhor/trunk/libs/iax/configure.in Tue Dec 19 22:00:59 2006 @@ -42,13 +42,11 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - FUNC_DEF=__func__ IN_LINE="" elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline - FUNC_DEF=__PRETTY_FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" ;; @@ -60,19 +58,16 @@ fi DYNAMIC_LIB_EXTEN="dylib" IN_LINE=inline - FUNC_DEF=__PRETTY_FUNCTION__ ;; x86_64-*-linux-gnu) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" - FUNC_DEF=__PRETTY_FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline @@ -82,22 +77,32 @@ SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" new_AM_LDFLAGS="" - FUNC_DEF=__PRETTY_FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; + *) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; esac AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN) -AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline]) dnl Check for libraries Modified: freeswitch/branches/knhor/trunk/libs/iax/src/Makefile.in ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/src/Makefile.in (original) +++ freeswitch/branches/knhor/trunk/libs/iax/src/Makefile.in Tue Dec 19 22:00:59 2006 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,8 @@ @SET_MAKE@ +SOURCES = $(libiax_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -71,11 +73,11 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libiax_la_SOURCES) DIST_SOURCES = $(libiax_la_SOURCES) Modified: freeswitch/branches/knhor/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/branches/knhor/trunk/libs/iax/src/iax.c (original) +++ freeswitch/branches/knhor/trunk/libs/iax/src/iax.c Tue Dec 19 22:00:59 2006 @@ -283,7 +283,11 @@ } /* This is a little strange, but to debug you call DEBU(G "Hello World!\n"); */ +#ifdef WIN32 #define G __FILE__, __LINE__, __FUNCTION__, +#else +#define G __FILE__, __LINE__, (const char *)__func__, +#endif #define DEBU __debug static int __debug(char *file, int lineno, const char *func, char *fmt, ...) Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/INSTALL ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/INSTALL (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/INSTALL Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives @@ -102,16 +102,16 @@ Installation Names ================== -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular @@ -159,7 +159,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the `--target=TYPE' option to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -189,13 +189,8 @@ ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). `configure' Invocation ====================== Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/Makefile.in ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/Makefile.in (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/Makefile.in Tue Dec 19 22:00:59 2006 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,8 @@ @SET_MAKE@ +SOURCES = $(libdingaling_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -81,11 +83,11 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libdingaling_la_SOURCES) DIST_SOURCES = $(libdingaling_la_SOURCES) @@ -349,18 +351,18 @@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libdingaling_la-libdingaling.lo: src/libdingaling.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -MT libdingaling_la-libdingaling.lo -MD -MP -MF "$(DEPDIR)/libdingaling_la-libdingaling.Tpo" -c -o libdingaling_la-libdingaling.lo `test -f 'src/libdingaling.c' || echo '$(srcdir)/'`src/libdingaling.c; \ +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -MT libdingaling_la-libdingaling.lo -MD -MP -MF "$(DEPDIR)/libdingaling_la-libdingaling.Tpo" -c -o libdingaling_la-libdingaling.lo `test -f 'src/libdingaling.c' || echo '$(srcdir)/'`src/libdingaling.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libdingaling_la-libdingaling.Tpo" "$(DEPDIR)/libdingaling_la-libdingaling.Plo"; else rm -f "$(DEPDIR)/libdingaling_la-libdingaling.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/libdingaling.c' object='libdingaling_la-libdingaling.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -c -o libdingaling_la-libdingaling.lo `test -f 'src/libdingaling.c' || echo '$(srcdir)/'`src/libdingaling.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -c -o libdingaling_la-libdingaling.lo `test -f 'src/libdingaling.c' || echo '$(srcdir)/'`src/libdingaling.c libdingaling_la-sha1.lo: src/sha1.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -MT libdingaling_la-sha1.lo -MD -MP -MF "$(DEPDIR)/libdingaling_la-sha1.Tpo" -c -o libdingaling_la-sha1.lo `test -f 'src/sha1.c' || echo '$(srcdir)/'`src/sha1.c; \ +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -MT libdingaling_la-sha1.lo -MD -MP -MF "$(DEPDIR)/libdingaling_la-sha1.Tpo" -c -o libdingaling_la-sha1.lo `test -f 'src/sha1.c' || echo '$(srcdir)/'`src/sha1.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libdingaling_la-sha1.Tpo" "$(DEPDIR)/libdingaling_la-sha1.Plo"; else rm -f "$(DEPDIR)/libdingaling_la-sha1.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/sha1.c' object='libdingaling_la-sha1.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -c -o libdingaling_la-sha1.lo `test -f 'src/sha1.c' || echo '$(srcdir)/'`src/sha1.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdingaling_la_CFLAGS) $(CFLAGS) -c -o libdingaling_la-sha1.lo `test -f 'src/sha1.c' || echo '$(srcdir)/'`src/sha1.c mostlyclean-libtool: -rm -f *.lo @@ -396,13 +398,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -414,7 +410,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -422,13 +418,7 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -449,7 +439,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/aclocal.m4 ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/aclocal.m4 (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/aclocal.m4 Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +143,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,7 +163,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -183,17 +182,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -234,56 +231,11 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -356,15 +308,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -533,7 +485,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -584,22 +536,6 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -631,7 +567,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -641,10 +577,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then $2=yes fi fi @@ -670,16 +604,11 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized + # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi else $2=yes fi @@ -738,55 +667,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && @@ -812,7 +697,7 @@ # _LT_AC_CHECK_DLFCN -# ------------------ +# -------------------- AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -820,7 +705,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- +# ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -886,19 +771,17 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); }] EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; + x$lt_unknown|x*) $3 ;; esac else : # compilation failed @@ -910,7 +793,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ---------------------- +# ------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -981,7 +864,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -994,7 +877,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + LDFLAGS="$LDFLAGS $link_static_flag" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -1042,7 +925,7 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -1054,13 +937,11 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -1124,8 +1005,8 @@ [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -1292,7 +1173,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[[45]]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1320,8 +1201,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -1351,7 +1231,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -1374,7 +1254,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -1409,17 +1289,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -1437,19 +1308,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -1469,7 +1335,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -1509,18 +1375,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1578,10 +1432,27 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1642,13 +1513,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -1686,6 +1552,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1711,7 +1584,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -1744,29 +1617,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1780,11 +1630,6 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -1809,9 +1654,6 @@ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -1838,9 +1680,7 @@ case $tagname in CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" @@ -1902,7 +1742,7 @@ # AC_LIBTOOL_WIN32_DLL # -------------------- -# declare package support for building win32 DLLs +# declare package support for building win32 dll's AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ])# AC_LIBTOOL_WIN32_DLL @@ -1940,7 +1780,7 @@ # AC_DISABLE_SHARED # ----------------- -# set the default shared flag to --disable-shared +#- set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -2076,7 +1916,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -2186,7 +2026,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -2218,7 +2058,7 @@ AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU lds only accept -v. +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -2245,15 +2085,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac ])# AC_PROG_LD_RELOAD_FLAG @@ -2287,7 +2118,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[[45]]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -2310,13 +2141,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -2332,7 +2163,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -2348,11 +2179,6 @@ esac ;; -interix3*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -2365,6 +2191,15 @@ # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; @@ -2387,10 +2222,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -2398,11 +2235,15 @@ lt_cv_deplibs_check_method=pass_all ;; +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' @@ -2423,13 +2264,10 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -2449,43 +2287,36 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" break ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; esac - fi - done - IFS="$lt_save_ifs" + esac + fi done + IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" @@ -2517,13 +2348,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. +# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in @@ -2542,13 +2373,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. +# --enable-ltdl-install to the configure arguments. Note that LIBLTDL +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# DIRECTORY is not provided and an installed libltdl is not found, it is +# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' +# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +# quotes!). If your package is not flat and you're not using automake, +# define top_builddir and top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl @@ -2586,21 +2417,10 @@ # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +AC_REQUIRE([AC_PROG_CXXCPP]) _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([AC_PROG_CXX]) -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -fi -])# _LT_AC_PROG_CXXCPP # AC_LIBTOOL_F77 # -------------- @@ -2640,7 +2460,7 @@ # AC_LIBTOOL_RC -# ------------- +# -------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -2673,10 +2493,37 @@ _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE +# +# Check for any special shared library compilation flags. +# +_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +if test "$GCC" = no; then + case $host_os in + sco3.2v5*) + _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' + ;; + esac +fi +if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then + AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : + else + AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) + _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no + fi +fi + +# +# Check to make sure the static flag actually works. +# +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) + + AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) @@ -2685,9 +2532,9 @@ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF +AC_LIBTOOL_DLOPEN_SELF($1) -# Report which library types will actually be built +# Report which librarie types wil actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -2696,7 +2543,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -2709,6 +2556,43 @@ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi + ;; + darwin* | rhapsody*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi ;; esac AC_MSG_RESULT([$enable_shared]) @@ -2734,7 +2618,7 @@ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +AC_REQUIRE([AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -2746,7 +2630,6 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= @@ -2764,7 +2647,7 @@ _LT_AC_TAGVAR(compiler_lib_search_path, $1)= # Source file extension for C++ test sources. -ac_ext=cpp +ac_ext=cc # Object file extension for compiled C++ test sources. objext=o @@ -2774,15 +2657,11 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -2793,18 +2672,18 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - $as_unset lt_cv_prog_gnu_ld + unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - $as_unset lt_cv_path_LD + unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -2893,7 +2772,6 @@ ;; esac done - ;; esac exp_sym_flag='-bexport' @@ -2912,7 +2790,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -2931,12 +2809,8 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -2963,12 +2837,12 @@ _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -2977,26 +2851,16 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach <jrb3(a)best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - chorus*) case $cc_basename in *) @@ -3015,7 +2879,7 @@ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -3024,81 +2888,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + darwin* | rhapsody*) + if test "$GXX" = yes; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' + ;; + esac fi - ;; + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + dgux*) case $cc_basename in - ec++*) + ec++) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - ghcx*) + ghcx) # Green Hills C++ Compiler # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3109,14 +2962,14 @@ ;; esac ;; - freebsd[[12]]*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3133,11 +2986,11 @@ # location of the library. case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC*) + aCC) _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -3147,7 +3000,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -3161,23 +3014,34 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; + ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; *) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, @@ -3187,18 +3051,15 @@ esac case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + aCC) + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -3216,13 +3077,10 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + case "$host_cpu" in + ia64*|hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -3235,25 +3093,11 @@ ;; esac ;; - interix3*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; irix5* | irix6*) case $cc_basename in - CC*) + CC) # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -3264,7 +3108,7 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi @@ -3277,7 +3121,7 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3302,41 +3146,17 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc*) + icpc) # Intel C++ with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) + cxx) # Compaq C++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' @@ -3367,7 +3187,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -3388,25 +3208,9 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - ;; osf3*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3422,14 +3226,14 @@ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx*) + cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3447,7 +3251,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3466,7 +3270,7 @@ ;; osf4* | osf5*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3481,17 +3285,17 @@ # the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx*) + cxx) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ $rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -3510,7 +3314,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3531,14 +3335,27 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; + sco*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - lcc*) + lcc) # Lucid # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3551,33 +3368,36 @@ ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # linker. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -3585,7 +3405,7 @@ # in the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ;; - gcx*) + gcx) # Green Hills C++ Compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' @@ -3623,63 +3443,12 @@ ;; esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3712,6 +3481,8 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -3729,7 +3500,7 @@ ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ +# ------------------------ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary @@ -3783,7 +3554,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" for p in `eval $output_verbose_link_cmd`; do case $p in @@ -3859,37 +3630,13 @@ $rm -f confest.$objext -# PORTME: override above test on systems where it is broken -ifelse([$1],[CXX], -[case $host_os in -interix3*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_AC_TAGVAR(predep_objects,$1)= - _LT_AC_TAGVAR(postdep_objects,$1)= - _LT_AC_TAGVAR(postdeps,$1)= - ;; - -solaris*) - case $cc_basename in - CC*) - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' - ;; - esac - ;; -esac -]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac ])# AC_LIBTOOL_POSTDEP_PREDEP # AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- +# ------------------------ # Ensure that the configuration vars for the C compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -3933,16 +3680,12 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -3952,7 +3695,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -3961,9 +3704,7 @@ fi ;; aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi + test "$enable_shared" = yes && enable_static=no ;; esac AC_MSG_RESULT([$enable_shared]) @@ -3973,6 +3714,8 @@ test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" @@ -3982,7 +3725,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP + AC_LIBTOOL_CONFIG($1) AC_LANG_POP @@ -4010,27 +3755,20 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) @@ -4038,6 +3776,8 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -4047,7 +3787,7 @@ # AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- +# -------------------------- # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -4071,16 +3811,11 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes AC_LIBTOOL_CONFIG($1) @@ -4110,7 +3845,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -4216,7 +3951,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -4227,11 +3962,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" +Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # The names of the tagged configurations supported by this script. available_tags= @@ -4262,13 +3997,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -4279,9 +4008,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -4347,7 +4073,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -4621,6 +4347,9 @@ # Regexp to match symbols that can be accessed directly from C. sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$' +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \2\3 \3' + # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'" @@ -4642,31 +4371,15 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; osf*) symcode='[[BCDEGQRST]]' ;; -solaris*) +solaris* | sysv5*) symcode='[[BDRT]]' ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; sysv4) symcode='[[DFNSTU]]' ;; @@ -4689,11 +4402,8 @@ # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -4849,10 +4559,6 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic @@ -4861,7 +4567,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) ;; *) @@ -4886,28 +4592,18 @@ ;; chorus*) case $cc_basename in - cxch68*) + cxch68) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; dgux*) case $cc_basename in - ec++*) + ec++) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; - ghcx*) + ghcx) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -4915,22 +4611,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC*) + CC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; - aCC*) + aCC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -4943,13 +4639,9 @@ ;; esac ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC*) + CC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' # CC pic flag -KPIC is the default. @@ -4960,24 +4652,18 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # KAI C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc* | ecpc*) + icpc) # Intel C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) + cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -4994,7 +4680,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) @@ -5005,14 +4691,14 @@ ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC*) + KCC) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ;; - RCC*) + RCC) # Rational C++ 2.4.1 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; - cxx*) + cxx) # Digital/Compaq C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -5026,15 +4712,24 @@ ;; psos*) ;; + sco*) + case $cc_basename in + CC) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + *) + ;; + esac + ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ;; - gcx*) + gcx) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ;; @@ -5044,12 +4739,12 @@ ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - lcc*) + lcc) # Lucid _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -5059,7 +4754,7 @@ ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -5067,14 +4762,7 @@ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac + unixware*) ;; vxworks*) ;; @@ -5121,11 +4809,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -5142,7 +4825,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -5168,16 +4851,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -5189,7 +4862,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -5213,19 +4886,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. @@ -5240,15 +4906,15 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + sco3.2v5*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' + ;; + solaris*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac ;; sunos4*) @@ -5257,7 +4923,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5270,17 +4936,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5308,7 +4963,7 @@ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= @@ -5317,16 +4972,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -5351,7 +4996,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[[^ ]]*$ [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -5394,8 +5039,7 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) + case $host_os in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -5405,10 +5049,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -5419,27 +5059,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -5490,10 +5109,10 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -5502,58 +5121,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - _LT_AC_TAGVAR(ld_shlibs, $1)=no + ld_shlibs=no fi ;; - interix3*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -5564,7 +5137,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<EOF 1>&2 @@ -5585,33 +5158,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -5619,6 +5165,31 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" + fi + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -5629,11 +5200,16 @@ ;; esac - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -5645,7 +5221,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5679,7 +5255,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -5698,7 +5273,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -5717,12 +5292,8 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -5730,11 +5301,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -5748,12 +5319,12 @@ # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -5762,11 +5333,13 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -5779,7 +5352,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi[[45]]*) + bsdi4*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -5800,57 +5373,57 @@ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + fix_srcfile_path='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -5884,7 +5457,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -5907,62 +5480,47 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + ;; *) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' @@ -6010,7 +5568,6 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else @@ -6056,7 +5613,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6064,15 +5621,21 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; + sco3.2v5*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -6081,18 +5644,8 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6149,45 +5702,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + sysv4.2uw2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + sysv5*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -6205,6 +5749,11 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -6232,7 +5781,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v verstring= @@ -6358,7 +5906,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -6383,17 +5931,29 @@ fi done done -]) SED=$lt_cv_path_SED +]) AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# -*- Autoconf -*- +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Generated from amversion.in; do not edit by hand. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -6405,16 +5965,27 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) + [AM_AUTOMAKE_VERSION([1.9.2])]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# AM_AUX_DIR_EXPAND -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -6460,17 +6031,27 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. -# serial 7 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 6 + # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -6493,16 +6074,27 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) +# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 8 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's @@ -6510,6 +6102,7 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -6649,17 +6242,28 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- +# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. -#serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -6717,20 +6321,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 12 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 11 + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -6831,28 +6446,52 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. -# serial 2 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -6866,16 +6505,27 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -6918,17 +6568,28 @@ rm -f confinc confmf ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 4 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -6953,16 +6614,27 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -7016,16 +6688,27 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -7049,17 +6732,29 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to make sure that the build environment is sane. +# -# serial 4 +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -7101,14 +6796,25 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_STRIP -# --------------------- + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -7131,13 +6837,25 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2004 Free Software Foundation, Inc. -# serial 2 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + # _AM_PROG_TAR(FORMAT) # -------------------- Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/compile ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/compile (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/compile Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -47,11 +47,11 @@ Report bugs to <bug-automake(a)gnu.org>. EOF - exit $? + exit 0 ;; -v | --v*) echo "compile $scriptversion" - exit $? + exit 0 ;; esac @@ -125,8 +125,6 @@ if test -f "$cofile"; then mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.guess ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.guess (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.guess Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,15 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Originally written by Per Bothner <per(a)bothner.com>. # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. @@ -55,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -68,11 +66,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -125,7 +123,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi(a)noc.rutgers.edu 1994-08-24) @@ -198,20 +196,55 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -264,43 +297,37 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -308,32 +335,32 @@ else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -342,10 +369,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -357,10 +384,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -371,40 +398,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -428,33 +455,32 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -470,29 +496,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -500,7 +526,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -515,18 +541,14 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -540,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,19 +645,9 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +655,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,166 +687,158 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + exit 0 ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -852,7 +856,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -871,14 +875,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -892,7 +896,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -900,25 +904,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -936,15 +940,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -972,18 +976,15 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -991,27 +992,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1019,16 +1020,15 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` @@ -1046,73 +1046,73 @@ else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit ;; + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit ;; + exit 0 ;; paragon:*:*:*) echo i860-intel-osf1 - exit ;; + exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,65 +1120,61 @@ else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel(a)ccMail.Census.GOV> echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes(a)openmarket.com>. # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf(a)swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green(a)stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green(a)stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1186,7 +1182,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1194,25 +1190,22 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1223,44 +1216,38 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1292,7 +1279,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1381,12 +1368,11 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1395,22 +1381,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1421,9 +1407,7 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gue… -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.sub ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.sub (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/config.sub Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +21,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. # @@ -71,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -84,11 +83,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -100,7 +99,7 @@ *local*) # First pass through any local machine types. echo $1 - exit ;; + exit 0;; * ) break ;; @@ -232,14 +231,13 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -248,7 +246,6 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -257,28 +254,23 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ | msp430 \ | ns16k | ns32k \ - | or32 \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -306,7 +298,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bfin-* | bs2000-* \ + | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -318,7 +310,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -327,7 +319,6 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -336,7 +327,6 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -344,23 +334,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -502,10 +489,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -771,8 +754,9 @@ basic_machine=hppa1.1-oki os=-proelf ;; - openrisc | openrisc-*) + or32 | or32-*) basic_machine=or32-unknown + os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1045,10 +1029,6 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1098,9 +1078,12 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1187,8 +1170,7 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1206,7 +1188,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1315,9 +1297,6 @@ -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1395,9 +1374,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1569,7 +1545,7 @@ esac echo $basic_machine$os -exit +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/depcomp ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/depcomp (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/depcomp Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2004-05-31.23 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to <bug-automake(a)gnu.org>. EOF - exit $? + exit 0 ;; -v | --v*) echo "depcomp $scriptversion" - exit $? + exit 0 ;; esac @@ -287,43 +287,36 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -467,8 +460,7 @@ done "$@" -E | - sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | + sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/install-sh ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/install-sh (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/install-sh Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit $?;; + --help) echo "$usage"; exit 0;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit $?;; + --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,8 +226,7 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS pathcomp= @@ -296,7 +295,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 + (exit 1); exit } else : @@ -307,12 +306,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit 1; } + fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit 0 + (exit 0); exit } # Local variables: Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/ltmain.sh ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/ltmain.sh (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/ltmain.sh Tue Dec 19 22:00:59 2006 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +33,9 @@ # function. progpath="$0" +# RH: define SED for historic ltconfig's generated by Libtool 1.3 +[ -z "$SED" ] && SED=sed + # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -43,14 +46,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.22 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" +VERSION=1.5.6 +TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -88,15 +86,14 @@ Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/$[\\`\\"$\\\\]$/\\\1/g' # test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - SP2NL='tr \040 \012' - NL2SP='tr \015\012 \040\040' +case `echo A|tr A '\301'` in + A) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" ;; - *) # EBCDIC based system - SP2NL='tr \100 \n' - NL2SP='tr \r\n \100\100' + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" ;; esac @@ -113,9 +110,8 @@ fi # Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -132,8 +128,6 @@ show="$echo" show_help= execute_dlfiles= -duplicate_deps=no -preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -141,51 +135,13 @@ # Shell function definitions: # This seems to be the best place for them -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } - fi - - $echo "X$my_tmpdir" | $Xsed -} - - # func_win32_libid arg # return the library type of file 'arg' # # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -func_win32_libid () -{ +func_win32_libid () { win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -196,11 +152,12 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac + sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` + if test "X$win32_nmres" = "Ximport" ; then + win32_libid_type="x86 archive import" + else + win32_libid_type="x86 archive static" + fi fi ;; *DLL*) @@ -224,8 +181,7 @@ # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. # arg is usually of the form 'gcc ...' -func_infer_tag () -{ +func_infer_tag () { if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -282,116 +238,12 @@ esac fi } - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi -} - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" -} # End of Shell function definitions ##################################### # Darwin sucks eval std_shrext=\"$shrext_cmds\" -disable_libs=no - # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -456,10 +308,10 @@ --version) $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." + $echo "Copyright (C) 2003 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? + exit $EXIT_SUCCESS ;; --config) @@ -468,7 +320,7 @@ for tagname in $taglist; do ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit $? + exit $EXIT_SUCCESS ;; --debug) @@ -493,7 +345,7 @@ else $echo "disable static libraries" fi - exit $? + exit $EXIT_SUCCESS ;; --finish) mode="finish" ;; @@ -508,11 +360,7 @@ preserve_args="$preserve_args $arg" ;; - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" - ;; + --tag) prevopt="--tag" prev=tag ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -544,18 +392,6 @@ exit $EXIT_FAILURE fi -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac - # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -566,7 +402,7 @@ # Infer the operation mode. if test -z "$mode"; then $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 + $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 case $nonopt in *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link @@ -632,7 +468,7 @@ for arg do - case $arg_mode in + case "$arg_mode" in arg ) # do not "continue". Instead, add this to base_compile lastarg="$arg" @@ -714,10 +550,7 @@ case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. + # in scan sets, so we specify it separately. *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; @@ -791,14 +624,6 @@ esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -871,17 +696,12 @@ $run $rm $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + $echo $srcfile > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac $run $rm "$libobj" "${libobj}T" @@ -903,18 +723,18 @@ fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" else # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" fi if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $exit_status + status=$? + if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $status fi fi @@ -986,9 +806,9 @@ if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" else - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1117,7 +937,6 @@ no_install=no objs= non_pic_objects= - notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1146,15 +965,14 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi - prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi - prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes + prefer_static_libs=yes break ;; esac @@ -1329,11 +1147,6 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1417,13 +1230,6 @@ prev= continue ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; *) eval "$prev=\"\$arg\"" prev= @@ -1482,18 +1288,6 @@ continue ;; - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - -inst-prefix-dir) prev=inst_prefix continue @@ -1520,8 +1314,7 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" + exit $EXIT_FAILURE fi dir="$absdir" ;; @@ -1535,15 +1328,10 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac ;; esac continue @@ -1552,15 +1340,15 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-os2*) + *-*-mingw* | *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1568,19 +1356,10 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -1590,20 +1369,8 @@ continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1612,19 +1379,13 @@ continue ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) - + # gcc -m* arguments should be passed to the linker via $compiler_flags + # in order to pass architecture information to the linker + # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. + -m*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` @@ -1635,7 +1396,9 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" + if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" + fi continue ;; @@ -1873,11 +1636,6 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1983,9 +1741,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status + status=$? + if test "$status" -ne 0 && test ! -d "$output_objdir"; then + exit $status fi fi @@ -2048,6 +1806,7 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2099,7 +1858,7 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + deplibs="$deplib $deplibs" fi continue ;; @@ -2108,6 +1867,10 @@ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 continue fi + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do for search_ext in .la $std_shrext .so .a; do @@ -2218,22 +1981,7 @@ fi case $linkmode in lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then + if test "$deplibs_check_method" != pass_all; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" @@ -2283,7 +2031,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 + $echo "$modename: cannot find the library \`$lib'" 1>&2 exit $EXIT_FAILURE fi @@ -2307,9 +2055,7 @@ # it will not redefine variables installed, or shouldnotlink installed=yes shouldnotlink=no - avoidtemprpath= - # Read the .la file case $lib in */* | *\\*) . $lib ;; @@ -2407,19 +2153,11 @@ dir="$libdir" absdir="$libdir" fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -2492,12 +2230,12 @@ if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; + *) temp_rpath="$temp_rpath $dir" ;; esac fi @@ -2534,12 +2272,8 @@ fi link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2652,15 +2386,11 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-sco3.2v5* ) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -2691,7 +2421,7 @@ add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case $libdir in + case "$libdir" in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2764,7 +2494,7 @@ add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case $libdir in + case "$libdir" in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2825,6 +2555,8 @@ fi fi else + convenience="$convenience $dir/$old_library" + old_convenience="$old_convenience $dir/$old_library" deplibs="$dir/$old_library $deplibs" link_static=yes fi @@ -2942,13 +2674,13 @@ *) continue ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in *" $depdepl "*) ;; *) deplibs="$depdepl $deplibs" ;; esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; + esac done fi # link_all_deplibs != no fi # linkmode = lib @@ -3212,27 +2944,27 @@ # Check that each of the things are valid numbers. case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + [0-9]*) ;; *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3258,7 +2990,7 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3411,9 +3143,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` + deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done if test -n "$xrpath"; then @@ -3464,15 +3196,10 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then @@ -3515,11 +3242,11 @@ int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs + $LTCC -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do - name=`expr $i : '-l$.*$'` + name="`expr $i : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3556,11 +3283,11 @@ # Error occurred in the first compile. Let's try to salvage # the situation: Compile a separate program for each library. for i in $deplibs; do - name=`expr $i : '-l$.*$'` + name="`expr $i : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i + $LTCC -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3608,7 +3335,7 @@ set dummy $deplibs_check_method file_magic_regex=`expr "$deplibs_check_method" : "$2 $.*$"` for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l$.*$'` + name="`expr $a_deplib : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3677,7 +3404,7 @@ set dummy $deplibs_check_method match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"` for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l$.*$'` + name="`expr $a_deplib : '-l$.*$'`" # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3807,35 +3534,6 @@ deplibs=$newdeplibs fi - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3919,7 +3617,6 @@ fi lib="$output_objdir/$realname" - linknames= for link do linknames="$linknames $link" @@ -3948,9 +3645,6 @@ # The command line is too long to execute in one step. $show "using reloadable object file for export list..." skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break fi done IFS="$save_ifs" @@ -3984,13 +3678,67 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -4020,8 +3768,7 @@ fi fi - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else @@ -4040,7 +3787,6 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -4050,13 +3796,13 @@ delfiles= last_robj= k=1 - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$save_output-${k}.$objext # Loop over the list of objects to be linked. for obj in $save_libobjs do eval test_cmds=\"$reload_cmds $objlist $last_robj\" if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + { len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len"; }; then objlist="$objlist $obj" else @@ -4070,9 +3816,9 @@ # the last one created. eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$save_output-${k}.$objext k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$save_output-${k}.$objext objlist=$obj len=1 fi @@ -4092,13 +3838,13 @@ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" fi - # Set up a command to remove the reloadable object files + # Set up a command to remove the reloadale object files # after they are used. i=0 while test "$i" -lt "$k" do i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" + delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" done $echo "creating a temporary reloadable object file: $output" @@ -4146,30 +3892,13 @@ IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } + $run eval "$cmd" || exit $? done IFS="$save_ifs" # Restore the uninstalled library and exit if test "$mode" = relink; then $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi - exit $EXIT_SUCCESS fi @@ -4247,10 +3976,64 @@ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi @@ -4351,35 +4134,6 @@ ;; esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4424,15 +4178,10 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac ;; esac done @@ -4546,25 +4295,13 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac + $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"' else - $run eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + $run eval "${SED} -e 's/$[][.*^$]$/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' + $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac fi fi @@ -4615,26 +4352,7 @@ #endif /* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ const char *name; lt_ptr address; } @@ -4681,29 +4399,16 @@ esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - esac + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4728,7 +4433,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - exit_status=$? + status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4736,7 +4441,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $exit_status + exit $status fi if test -n "$shlibpath_var"; then @@ -4876,12 +4581,10 @@ esac case $host in *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + cwrappersource=`$echo ${objdir}/lt-${output}.c` + cwrapper=`$echo ${output}.exe` + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource <<EOF @@ -4906,9 +4609,6 @@ #include <malloc.h> #include <stdarg.h> #include <assert.h> -#include <string.h> -#include <ctype.h> -#include <sys/stat.h> #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4919,20 +4619,16 @@ #endif #ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' +#define DIR_SEPARATOR '/' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif +#define HAVE_DOS_BASED_FILE_SYSTEM +#ifndef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' #endif +#endif #ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) @@ -4941,32 +4637,17 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); +char * basename (const char *name); +char * fnqualify(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4976,51 +4657,29 @@ char **newargz; int i; - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); + program_name = (char *) xstrdup ((char *) basename (argv[0])); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <<EOF - newargz[0] = (char *) xstrdup("$SHELL"); + cat >> $cwrappersource <<EOF + newargz[0] = "$SHELL"; EOF - cat >> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); + cat >> $cwrappersource <<"EOF" + newargz[1] = fnqualify(argv[0]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; - - for (i=0; i<argc+1; i++) - { - DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); - ; - } - EOF - case $host_os in - mingw*) - cat >> $cwrappersource <<EOF - execv("$SHELL",(char const **)newargz); -EOF - ;; - *) - cat >> $cwrappersource <<EOF + cat >> $cwrappersource <<EOF execv("$SHELL",newargz); EOF - ;; - esac - cat >> $cwrappersource <<"EOF" - return 127; + cat >> $cwrappersource <<"EOF" } void * @@ -5040,148 +4699,48 @@ ; } -const char * -base_name (const char *name) +char * +basename (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') + if (isalpha (name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return base; + return (char *) base; } -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ char * -find_executable (const char* wrapper) +fnqualify(const char *path) { - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ + size_t size; + char *p; char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + assert(path != NULL); - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ + /* Is it qualified already? */ #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { + if (isalpha (path[0]) && path[1] == ':') + return xstrdup (path); #endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif + if (IS_DIR_SEPARATOR (path[0])) + return xstrdup (path); - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ + /* prepend the current directory */ + /* doesn't handle '~' */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; + size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ + p = XMALLOC(char, size); + sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); + return p; } char * @@ -5225,16 +4784,16 @@ va_end (ap); } EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC -s -o $cwrapper $cwrappersource + ;; + esac + $rm $output + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ #! $SHELL @@ -5255,7 +4814,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" @@ -5384,13 +4943,13 @@ # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} + exec \$progdir\\\\\$program \${1+\"\$@\"} " ;; *) $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} + exec \$progdir/\$program \${1+\"\$@\"} " ;; esac @@ -5400,7 +4959,7 @@ fi else # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 exit $EXIT_FAILURE @@ -5432,73 +4991,71 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + # Add in members from convenience archives. + for xlib in $addlibs; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/$[^.]*$/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + done fi # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && @@ -5512,7 +5069,20 @@ objlist= concat_cmds= save_oldobjs=$oldobjs - + # GNU ar 2.10+ was changed to match POSIX; thus no paths are + # encoded into archives. This makes 'ar r' malfunction in + # this piecewise linking case whenever conflicting object + # names appear in distinct ar calls; check, warn and compensate. + if (for obj in $save_oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 + $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 + AR_FLAGS=cq + fi # Is there a better way of finding the last object in the list? for obj in $save_oldobjs do @@ -5523,7 +5093,7 @@ oldobjs="$objlist $obj" objlist="$objlist $obj" eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + if len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len"; then : else @@ -5720,11 +5290,11 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then + $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5733,14 +5303,14 @@ shift else install_prog= - arg=$nonopt + arg="$nonopt" fi # The real first argument should be the name of the installation program. # Aesthetically quote it. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5758,31 +5328,28 @@ do if test -n "$dest"; then files="$files $dest" - dest=$arg + dest="$arg" continue fi case $arg in -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; + -f) prev="-f" ;; + -g) prev="-g" ;; + -m) prev="-m" ;; + -o) prev="-o" ;; -s) stripme=" -s" continue ;; - -*) - ;; + -*) ;; + *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then prev= else - dest=$arg + dest="$arg" continue fi ;; @@ -5791,7 +5358,7 @@ # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; esac @@ -5960,14 +5527,11 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. for linkname do if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" fi done fi @@ -5980,16 +5544,7 @@ IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } + $run eval "$cmd" || exit $? done IFS="$save_ifs" fi @@ -6083,15 +5638,17 @@ notinst_deplibs= relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; + case $file in + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac # Check the variables that should have been set. @@ -6119,21 +5676,34 @@ done relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; + case $file in + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac outputname= if test "$fast_install" = no && test -n "$relink_command"; then if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` + tmpdir="/tmp" + test -n "$TMPDIR" && tmpdir="$TMPDIR" + tmpdir="$tmpdir/libtool-$$" + save_umask=`umask` + umask 0077 + if $mkdir "$tmpdir"; then + umask $save_umask + else + umask $save_umask + $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 + continue + fi file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. @@ -6157,7 +5727,7 @@ fi # remove .exe since cygwin /usr/bin/install will append another - # one anyway + # one anyways case $install_prog,$host in */usr/bin/install*,*cygwin*) case $file:$destfile in @@ -6257,7 +5827,7 @@ # Exit here if they wanted silent mode. test "$show" = : && exit $EXIT_SUCCESS - $echo "X----------------------------------------------------------------------" | $Xsed + $echo "----------------------------------------------------------------------" $echo "Libraries have been installed in:" for libdir in $libdirs; do $echo " $libdir" @@ -6290,7 +5860,7 @@ $echo $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed + $echo "----------------------------------------------------------------------" exit $EXIT_SUCCESS ;; @@ -6507,17 +6077,9 @@ rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) + if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. cmds=$postuninstall_cmds @@ -6550,8 +6112,7 @@ IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. - ;; - esac + fi fi ;; @@ -6836,7 +6397,7 @@ $echo $echo "Try \`$modename --help' for more information about other modes." -exit $? +exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6850,11 +6411,12 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared +build_libtool_libs=no +build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static +build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/build/missing ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/build/missing (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/build/missing Tue Dec 19 22:00:59 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake(a)gnu.org>." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 touch $file ;; Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/configure ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/configure (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/configure Tue Dec 19 22:00:59 2006 @@ -280,15 +280,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -3250,7 +3250,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3275,10 +3275,10 @@ fi done done +SED=$lt_cv_path_SED fi -SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3355,7 +3355,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -3389,7 +3389,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -3419,15 +3419,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -3438,43 +3429,36 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" break ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; esac - fi - done - IFS="$lt_save_ifs" + esac + fi done + IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -3521,7 +3505,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[45]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -3544,13 +3528,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3566,7 +3550,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -3582,11 +3566,6 @@ esac ;; -interix3*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -3599,6 +3578,15 @@ # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; @@ -3621,10 +3609,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -3632,11 +3622,15 @@ lt_cv_deplibs_check_method=pass_all ;; +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' @@ -3657,13 +3651,10 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -3681,9 +3672,6 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC @@ -3719,7 +3707,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3722 "configure"' > conftest.$ac_ext + echo '#line 3710 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3762,7 +3750,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -3875,27 +3863,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - esac need_locks="$enable_libtool_lock" @@ -4988,12 +4956,7 @@ fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5223,9 +5186,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -fi - ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5318,7 +5279,7 @@ # Provide some information about the compiler. -echo "$as_me:5321:" \ +echo "$as_me:5282:" \ "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 @@ -5508,55 +5469,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && @@ -5602,6 +5519,9 @@ # Regexp to match symbols that can be accessed directly from C. sympat='$[_A-Za-z][_A-Za-z0-9]*$' +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \2\3 \3' + # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'" @@ -5623,31 +5543,15 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; irix* | nonstopux*) symcode='[BCDEGRST]' ;; osf*) symcode='[BCDEGQRST]' ;; -solaris*) +solaris* | sysv5*) symcode='[BDRT]' ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; sysv4) symcode='[DFNSTU]' ;; @@ -5670,11 +5574,8 @@ # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]$$symcode$symcode*$[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]$$symcode$symcode*$[ ][ ]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -5836,7 +5737,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g' # Same as above, but do not quote variable references. @@ -5856,7 +5757,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -6113,7 +6014,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -6133,26 +6033,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -6178,7 +6067,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -6240,7 +6129,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -6335,28 +6224,71 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +# +# Check for any special shared library compilation flags. +# +lt_prog_cc_shlib= +if test "$GCC" = no; then + case $host_os in + sco3.2v5*) + lt_prog_cc_shlib='-belf' + ;; + esac +fi +if test -n "$lt_prog_cc_shlib"; then + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 +echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} + if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : + else + { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 +echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} + lt_cv_prog_cc_can_build_shared=no + fi +fi -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +# +# Check to make sure the static flag actually works. +# +echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_prog_compiler_static" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + + + lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then @@ -6378,20 +6310,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6384: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6316: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6388: \$? = $ac_status" >&5 + echo "$as_me:6320: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -6452,11 +6382,6 @@ lt_prog_compiler_pic='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -6473,7 +6398,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -6499,16 +6424,6 @@ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -6520,7 +6435,7 @@ lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -6544,19 +6459,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. @@ -6571,15 +6479,15 @@ lt_prog_compiler_static='-non_shared' ;; + sco3.2v5*) + lt_prog_compiler_pic='-Kpic' + lt_prog_compiler_static='-dn' + ;; + solaris*) + lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac ;; sunos4*) @@ -6588,7 +6496,7 @@ lt_prog_compiler_static='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -6601,17 +6509,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - uts4*) lt_prog_compiler_pic='-pic' lt_prog_compiler_static='-Bstatic' @@ -6646,20 +6543,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6652: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6549: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6656: \$? = $ac_status" >&5 + echo "$as_me:6553: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works=yes fi fi @@ -6680,7 +6575,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= @@ -6690,48 +6585,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes - fi - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 - -if test x"$lt_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o+set}" = set; then @@ -6750,25 +6603,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6756: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6609: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6760: \$? = $ac_status" >&5 + echo "$as_me:6613: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -6844,16 +6695,6 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -6864,10 +6705,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -6878,27 +6715,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -6949,10 +6765,10 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -6961,58 +6777,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no fi ;; - interix3*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -7023,7 +6793,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <<EOF 1>&2 @@ -7044,33 +6814,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -7078,6 +6821,31 @@ hardcode_shlibpath_var=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds="$tmp_archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -7088,11 +6856,16 @@ ;; esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -7104,7 +6877,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -7138,7 +6911,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -7157,7 +6929,7 @@ link_all_deplibs=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -7176,12 +6948,8 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -7189,11 +6957,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -7258,12 +7026,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -7323,11 +7091,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + whole_archive_flag_spec=' ' archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -7340,7 +7110,7 @@ ld_shlibs=no ;; - bsdi[45]*) + bsdi4*) export_dynamic_flag_spec=-rdynamic ;; @@ -7366,52 +7136,52 @@ ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then archive_cmds_need_lc=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; @@ -7445,7 +7215,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7468,62 +7238,47 @@ export_dynamic_flag_spec='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: hardcode_direct=no hardcode_shlibpath_var=no ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + hardcode_shlibpath_var=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: hardcode_direct=yes export_dynamic_flag_spec='${wl}-E' @@ -7571,7 +7326,6 @@ hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -7617,7 +7371,7 @@ allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -7625,15 +7379,21 @@ hardcode_libdir_separator=: ;; + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) no_undefined_flag=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -7642,18 +7402,8 @@ hardcode_shlibpath_var=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs=yes ;; @@ -7710,45 +7460,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no + sysv4.2uw2*) + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=no hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no + sysv5*) + no_undefined_flag=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec= hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -7767,6 +7508,11 @@ echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -7799,7 +7545,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -7932,7 +7677,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -7960,8 +7705,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -7991,7 +7735,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -8014,7 +7758,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -8049,17 +7793,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -8077,19 +7812,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -8109,7 +7839,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -8149,18 +7879,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -8218,10 +7936,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 7943 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -8282,13 +8021,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -8326,6 +8060,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -8351,7 +8092,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -8384,29 +8125,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -8422,17 +8140,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct" != no && @@ -9082,7 +8795,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -9098,7 +8811,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9101 "configure" +#line 8814 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9155,8 +8868,6 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); } @@ -9166,12 +8877,12 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; esac else : # compilation failed @@ -9186,7 +8897,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + LDFLAGS="$LDFLAGS $link_static_flag" echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then @@ -9198,7 +8909,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9201 "configure" +#line 8912 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9255,8 +8966,6 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); } @@ -9266,12 +8975,12 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; esac else : # compilation failed @@ -9304,7 +9013,7 @@ fi -# Report which library types will actually be built +# Report which librarie types wil actually be built echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $can_build_shared" >&5 @@ -9316,7 +9025,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -9329,6 +9038,43 @@ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi + ;; + darwin* | rhapsody*) + if test "$GCC" = yes; then + archive_cmds_need_lc=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='-all_load $convenience' + link_all_deplibs=yes + else + ld_shlibs=no + fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -9354,7 +9100,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -9458,7 +9204,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -9469,11 +9215,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" +Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # The names of the tagged configurations supported by this script. available_tags= @@ -9503,13 +9249,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -9520,9 +9260,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler @@ -9588,7 +9325,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -9853,9 +9590,6 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -9886,9 +9620,7 @@ case $tagname in CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9908,7 +9640,6 @@ hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported hardcode_automatic_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -9926,7 +9657,7 @@ compiler_lib_search_path_CXX= # Source file extension for C++ test sources. -ac_ext=cpp +ac_ext=cc # Object file extension for compiled C++ test sources. objext=o @@ -9936,34 +9667,17 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -9974,28 +9688,19 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - $as_unset lt_cv_prog_gnu_ld + unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - $as_unset lt_cv_path_LD + unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately if test "$GXX" = yes; then @@ -10065,7 +9770,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -10099,7 +9804,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -10190,7 +9895,6 @@ ;; esac done - ;; esac exp_sym_flag='-bexport' @@ -10209,7 +9913,7 @@ link_all_deplibs_CXX=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -10228,12 +9932,8 @@ hardcode_libdir_flag_spec_CXX='-L$libdir' hardcode_libdir_separator_CXX= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -10311,12 +10011,12 @@ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -10376,26 +10076,16 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_CXX=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + whole_archive_flag_spec_CXX=' ' archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach <jrb3(a)best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - chorus*) case $cc_basename in *) @@ -10414,7 +10104,7 @@ enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -10423,81 +10113,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs_CXX=no fi ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + darwin* | rhapsody*) + if test "$GXX" = yes; then + archive_cmds_need_lc_CXX=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_CXX='-undefined dynamic_lookup' + ;; + esac fi - ;; + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='-all_load $convenience' + link_all_deplibs_CXX=yes + else + ld_shlibs_CXX=no + fi + ;; + dgux*) case $cc_basename in - ec++*) + ec++) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - ghcx*) + ghcx) # Green Hills C++ Compiler # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -10508,14 +10187,14 @@ ;; esac ;; - freebsd[12]*) + freebsd12*) # C++ shared libraries reported to be fairly broken before switch to ELF ld_shlibs_CXX=no ;; freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -10532,11 +10211,11 @@ # location of the library. case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC*) + aCC) archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -10546,7 +10225,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -10560,23 +10239,34 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_CXX='+b $libdir' + hardcode_libdir_separator_CXX=: ;; + ia64*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; *) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no ;; + ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; *) hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, @@ -10586,18 +10276,15 @@ esac case $cc_basename in - CC*) + CC) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + aCC) + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -10615,13 +10302,10 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + case "$host_cpu" in + ia64*|hppa*64*) + archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; *) archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; @@ -10634,25 +10318,11 @@ ;; esac ;; - interix3*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; irix5* | irix6*) case $cc_basename in - CC*) + CC) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -10663,7 +10333,7 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi @@ -10676,7 +10346,7 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -10701,41 +10371,17 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc*) + icpc) # Intel C++ with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac archive_cmds_need_lc_CXX=no + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) + cxx) # Compaq C++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' @@ -10766,7 +10412,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -10787,25 +10433,9 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - ;; osf3*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -10821,14 +10451,14 @@ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx*) + cxx) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -10846,7 +10476,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -10865,7 +10495,7 @@ ;; osf4* | osf5*) case $cc_basename in - KCC*) + KCC) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -10880,17 +10510,17 @@ # the KAI C++ compiler. old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - RCC*) + RCC) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx*) + cxx) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ $rm $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -10909,7 +10539,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -10930,14 +10560,27 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; + sco*) + archive_cmds_need_lc_CXX=no + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - lcc*) + lcc) # Lucid # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -10950,33 +10593,36 @@ ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; + solaris2.0-5 | solaris2.0-5.*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # linker. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -10984,7 +10630,7 @@ # in the archive. old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ;; - gcx*) + gcx) # Green Hills C++ Compiler archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' @@ -11022,63 +10668,12 @@ ;; esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -11131,7 +10726,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" for p in `eval $output_verbose_link_cmd`; do case $p in @@ -11207,29 +10802,6 @@ $rm -f confest.$objext -# PORTME: override above test on systems where it is broken -case $host_os in -interix3*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -solaris*) - case $cc_basename in - CC*) - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' - ;; - esac - ;; -esac - - case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac @@ -11277,10 +10849,6 @@ # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; sysv4*MP*) if test -d /usr/nec; then lt_prog_compiler_pic_CXX=-Kconform_pic @@ -11289,7 +10857,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) ;; *) @@ -11314,28 +10882,18 @@ ;; chorus*) case $cc_basename in - cxch68*) + cxch68) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; dgux*) case $cc_basename in - ec++*) + ec++) lt_prog_compiler_pic_CXX='-KPIC' ;; - ghcx*) + ghcx) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-pic' ;; @@ -11343,22 +10901,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC*) + CC) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; - aCC*) + aCC) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in + lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -11371,13 +10929,9 @@ ;; esac ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC*) + CC) lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-non_shared' # CC pic flag -KPIC is the default. @@ -11388,24 +10942,18 @@ ;; linux*) case $cc_basename in - KCC*) + KCC) # KAI C++ Compiler lt_prog_compiler_wl_CXX='--backend -Wl,' lt_prog_compiler_pic_CXX='-fPIC' ;; - icpc* | ecpc*) + icpc) # Intel C++ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; - pgCC*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) + cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -11422,7 +10970,7 @@ ;; mvs*) case $cc_basename in - cxx*) + cxx) lt_prog_compiler_pic_CXX='-W c,exportall' ;; *) @@ -11433,14 +10981,14 @@ ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC*) + KCC) lt_prog_compiler_wl_CXX='--backend -Wl,' ;; - RCC*) + RCC) # Rational C++ 2.4.1 lt_prog_compiler_pic_CXX='-pic' ;; - cxx*) + cxx) # Digital/Compaq C++ lt_prog_compiler_wl_CXX='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -11454,15 +11002,24 @@ ;; psos*) ;; + sco*) + case $cc_basename in + CC) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + *) + ;; + esac + ;; solaris*) case $cc_basename in - CC*) + CC) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' lt_prog_compiler_wl_CXX='-Qoption ld ' ;; - gcx*) + gcx) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-PIC' ;; @@ -11472,12 +11029,12 @@ ;; sunos4*) case $cc_basename in - CC*) + CC) # Sun C++ 4.x lt_prog_compiler_pic_CXX='-pic' lt_prog_compiler_static_CXX='-Bstatic' ;; - lcc*) + lcc) # Lucid lt_prog_compiler_pic_CXX='-pic' ;; @@ -11487,7 +11044,7 @@ ;; tandem*) case $cc_basename in - NCC*) + NCC) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -11495,14 +11052,7 @@ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac + unixware*) ;; vxworks*) ;; @@ -11535,20 +11085,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11541: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11091: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11545: \$? = $ac_status" >&5 + echo "$as_me:11095: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works_CXX=yes fi fi @@ -11569,7 +11117,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= @@ -11579,48 +11127,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes - fi - else - lt_prog_compiler_static_works_CXX=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 - -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then @@ -11639,25 +11145,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11645: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11151: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11649: \$? = $ac_status" >&5 + echo "$as_me:11155: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o_CXX=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -11712,7 +11216,7 @@ export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[^ ]*$ [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -11723,6 +11227,11 @@ echo "${ECHO_T}$ld_shlibs_CXX" >&6 test "$ld_shlibs_CXX" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -11755,7 +11264,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX compiler_flags=-v linker_flags=-v verstring= @@ -11888,7 +11396,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11916,8 +11424,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -11947,7 +11454,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -11970,7 +11477,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -12005,17 +11512,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -12033,19 +11531,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -12065,7 +11558,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -12105,18 +11598,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -12174,10 +11655,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 11662 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12238,13 +11740,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -12282,6 +11779,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -12307,7 +11811,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -12340,29 +11844,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12378,17 +11859,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_CXX" != no && @@ -12420,7 +11896,842 @@ enable_fast_install=needless fi +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 12533 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 12631 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh # with your package, and you will get complaints that there are @@ -12434,7 +12745,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -12535,13 +12846,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -12552,9 +12857,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_CXX @@ -12620,7 +12922,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -12897,43 +13199,17 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC compiler_F77=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $can_build_shared" >&5 @@ -12945,7 +13221,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case $host_os in +case "$host_os" in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -12954,9 +13230,7 @@ fi ;; aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi + test "$enable_shared" = yes && enable_static=no ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -12969,6 +13243,8 @@ echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 +test "$ld_shlibs_F77" = no && can_build_shared=no + GCC_F77="$G77" LD_F77="$LD" @@ -13015,11 +13291,6 @@ lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -13036,7 +13307,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -13062,16 +13333,6 @@ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_F77='-qnocommon' - lt_prog_compiler_wl_F77='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -13083,7 +13344,7 @@ lt_prog_compiler_wl_F77='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -13107,19 +13368,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. @@ -13134,15 +13388,15 @@ lt_prog_compiler_static_F77='-non_shared' ;; + sco3.2v5*) + lt_prog_compiler_pic_F77='-Kpic' + lt_prog_compiler_static_F77='-dn' + ;; + solaris*) + lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac ;; sunos4*) @@ -13151,7 +13405,7 @@ lt_prog_compiler_static_F77='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -13164,17 +13418,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; - uts4*) lt_prog_compiler_pic_F77='-pic' lt_prog_compiler_static_F77='-Bstatic' @@ -13209,20 +13452,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13215: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13458: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13219: \$? = $ac_status" >&5 + echo "$as_me:13462: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works_F77=yes fi fi @@ -13243,7 +13484,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_F77= @@ -13253,48 +13494,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes - fi - else - lt_prog_compiler_static_works_F77=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 - -if test x"$lt_prog_compiler_static_works_F77" = xyes; then - : -else - lt_prog_compiler_static_F77= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then @@ -13313,25 +13512,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13319: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13518: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13323: \$? = $ac_status" >&5 + echo "$as_me:13522: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o_F77=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -13407,16 +13604,6 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -13427,10 +13614,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -13441,27 +13624,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -13512,10 +13674,10 @@ allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -13524,58 +13686,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs_F77=no + ld_shlibs=no fi ;; - interix3*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs_F77=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -13586,7 +13702,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no cat <<EOF 1>&2 @@ -13607,33 +13723,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - sunos4*) archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -13641,6 +13730,31 @@ hardcode_shlibpath_var_F77=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_F77="$tmp_archive_cmds" + fi + else + ld_shlibs_F77=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -13651,11 +13765,16 @@ ;; esac - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= + if test "$ld_shlibs_F77" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -13667,7 +13786,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_F77=unsupported @@ -13701,7 +13820,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -13720,7 +13838,7 @@ link_all_deplibs_F77=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -13739,12 +13857,8 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_libdir_separator_F77= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -13752,11 +13866,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -13811,12 +13925,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -13866,11 +13980,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_F77=' ${wl}-bernotok' allow_undefined_flag_F77=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_F77=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' + whole_archive_flag_spec_F77=' ' archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -13883,7 +13999,7 @@ ld_shlibs_F77=no ;; - bsdi[45]*) + bsdi4*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -13904,57 +14020,57 @@ old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then archive_cmds_need_lc_F77=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_F77='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' + whole_archive_flag_spec_F77='-all_load $convenience' link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_F77=no - ;; - esac + ld_shlibs_F77=no fi ;; @@ -13988,7 +14104,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -14011,62 +14127,47 @@ export_dynamic_flag_spec_F77='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_F77='+b $libdir' + hardcode_libdir_separator_F77=: hardcode_direct_F77=no hardcode_shlibpath_var_F77=no ;; + ia64*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + ;; *) + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: hardcode_direct_F77=yes export_dynamic_flag_spec_F77='${wl}-E' @@ -14114,7 +14215,6 @@ hardcode_shlibpath_var_F77=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' export_dynamic_flag_spec_F77='${wl}-E' else @@ -14160,7 +14260,7 @@ allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_F77='-rpath $libdir' @@ -14168,15 +14268,21 @@ hardcode_libdir_separator_F77=: ;; + sco3.2v5*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + export_dynamic_flag_spec_F77='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -14185,18 +14291,8 @@ hardcode_shlibpath_var_F77=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_F77=yes ;; @@ -14253,45 +14349,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no + sysv4.2uw2*) + archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_minus_L_F77=no hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag_F77='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_F77=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no + sysv5*) + no_undefined_flag_F77=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec_F77= hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -14310,6 +14397,11 @@ echo "${ECHO_T}$ld_shlibs_F77" >&6 test "$ld_shlibs_F77" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -14342,7 +14434,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 compiler_flags=-v linker_flags=-v verstring= @@ -14475,7 +14566,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14503,8 +14594,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -14534,7 +14624,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -14557,7 +14647,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -14592,17 +14682,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -14620,19 +14701,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -14652,7 +14728,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -14692,18 +14768,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -14761,10 +14825,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 14832 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -14825,13 +14910,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14869,6 +14949,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -14894,7 +14981,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -14927,29 +15014,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14965,17 +15029,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ - test "X$hardcode_automatic_F77" = "Xyes" ; then + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_F77" != no && @@ -15007,7 +15066,37 @@ enable_fast_install=needless fi +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh # with your package, and you will get complaints that there are @@ -15021,7 +15110,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -15122,13 +15211,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -15139,9 +15222,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_F77 @@ -15207,7 +15287,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -15445,56 +15525,27 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC compiler_GCJ=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no -old_archive_cmds_GCJ=$old_archive_cmds - lt_prog_compiler_no_builtin_flag_GCJ= if test "$GCC" = yes; then @@ -15516,20 +15567,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15522: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15573: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15526: \$? = $ac_status" >&5 + echo "$as_me:15577: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -15590,11 +15639,6 @@ lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -15611,7 +15655,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -15637,16 +15681,6 @@ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_GCJ='-qnocommon' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -15658,7 +15692,7 @@ lt_prog_compiler_wl_GCJ='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case $host_cpu in + case "$host_cpu" in hppa*64*|ia64*) # +Z the default ;; @@ -15682,19 +15716,12 @@ ;; linux*) - case $cc_basename in + case $CC in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-fpic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. @@ -15709,15 +15736,15 @@ lt_prog_compiler_static_GCJ='-non_shared' ;; + sco3.2v5*) + lt_prog_compiler_pic_GCJ='-Kpic' + lt_prog_compiler_static_GCJ='-dn' + ;; + solaris*) + lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_GCJ='-Qoption ld ';; - *) - lt_prog_compiler_wl_GCJ='-Wl,';; - esac ;; sunos4*) @@ -15726,7 +15753,7 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3*) + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -15739,17 +15766,6 @@ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_can_build_shared_GCJ=no - ;; - uts4*) lt_prog_compiler_pic_GCJ='-pic' lt_prog_compiler_static_GCJ='-Bstatic' @@ -15784,20 +15800,18 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15790: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15806: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15794: \$? = $ac_status" >&5 + echo "$as_me:15810: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then lt_prog_compiler_pic_works_GCJ=yes fi fi @@ -15818,7 +15832,7 @@ fi fi -case $host_os in +case "$host_os" in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_GCJ= @@ -15828,48 +15842,6 @@ ;; esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes - fi - else - lt_prog_compiler_static_works_GCJ=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 - -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then - : -else - lt_prog_compiler_static_GCJ= -fi - - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then @@ -15888,25 +15860,23 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15894: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15866: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15898: \$? = $ac_status" >&5 + echo "$as_me:15870: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then lt_cv_prog_compiler_c_o_GCJ=yes fi fi - chmod u+w . 2>&5 + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -15982,16 +15952,6 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -16002,10 +15962,6 @@ with_gnu_ld=no fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; openbsd*) with_gnu_ld=no ;; @@ -16016,27 +15972,6 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -16087,10 +16022,10 @@ allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -16099,58 +16034,12 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; - interix3*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs_GCJ=no - fi - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -16161,7 +16050,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no cat <<EOF 1>&2 @@ -16182,33 +16071,6 @@ fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_GCJ=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - esac - ;; - sunos4*) archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -16216,6 +16078,31 @@ hardcode_shlibpath_var_GCJ=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_GCJ="$tmp_archive_cmds" + fi + else + ld_shlibs_GCJ=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -16226,11 +16113,16 @@ ;; esac - if test "$ld_shlibs_GCJ" = no; then - runpath_var= - hardcode_libdir_flag_spec_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= + if test "$ld_shlibs_GCJ" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -16242,7 +16134,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_GCJ=unsupported @@ -16276,7 +16168,6 @@ break fi done - ;; esac exp_sym_flag='-bexport' @@ -16295,7 +16186,7 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.012|aix4.012.*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -16314,12 +16205,8 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_libdir_separator_GCJ= fi - ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi else # not using gcc if test "$host_cpu" = ia64; then @@ -16327,11 +16214,11 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -16396,12 +16283,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -16461,11 +16348,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_GCJ=' ${wl}-bernotok' allow_undefined_flag_GCJ=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_GCJ=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ='$convenience' + whole_archive_flag_spec_GCJ=' ' archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -16478,7 +16367,7 @@ ld_shlibs_GCJ=no ;; - bsdi[45]*) + bsdi4*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -16499,57 +16388,57 @@ old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac + if test "$GXX" = yes ; then archive_cmds_need_lc_GCJ=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='-undefined suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='-undefined dynamic_lookup' + ;; + esac + fi + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='' + whole_archive_flag_spec_GCJ='-all_load $convenience' link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_GCJ=no - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -16583,7 +16472,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | kfreebsd*-gnu) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16606,62 +16495,47 @@ export_dynamic_flag_spec_GCJ='${wl}-E' ;; - hpux10*) + hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) + case "$host_cpu" in + hppa*64*|ia64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; - ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; - ia64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; *) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - case $host_cpu in - hppa*64*|ia64*) + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' + hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no ;; + ia64*) + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + ;; *) + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=yes export_dynamic_flag_spec_GCJ='${wl}-E' @@ -16709,7 +16583,6 @@ hardcode_shlibpath_var_GCJ=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' export_dynamic_flag_spec_GCJ='${wl}-E' else @@ -16755,7 +16628,7 @@ allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_GCJ='-rpath $libdir' @@ -16763,15 +16636,21 @@ hardcode_libdir_separator_GCJ=: ;; + sco3.2v5*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + export_dynamic_flag_spec_GCJ='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + solaris*) no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then - wlarc='${wl}' archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else - wlarc='' archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -16780,18 +16659,8 @@ hardcode_shlibpath_var_GCJ=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_GCJ=yes ;; @@ -16848,45 +16717,36 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no + sysv4.2uw2*) + archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=no hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_GCJ=no ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_GCJ='${wl}-z,text' - allow_undefined_flag_GCJ='${wl}-z,nodefs' - archive_cmds_need_lc_GCJ=no + sysv5*) + no_undefined_flag_GCJ=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec_GCJ= hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-Bexport' runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi ;; uts4*) @@ -16905,6 +16765,11 @@ echo "${ECHO_T}$ld_shlibs_GCJ" >&6 test "$ld_shlibs_GCJ" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + # # Do we need to explicitly link libc? # @@ -16937,7 +16802,6 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_GCJ - pic_flag=$lt_prog_compiler_pic_GCJ compiler_flags=-v linker_flags=-v verstring= @@ -17070,7 +16934,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17098,8 +16962,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -17129,7 +16992,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -17152,7 +17015,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -17187,17 +17050,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -17215,19 +17069,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -17247,7 +17096,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -17287,18 +17136,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -17356,10 +17193,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 17200 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17420,13 +17278,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -17464,6 +17317,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -17489,7 +17349,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -17522,29 +17382,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17560,17 +17397,12 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_GCJ" != no && @@ -17602,7 +17434,842 @@ enable_fast_install=needless fi +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 18071 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +#line 18169 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh # with your package, and you will get complaints that there are @@ -17616,7 +18283,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -17717,13 +18384,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -17734,9 +18395,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_GCJ @@ -17802,7 +18460,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18046,42 +18704,15 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -18097,7 +18728,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18198,13 +18829,7 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18215,9 +18840,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_RC @@ -18283,7 +18905,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -19961,7 +20583,6 @@ new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline - FUNC_DEF=__FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" ;; @@ -19973,7 +20594,6 @@ fi DYNAMIC_LIB_EXTEN="dylib" IN_LINE=inline - FUNC_DEF=__FUNCTION__ ;; x86_64-*-linux-gnu) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -19985,7 +20605,6 @@ SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" - FUNC_DEF=__FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline @@ -20000,20 +20619,27 @@ SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" new_AM_LDFLAGS="" - FUNC_DEF=__FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; + *) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + FUNC_DEF=__func__ + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline esac - - -cat >>confdefs.h <<_ACEOF -#define __FUNCTION__ $FUNC_DEF -_ACEOF cat >>confdefs.h <<_ACEOF Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/configure.in ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/configure.in (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/configure.in Tue Dec 19 22:00:59 2006 @@ -51,7 +51,6 @@ new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline - FUNC_DEF=__FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" ;; @@ -63,7 +62,6 @@ fi DYNAMIC_LIB_EXTEN="dylib" IN_LINE=inline - FUNC_DEF=__FUNCTION__ ;; x86_64-*-linux-gnu) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -75,7 +73,6 @@ SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" - FUNC_DEF=__FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline @@ -90,17 +87,28 @@ SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" new_AM_LDFLAGS="" - FUNC_DEF=__FUNCTION__ fi DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; + *) + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" + new_AM_CFLAGS="-KPIC -DPIC" + new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + FUNC_DEF=__func__ + elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + fi + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline esac AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN) -AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline]) # Checks for header files. Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/src/config.h.in ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/src/config.h.in (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/src/config.h.in Tue Dec 19 22:00:59 2006 @@ -97,9 +97,6 @@ /* Little Endian */ #undef __BYTE_ORDER -/* define it the right way ;) */ -#undef __FUNCTION__ - /* for the places where it is not defined */ #undef __LITTLE_ENDIAN Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.c Tue Dec 19 22:00:59 2006 @@ -297,7 +297,7 @@ static ldl_status parse_session_code(ldl_handle_t *handle, char *id, char *from, char *to, iks *xml, char *xtype) { ldl_session_t *session = NULL; - ldl_signal_t signal = LDL_SIGNAL_NONE; + ldl_signal_t dl_signal = LDL_SIGNAL_NONE; char *initiator = iks_find_attrib(xml, "initiator"); char *msg = NULL; @@ -327,7 +327,7 @@ if (!strcasecmp(type, "initiate") || !strcasecmp(type, "accept")) { - signal = LDL_SIGNAL_INITIATE; + dl_signal = LDL_SIGNAL_INITIATE; if (!strcasecmp(type, "accept")) { msg = "accept"; } @@ -363,10 +363,10 @@ tag = iks_next_tag(tag); } } else if (!strcasecmp(type, "transport-accept")) { - signal = LDL_SIGNAL_TRANSPORT_ACCEPT; + dl_signal = LDL_SIGNAL_TRANSPORT_ACCEPT; } else if (!strcasecmp(type, "transport-info")) { char *tid = iks_find_attrib(xml, "id"); - signal = LDL_SIGNAL_CANDIDATES; + dl_signal = LDL_SIGNAL_CANDIDATES; tag = iks_child (xml); if (tag && !strcasecmp(iks_name(tag), "transport")) { @@ -458,17 +458,17 @@ tag = iks_next_tag(tag); } } else if (!strcasecmp(type, "terminate")) { - signal = LDL_SIGNAL_TERMINATE; + dl_signal = LDL_SIGNAL_TERMINATE; } else if (!strcasecmp(type, "error")) { - signal = LDL_SIGNAL_ERROR; + dl_signal = LDL_SIGNAL_ERROR; } } xml = iks_child(xml); } - if (handle->session_callback && signal) { - handle->session_callback(handle, session, signal, to, from, id, msg); + if (handle->session_callback && dl_signal) { + handle->session_callback(handle, session, dl_signal, to, from, id, msg); } return LDL_STATUS_SUCCESS; @@ -700,22 +700,24 @@ char id[1024]; char *resource; struct ldl_buffer *buffer; - ldl_signal_t signal; + ldl_signal_t dl_signal = LDL_SIGNAL_PRESENCE_IN; - - if (type && !strcasecmp(type, "unavailable")) { - signal = LDL_SIGNAL_PRESENCE_OUT; - } else if (type && !strcasecmp(type, "probe")) { - signal = LDL_SIGNAL_PRESENCE_PROBE; - } else { - signal = LDL_SIGNAL_PRESENCE_IN; - } + if (type && *type) { + if (!strcasecmp(type, "unavailable")) { + dl_signal = LDL_SIGNAL_PRESENCE_OUT; + } else if (!strcasecmp(type, "probe")) { + dl_signal = LDL_SIGNAL_PRESENCE_PROBE; + } + if (!status) { + status = type; + } + } else { + if (!status) { + status = "Available"; + } + } - if (!status) { - status = type; - } - apr_cpystrn(id, from, sizeof(id)); lowercase(id); @@ -738,7 +740,7 @@ } if (handle->session_callback) { - handle->session_callback(handle, NULL, signal, to, id, status ? status : "n/a", show ? show : "n/a"); + handle->session_callback(handle, NULL, dl_signal, to, id, status ? status : "n/a", show ? show : "n/a"); } return IKS_FILTER_EAT; Modified: freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/branches/knhor/trunk/libs/libdingaling/src/libdingaling.h Tue Dec 19 22:00:59 2006 @@ -37,6 +37,13 @@ \ingroup LIBDINGALING \{ */ +/* OMG */ +#ifdef WIN32 +#define __LDL_FUNC__ __FUNCTION__ +#else +#define __LDL_FUNC__ (const char *)__func__ +#endif + #ifndef LIBDINGALING_H #define LIBDINGALING_H #ifdef __cplusplus @@ -154,7 +161,7 @@ LDL_DESCRIPTION_ACCEPT } ldl_description_t; -#define DL_PRE __FILE__, __FUNCTION__, __LINE__ +#define DL_PRE __FILE__, __LDL_FUNC__, __LINE__ #define DL_LOG_DEBUG DL_PRE, 7 #define DL_LOG_INFO DL_PRE, 6 #define DL_LOG_NOTICE DL_PRE, 5 Modified: freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h ============================================================================== --- freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h (original) +++ freeswitch/branches/knhor/trunk/libs/srtp/include/srtp.h Tue Dec 19 22:00:59 2006 @@ -898,12 +898,12 @@ #ifndef WORDS_BIGENDIAN typedef struct { - uint8_t cc:4; /* CSRC count */ - uint8_t x:1; /* header extension flag */ - uint8_t p:1; /* padding flag */ - uint8_t version:2; /* protocol version */ - uint8_t pt:7; /* payload type */ - uint8_t m:1; /* marker bit */ + unsigned cc:4; /* CSRC count */ + unsigned x:1; /* header extension flag */ + unsigned p:1; /* padding flag */ + unsigned version:2; /* protocol version */ + unsigned pt:7; /* payload type */ + unsigned m:1; /* marker bit */ uint16_t seq; /* sequence number */ uint32_t ts; /* timestamp */ uint32_t ssrc; /* synchronization source */ @@ -941,10 +941,10 @@ #ifndef WORDS_BIGENDIAN typedef struct { - unsigned char rc:5; /* reception report count */ - unsigned char p:1; /* padding flag */ - unsigned char version:2; /* protocol version */ - unsigned char pt:8; /* payload type */ + unsigned rc:5; /* reception report count */ + unsigned p:1; /* padding flag */ + unsigned version:2; /* protocol version */ + unsigned pt:8; /* payload type */ uint16_t len; /* length */ uint32_t ssrc; /* synchronization source */ } srtcp_hdr_t; @@ -960,10 +960,10 @@ #else /* BIG_ENDIAN */ typedef struct { - unsigned char version:2; /* protocol version */ - unsigned char p:1; /* padding flag */ - unsigned char rc:5; /* reception report count */ - unsigned char pt:8; /* payload type */ + unsigned version:2; /* protocol version */ + unsigned p:1; /* padding flag */ + unsigned rc:5; /* reception report count */ + unsigned pt:8; /* payload type */ uint16_t len; /* length */ uint32_t ssrc; /* synchronization source */ } srtcp_hdr_t; Modified: freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/apr-util/libaprutil.vcproj Tue Dec 19 22:00:59 2006 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\..\apr-util\include\apu.hw" > "$(ProjectDir)..\..\apr-util\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> <Tool Name="VCCustomBuildTool" @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libaprutil.pch" @@ -67,7 +67,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG,APU_VERSION_ONLY" Culture="1033" - AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" /> <Tool Name="VCPreLinkEventTool" @@ -125,7 +125,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\..\apr-util\include\apu.hw" > "$(ProjectDir)..\..\apr-util\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> <Tool Name="VCCustomBuildTool" @@ -149,7 +149,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" @@ -169,7 +169,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG,APU_VERSION_ONLY" Culture="1033" - AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" /> <Tool Name="VCPreLinkEventTool" @@ -228,7 +228,7 @@ Name="buckets" > <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_brigade.c" + RelativePath="..\..\apr-util\buckets\apr_brigade.c" > <FileConfiguration Name="Debug|Win32" @@ -250,7 +250,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets.c" + RelativePath="..\..\apr-util\buckets\apr_buckets.c" > <FileConfiguration Name="Debug|Win32" @@ -272,7 +272,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_alloc.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_alloc.c" > <FileConfiguration Name="Debug|Win32" @@ -294,7 +294,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_eos.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_eos.c" > <FileConfiguration Name="Debug|Win32" @@ -316,7 +316,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_file.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_file.c" > <FileConfiguration Name="Debug|Win32" @@ -338,7 +338,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_flush.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_flush.c" > <FileConfiguration Name="Debug|Win32" @@ -360,7 +360,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_heap.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_heap.c" > <FileConfiguration Name="Debug|Win32" @@ -382,7 +382,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_mmap.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_mmap.c" > <FileConfiguration Name="Debug|Win32" @@ -404,7 +404,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_pipe.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_pipe.c" > <FileConfiguration Name="Debug|Win32" @@ -426,7 +426,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_pool.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_pool.c" > <FileConfiguration Name="Debug|Win32" @@ -448,7 +448,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_refcount.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_refcount.c" > <FileConfiguration Name="Debug|Win32" @@ -470,7 +470,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_simple.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_simple.c" > <FileConfiguration Name="Debug|Win32" @@ -492,7 +492,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_socket.c" + RelativePath="..\..\apr-util\buckets\apr_buckets_socket.c" > <FileConfiguration Name="Debug|Win32" @@ -518,7 +518,7 @@ Name="crypto" > <File - RelativePath="..\..\apr-util-1.2.7\crypto\apr_md4.c" + RelativePath="..\..\apr-util\crypto\apr_md4.c" > <FileConfiguration Name="Debug|Win32" @@ -540,7 +540,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\crypto\apr_md5.c" + RelativePath="..\..\apr-util\crypto\apr_md5.c" > <FileConfiguration Name="Debug|Win32" @@ -562,7 +562,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\crypto\apr_sha1.c" + RelativePath="..\..\apr-util\crypto\apr_sha1.c" > <FileConfiguration Name="Debug|Win32" @@ -584,7 +584,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\crypto\getuuid.c" + RelativePath="..\..\apr-util\crypto\getuuid.c" > <FileConfiguration Name="Debug|Win32" @@ -606,7 +606,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\crypto\uuid.c" + RelativePath="..\..\apr-util\crypto\uuid.c" > <FileConfiguration Name="Debug|Win32" @@ -632,7 +632,7 @@ Name="dbd" > <File - RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd.c" + RelativePath="..\..\apr-util\dbd\apr_dbd.c" > <FileConfiguration Name="Debug|Win32" @@ -654,7 +654,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd_pgsql.c" + RelativePath="..\..\apr-util\dbd\apr_dbd_pgsql.c" > <FileConfiguration Name="Debug|Win32" @@ -676,7 +676,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd_sqlite2.c" + RelativePath="..\..\apr-util\dbd\apr_dbd_sqlite2.c" > <FileConfiguration Name="Debug|Win32" @@ -698,7 +698,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd_sqlite3.c" + RelativePath="..\..\apr-util\dbd\apr_dbd_sqlite3.c" > <FileConfiguration Name="Debug|Win32" @@ -724,7 +724,7 @@ Name="dbm" > <File - RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm.c" + RelativePath="..\..\apr-util\dbm\apr_dbm.c" > <FileConfiguration Name="Debug|Win32" @@ -746,7 +746,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm_berkeleydb.c" + RelativePath="..\..\apr-util\dbm\apr_dbm_berkeleydb.c" > <FileConfiguration Name="Debug|Win32" @@ -768,7 +768,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm_gdbm.c" + RelativePath="..\..\apr-util\dbm\apr_dbm_gdbm.c" > <FileConfiguration Name="Debug|Win32" @@ -790,7 +790,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm_sdbm.c" + RelativePath="..\..\apr-util\dbm\apr_dbm_sdbm.c" > <FileConfiguration Name="Debug|Win32" @@ -816,7 +816,7 @@ Name="encoding" > <File - RelativePath="..\..\apr-util-1.2.7\encoding\apr_base64.c" + RelativePath="..\..\apr-util\encoding\apr_base64.c" > <FileConfiguration Name="Debug|Win32" @@ -842,7 +842,7 @@ Name="hooks" > <File - RelativePath="..\..\apr-util-1.2.7\hooks\apr_hooks.c" + RelativePath="..\..\apr-util\hooks\apr_hooks.c" > <FileConfiguration Name="Debug|Win32" @@ -868,7 +868,7 @@ Name="ldap" > <File - RelativePath="..\..\apr-util-1.2.7\ldap\apr_ldap_init.c" + RelativePath="..\..\apr-util\ldap\apr_ldap_init.c" > <FileConfiguration Name="Debug|Win32" @@ -890,7 +890,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\ldap\apr_ldap_option.c" + RelativePath="..\..\apr-util\ldap\apr_ldap_option.c" > <FileConfiguration Name="Debug|Win32" @@ -912,7 +912,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\ldap\apr_ldap_url.c" + RelativePath="..\..\apr-util\ldap\apr_ldap_url.c" > <FileConfiguration Name="Debug|Win32" @@ -938,7 +938,7 @@ Name="misc" > <File - RelativePath="..\..\apr-util-1.2.7\misc\apr_date.c" + RelativePath="..\..\apr-util\misc\apr_date.c" > <FileConfiguration Name="Debug|Win32" @@ -960,7 +960,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\misc\apr_queue.c" + RelativePath="..\..\apr-util\misc\apr_queue.c" > <FileConfiguration Name="Debug|Win32" @@ -982,7 +982,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\misc\apr_reslist.c" + RelativePath="..\..\apr-util\misc\apr_reslist.c" > <FileConfiguration Name="Debug|Win32" @@ -1004,7 +1004,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\misc\apr_rmm.c" + RelativePath="..\..\apr-util\misc\apr_rmm.c" > <FileConfiguration Name="Debug|Win32" @@ -1030,7 +1030,7 @@ Name="sdbm" > <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm.c" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm.c" > <FileConfiguration Name="Debug|Win32" @@ -1052,7 +1052,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_hash.c" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_hash.c" > <FileConfiguration Name="Debug|Win32" @@ -1074,7 +1074,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_lock.c" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_lock.c" > <FileConfiguration Name="Debug|Win32" @@ -1096,7 +1096,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_pair.c" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.c" > <FileConfiguration Name="Debug|Win32" @@ -1118,15 +1118,15 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_pair.h" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_private.h" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_private.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_tune.h" + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_tune.h" > </File> </Filter> @@ -1134,7 +1134,7 @@ Name="strmatch" > <File - RelativePath="..\..\apr-util-1.2.7\strmatch\apr_strmatch.c" + RelativePath="..\..\apr-util\strmatch\apr_strmatch.c" > <FileConfiguration Name="Debug|Win32" @@ -1160,7 +1160,7 @@ Name="uri" > <File - RelativePath="..\..\apr-util-1.2.7\uri\apr_uri.c" + RelativePath="..\..\apr-util\uri\apr_uri.c" > <FileConfiguration Name="Debug|Win32" @@ -1186,7 +1186,7 @@ Name="xlate" > <File - RelativePath="..\..\apr-util-1.2.7\xlate\xlate.c" + RelativePath="..\..\apr-util\xlate\xlate.c" > <FileConfiguration Name="Debug|Win32" @@ -1213,15 +1213,15 @@ Name="Generated Files" > <File - RelativePath="..\..\apr-util-1.2.7\include\apr_ldap.h.in" + RelativePath="..\..\apr-util\include\apr_ldap.h.in" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_ldap.hnw" + RelativePath="..\..\apr-util\include\apr_ldap.hnw" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_ldap.hw" + RelativePath="..\..\apr-util\include\apr_ldap.hw" > <FileConfiguration Name="Debug|Win32" @@ -1229,8 +1229,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating apr_ldap.h from apr_ldap.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\apr_ldap.h type ..\..\apr-util-1.2.7\include\apr_ldap.hw > ..\..\apr-util-1.2.7\include\apr_ldap.h
" - Outputs="..\..\apr-util-1.2.7\include\apr_ldap.h" + CommandLine="if not exist ..\..\apr-util\include\apr_ldap.h type ..\..\apr-util\include\apr_ldap.hw > ..\..\apr-util\include\apr_ldap.h
" + Outputs="..\..\apr-util\include\apr_ldap.h" /> </FileConfiguration> <FileConfiguration @@ -1239,21 +1239,21 @@ <Tool Name="VCCustomBuildTool" Description="Creating apr_ldap.h from apr_ldap.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\apr_ldap.h type ..\..\apr-util-1.2.7\include\apr_ldap.hw > ..\..\apr-util-1.2.7\include\apr_ldap.h
" - Outputs="..\..\apr-util-1.2.7\include\apr_ldap.h" + CommandLine="if not exist ..\..\apr-util\include\apr_ldap.h type ..\..\apr-util\include\apr_ldap.hw > ..\..\apr-util\include\apr_ldap.h
" + Outputs="..\..\apr-util\include\apr_ldap.h" /> </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu.h.in" + RelativePath="..\..\apr-util\include\apu.h.in" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu.hnw" + RelativePath="..\..\apr-util\include\apu.hnw" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu.hw" + RelativePath="..\..\apr-util\include\apu.hw" > <FileConfiguration Name="Debug|Win32" @@ -1261,8 +1261,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu.h from apu.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu.h type ..\..\apr-util-1.2.7\include\apu.hw > ..\..\apr-util-1.2.7\include\apu.h
" - Outputs="..\..\apr-util-1.2.7\include\apu.h" + CommandLine="if not exist ..\..\apr-util\include\apu.h type ..\..\apr-util\include\apu.hw > ..\..\apr-util\include\apu.h
" + Outputs="..\..\apr-util\include\apu.h" /> </FileConfiguration> <FileConfiguration @@ -1271,17 +1271,17 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu.h from apu.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu.h type ..\..\apr-util-1.2.7\include\apu.hw > ..\..\apr-util-1.2.7\include\apu.h
" - Outputs="..\..\apr-util-1.2.7\include\apu.h" + CommandLine="if not exist ..\..\apr-util\include\apu.h type ..\..\apr-util\include\apu.hw > ..\..\apr-util\include\apu.h
" + Outputs="..\..\apr-util\include\apu.h" /> </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\include\private\apu_config.h.in" + RelativePath="..\..\apr-util\include\private\apu_config.h.in" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\private\apu_config.hw" + RelativePath="..\..\apr-util\include\private\apu_config.hw" > <FileConfiguration Name="Debug|Win32" @@ -1289,8 +1289,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu_config.h from apu_config.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_config.h type ..\..\apr-util-1.2.7\include\private\apu_config.hw > ..\..\apr-util-1.2.7\include\private\apu_config.h
" - Outputs="..\..\apr-util-1.2.7\include\private\apu_config.h" + CommandLine="if not exist ..\..\apr-util\include\private\apu_config.h type ..\..\apr-util\include\private\apu_config.hw > ..\..\apr-util\include\private\apu_config.h
" + Outputs="..\..\apr-util\include\private\apu_config.h" /> </FileConfiguration> <FileConfiguration @@ -1299,17 +1299,17 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu_config.h from apu_config.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_config.h type ..\..\apr-util-1.2.7\include\private\apu_config.hw > ..\..\apr-util-1.2.7\include\private\apu_config.h
" - Outputs="..\..\apr-util-1.2.7\include\private\apu_config.h" + CommandLine="if not exist ..\..\apr-util\include\private\apu_config.h type ..\..\apr-util\include\private\apu_config.hw > ..\..\apr-util\include\private\apu_config.h
" + Outputs="..\..\apr-util\include\private\apu_config.h" /> </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\include\private\apu_select_dbm.h.in" + RelativePath="..\..\apr-util\include\private\apu_select_dbm.h.in" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\private\apu_select_dbm.hw" + RelativePath="..\..\apr-util\include\private\apu_select_dbm.hw" > <FileConfiguration Name="Debug|Win32" @@ -1317,8 +1317,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu_select_dbm.h from apu_select_dbm.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h type ..\..\apr-util-1.2.7\include\private\apu_select_dbm.hw > ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h
" - Outputs="..\..\apr-util-1.2.7\include\private\apu_select_dbm.h" + CommandLine="if not exist ..\..\apr-util\include\private\apu_select_dbm.h type ..\..\apr-util\include\private\apu_select_dbm.hw > ..\..\apr-util\include\private\apu_select_dbm.h
" + Outputs="..\..\apr-util\include\private\apu_select_dbm.h" /> </FileConfiguration> <FileConfiguration @@ -1327,21 +1327,21 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu_select_dbm.h from apu_select_dbm.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h type ..\..\apr-util-1.2.7\include\private\apu_select_dbm.hw > ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h
" - Outputs="..\..\apr-util-1.2.7\include\private\apu_select_dbm.h" + CommandLine="if not exist ..\..\apr-util\include\private\apu_select_dbm.h type ..\..\apr-util\include\private\apu_select_dbm.hw > ..\..\apr-util\include\private\apu_select_dbm.h
" + Outputs="..\..\apr-util\include\private\apu_select_dbm.h" /> </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu_want.h.in" + RelativePath="..\..\apr-util\include\apu_want.h.in" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu_want.hnw" + RelativePath="..\..\apr-util\include\apu_want.hnw" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu_want.hw" + RelativePath="..\..\apr-util\include\apu_want.hw" > <FileConfiguration Name="Debug|Win32" @@ -1349,8 +1349,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu_want.h from apu_want.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu_want.h type ..\..\apr-util-1.2.7\include\apu_want.hw > ..\..\apr-util-1.2.7\include\apu_want.h
" - Outputs="..\..\apr-util-1.2.7\include\apu_want.h" + CommandLine="if not exist ..\..\apr-util\include\apu_want.h type ..\..\apr-util\include\apu_want.hw > ..\..\apr-util\include\apu_want.h
" + Outputs="..\..\apr-util\include\apu_want.h" /> </FileConfiguration> <FileConfiguration @@ -1359,8 +1359,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating apu_want.h from apu_want.hw" - CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu_want.h type ..\..\apr-util-1.2.7\include\apu_want.hw > ..\..\apr-util-1.2.7\include\apu_want.h
" - Outputs="..\..\apr-util-1.2.7\include\apu_want.h" + CommandLine="if not exist ..\..\apr-util\include\apu_want.h type ..\..\apr-util\include\apu_want.hw > ..\..\apr-util\include\apu_want.h
" + Outputs="..\..\apr-util\include\apu_want.h" /> </FileConfiguration> </File> @@ -1369,96 +1369,96 @@ Name="Public Header Files" > <File - RelativePath="..\..\apr-util-1.2.7\include\apr_anylock.h" + RelativePath="..\..\apr-util\include\apr_anylock.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_base64.h" + RelativePath="..\..\apr-util\include\apr_base64.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_buckets.h" + RelativePath="..\..\apr-util\include\apr_buckets.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_date.h" + RelativePath="..\..\apr-util\include\apr_date.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_dbm.h" + RelativePath="..\..\apr-util\include\apr_dbm.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_hooks.h" + RelativePath="..\..\apr-util\include\apr_hooks.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_ldap_url.h" + RelativePath="..\..\apr-util\include\apr_ldap_url.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_md4.h" + RelativePath="..\..\apr-util\include\apr_md4.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_md5.h" + RelativePath="..\..\apr-util\include\apr_md5.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_optional.h" + RelativePath="..\..\apr-util\include\apr_optional.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_optional_hooks.h" + RelativePath="..\..\apr-util\include\apr_optional_hooks.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_queue.h" + RelativePath="..\..\apr-util\include\apr_queue.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_reslist.h" + RelativePath="..\..\apr-util\include\apr_reslist.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_rmm.h" + RelativePath="..\..\apr-util\include\apr_rmm.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_sdbm.h" + RelativePath="..\..\apr-util\include\apr_sdbm.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_sha1.h" + RelativePath="..\..\apr-util\include\apr_sha1.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_strmatch.h" + RelativePath="..\..\apr-util\include\apr_strmatch.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_uri.h" + RelativePath="..\..\apr-util\include\apr_uri.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_uuid.h" + RelativePath="..\..\apr-util\include\apr_uuid.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_xlate.h" + RelativePath="..\..\apr-util\include\apr_xlate.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apr_xml.h" + RelativePath="..\..\apr-util\include\apr_xml.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\include\apu_version.h" + RelativePath="..\..\apr-util\include\apu_version.h" > </File> </Filter> <File - RelativePath="..\..\apr-util-1.2.7\libaprutil.rc" + RelativePath="..\..\apr-util\libaprutil.rc" > <FileConfiguration Name="Debug|Win32" Modified: freeswitch/branches/knhor/trunk/libs/win32/apr-util/xml.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/apr-util/xml.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/apr-util/xml.vcproj Tue Dec 19 22:00:59 2006 @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\" + AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\"expat_1.95.2\"" StringPooling="true" RuntimeLibrary="2" @@ -118,7 +118,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\" + AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\"expat_1.95.2\"" RuntimeLibrary="3" PrecompiledHeaderFile=".\LibD/xml.pch" @@ -171,7 +171,7 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlparse.c" + RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c" > <FileConfiguration Name="Release|Win32" @@ -193,7 +193,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlrole.c" + RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c" > <FileConfiguration Name="Release|Win32" @@ -215,7 +215,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok.c" + RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c" > <FileConfiguration Name="Release|Win32" @@ -237,7 +237,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_impl.c" + RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.c" > <FileConfiguration Name="Release|Win32" @@ -261,7 +261,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_ns.c" + RelativePath="..\..\apr-util\xml\expat\lib\xmltok_ns.c" > <FileConfiguration Name="Release|Win32" @@ -290,47 +290,47 @@ Filter="h;hpp;hxx;hm;inl" > <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\ascii.h" + RelativePath="..\..\apr-util\xml\expat\lib\ascii.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\asciitab.h" + RelativePath="..\..\apr-util\xml\expat\lib\asciitab.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\config.h" + RelativePath="..\..\apr-util\xml\expat\lib\config.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\expat.h" + RelativePath="..\..\apr-util\xml\expat\lib\expat.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\iasciitab.h" + RelativePath="..\..\apr-util\xml\expat\lib\iasciitab.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\latin1tab.h" + RelativePath="..\..\apr-util\xml\expat\lib\latin1tab.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\nametab.h" + RelativePath="..\..\apr-util\xml\expat\lib\nametab.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\utf8tab.h" + RelativePath="..\..\apr-util\xml\expat\lib\utf8tab.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlrole.h" + RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok.h" + RelativePath="..\..\apr-util\xml\expat\lib\xmltok.h" > </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_impl.h" + RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.h" > </File> </Filter> @@ -338,7 +338,7 @@ Name="Generated Header Files" > <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in" + RelativePath="..\..\apr-util\xml\expat\lib\expat.h.in" > <FileConfiguration Name="Release|Win32" @@ -346,8 +346,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h
" - Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h" + CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> <FileConfiguration @@ -356,13 +356,13 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h
" - Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h" + CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> </File> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h" + RelativePath="..\..\apr-util\xml\expat\lib\winconfig.h" > <FileConfiguration Name="Release|Win32" @@ -370,8 +370,8 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h
" - Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h" + CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> <FileConfiguration @@ -380,14 +380,14 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h
" - Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h" + CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> </File> </Filter> <File - RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\ReadMe.txt" + RelativePath="..\..\apr-util\xml\expat\lib\ReadMe.txt" > </File> </Files> Modified: freeswitch/branches/knhor/trunk/libs/win32/apr/libapr.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/apr/libapr.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/apr/libapr.vcproj Tue Dec 19 22:00:59 2006 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-1.2.7\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr-1.2.7\include\apr.h"
xcopy "$(ProjectDir)..\..\apr-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h"
xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> <Tool Name="VCCustomBuildTool" @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories=""..\..\apr-1.2.7\include";"..\..\apr-1.2.7\include/arch";"..\..\apr-1.2.7\include/arch/win32";"..\..\apr-1.2.7\include/arch/unix"" + AdditionalIncludeDirectories=""..\..\apr\include";"..\..\apr\include/arch";"..\..\apr\include/arch/win32";"..\..\apr\include/arch/unix"" PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libapr.pch" @@ -67,7 +67,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG,APR_VERSION_ONLY" Culture="1033" - AdditionalIncludeDirectories="..\..\apr-1.2.7\include" + AdditionalIncludeDirectories="..\..\apr\include" /> <Tool Name="VCPreLinkEventTool" @@ -124,7 +124,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-1.2.7\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr-1.2.7\include\apr.h"
xcopy "$(ProjectDir)..\..\apr-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h"
xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> <Tool Name="VCCustomBuildTool" @@ -148,7 +148,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""..\..\apr-1.2.7\include";"..\..\apr-1.2.7\include/arch";"..\..\apr-1.2.7\include/arch/win32";"..\..\apr-1.2.7\include/arch/unix"" + AdditionalIncludeDirectories=""..\..\apr\include";"..\..\apr\include/arch";"..\..\apr\include/arch/win32";"..\..\apr\include/arch/unix"" PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" @@ -168,7 +168,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG,APR_VERSION_ONLY" Culture="1033" - AdditionalIncludeDirectories="..\..\apr-1.2.7\" + AdditionalIncludeDirectories="..\..\apr\" /> <Tool Name="VCPreLinkEventTool" @@ -227,7 +227,7 @@ Name="atomic" > <File - RelativePath="..\..\apr-1.2.7\atomic\win32\apr_atomic.c" + RelativePath="..\..\apr\atomic\win32\apr_atomic.c" > </File> </Filter> @@ -235,7 +235,7 @@ Name="dso" > <File - RelativePath="..\..\apr-1.2.7\dso\win32\dso.c" + RelativePath="..\..\apr\dso\win32\dso.c" > </File> </Filter> @@ -243,67 +243,67 @@ Name="file_io" > <File - RelativePath="..\..\apr-1.2.7\file_io\unix\copy.c" + RelativePath="..\..\apr\file_io\unix\copy.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\dir.c" + RelativePath="..\..\apr\file_io\win32\dir.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\unix\fileacc.c" + RelativePath="..\..\apr\file_io\unix\fileacc.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\filedup.c" + RelativePath="..\..\apr\file_io\win32\filedup.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\filepath.c" + RelativePath="..\..\apr\file_io\win32\filepath.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\unix\filepath_util.c" + RelativePath="..\..\apr\file_io\unix\filepath_util.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\filestat.c" + RelativePath="..\..\apr\file_io\win32\filestat.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\filesys.c" + RelativePath="..\..\apr\file_io\win32\filesys.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\flock.c" + RelativePath="..\..\apr\file_io\win32\flock.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\unix\fullrw.c" + RelativePath="..\..\apr\file_io\unix\fullrw.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\unix\mktemp.c" + RelativePath="..\..\apr\file_io\unix\mktemp.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\open.c" + RelativePath="..\..\apr\file_io\win32\open.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\pipe.c" + RelativePath="..\..\apr\file_io\win32\pipe.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\readwrite.c" + RelativePath="..\..\apr\file_io\win32\readwrite.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\win32\seek.c" + RelativePath="..\..\apr\file_io\win32\seek.c" > </File> <File - RelativePath="..\..\apr-1.2.7\file_io\unix\tempdir.c" + RelativePath="..\..\apr\file_io\unix\tempdir.c" > </File> </Filter> @@ -311,19 +311,19 @@ Name="locks" > <File - RelativePath="..\..\apr-1.2.7\locks\win32\proc_mutex.c" + RelativePath="..\..\apr\locks\win32\proc_mutex.c" > </File> <File - RelativePath="..\..\apr-1.2.7\locks\win32\thread_cond.c" + RelativePath="..\..\apr\locks\win32\thread_cond.c" > </File> <File - RelativePath="..\..\apr-1.2.7\locks\win32\thread_mutex.c" + RelativePath="..\..\apr\locks\win32\thread_mutex.c" > </File> <File - RelativePath="..\..\apr-1.2.7\locks\win32\thread_rwlock.c" + RelativePath="..\..\apr\locks\win32\thread_rwlock.c" > </File> </Filter> @@ -331,7 +331,7 @@ Name="memory" > <File - RelativePath="..\..\apr-1.2.7\memory\unix\apr_pools.c" + RelativePath="..\..\apr\memory\unix\apr_pools.c" > </File> </Filter> @@ -339,47 +339,47 @@ Name="misc" > <File - RelativePath="..\..\apr-1.2.7\misc\win32\charset.c" + RelativePath="..\..\apr\misc\win32\charset.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\win32\env.c" + RelativePath="..\..\apr\misc\win32\env.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\unix\errorcodes.c" + RelativePath="..\..\apr\misc\unix\errorcodes.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\unix\getopt.c" + RelativePath="..\..\apr\misc\unix\getopt.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\win32\internal.c" + RelativePath="..\..\apr\misc\win32\internal.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\win32\misc.c" + RelativePath="..\..\apr\misc\win32\misc.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\unix\otherchild.c" + RelativePath="..\..\apr\misc\unix\otherchild.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\win32\rand.c" + RelativePath="..\..\apr\misc\win32\rand.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\win32\start.c" + RelativePath="..\..\apr\misc\win32\start.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\win32\utf8.c" + RelativePath="..\..\apr\misc\win32\utf8.c" > </File> <File - RelativePath="..\..\apr-1.2.7\misc\unix\version.c" + RelativePath="..\..\apr\misc\unix\version.c" > </File> </Filter> @@ -387,11 +387,11 @@ Name="mmap" > <File - RelativePath="..\..\apr-1.2.7\mmap\unix\common.c" + RelativePath="..\..\apr\mmap\unix\common.c" > </File> <File - RelativePath="..\..\apr-1.2.7\mmap\win32\mmap.c" + RelativePath="..\..\apr\mmap\win32\mmap.c" > </File> </Filter> @@ -399,35 +399,35 @@ Name="network_io" > <File - RelativePath="..\..\apr-1.2.7\network_io\unix\inet_ntop.c" + RelativePath="..\..\apr\network_io\unix\inet_ntop.c" > </File> <File - RelativePath="..\..\apr-1.2.7\network_io\unix\inet_pton.c" + RelativePath="..\..\apr\network_io\unix\inet_pton.c" > </File> <File - RelativePath="..\..\apr-1.2.7\network_io\unix\multicast.c" + RelativePath="..\..\apr\network_io\unix\multicast.c" > </File> <File - RelativePath="..\..\apr-1.2.7\poll\unix\select.c" + RelativePath="..\..\apr\poll\unix\select.c" > </File> <File - RelativePath="..\..\apr-1.2.7\network_io\win32\sendrecv.c" + RelativePath="..\..\apr\network_io\win32\sendrecv.c" > </File> <File - RelativePath="..\..\apr-1.2.7\network_io\unix\sockaddr.c" + RelativePath="..\..\apr\network_io\unix\sockaddr.c" > </File> <File - RelativePath="..\..\apr-1.2.7\network_io\win32\sockets.c" + RelativePath="..\..\apr\network_io\win32\sockets.c" > </File> <File - RelativePath="..\..\apr-1.2.7\network_io\win32\sockopt.c" + RelativePath="..\..\apr\network_io\win32\sockopt.c" > </File> </Filter> @@ -435,7 +435,7 @@ Name="passwd" > <File - RelativePath="..\..\apr-1.2.7\passwd\apr_getpass.c" + RelativePath="..\..\apr\passwd\apr_getpass.c" > </File> </Filter> @@ -443,15 +443,15 @@ Name="random" > <File - RelativePath="..\..\apr-1.2.7\random\unix\apr_random.c" + RelativePath="..\..\apr\random\unix\apr_random.c" > </File> <File - RelativePath="..\..\apr-1.2.7\random\unix\sha2.c" + RelativePath="..\..\apr\random\unix\sha2.c" > </File> <File - RelativePath="..\..\apr-1.2.7\random\unix\sha2_glue.c" + RelativePath="..\..\apr\random\unix\sha2_glue.c" > </File> </Filter> @@ -459,7 +459,7 @@ Name="shmem" > <File - RelativePath="..\..\apr-1.2.7\shmem\win32\shm.c" + RelativePath="..\..\apr\shmem\win32\shm.c" > </File> </Filter> @@ -467,27 +467,27 @@ Name="strings" > <File - RelativePath="..\..\apr-1.2.7\strings\apr_cpystrn.c" + RelativePath="..\..\apr\strings\apr_cpystrn.c" > </File> <File - RelativePath="..\..\apr-1.2.7\strings\apr_fnmatch.c" + RelativePath="..\..\apr\strings\apr_fnmatch.c" > </File> <File - RelativePath="..\..\apr-1.2.7\strings\apr_snprintf.c" + RelativePath="..\..\apr\strings\apr_snprintf.c" > </File> <File - RelativePath="..\..\apr-1.2.7\strings\apr_strings.c" + RelativePath="..\..\apr\strings\apr_strings.c" > </File> <File - RelativePath="..\..\apr-1.2.7\strings\apr_strnatcmp.c" + RelativePath="..\..\apr\strings\apr_strnatcmp.c" > </File> <File - RelativePath="..\..\apr-1.2.7\strings\apr_strtok.c" + RelativePath="..\..\apr\strings\apr_strtok.c" > </File> </Filter> @@ -495,11 +495,11 @@ Name="tables" > <File - RelativePath="..\..\apr-1.2.7\tables\apr_hash.c" + RelativePath="..\..\apr\tables\apr_hash.c" > </File> <File - RelativePath="..\..\apr-1.2.7\tables\apr_tables.c" + RelativePath="..\..\apr\tables\apr_tables.c" > </File> </Filter> @@ -507,19 +507,19 @@ Name="threadproc" > <File - RelativePath="..\..\apr-1.2.7\threadproc\win32\proc.c" + RelativePath="..\..\apr\threadproc\win32\proc.c" > </File> <File - RelativePath="..\..\apr-1.2.7\threadproc\win32\signals.c" + RelativePath="..\..\apr\threadproc\win32\signals.c" > </File> <File - RelativePath="..\..\apr-1.2.7\threadproc\win32\thread.c" + RelativePath="..\..\apr\threadproc\win32\thread.c" > </File> <File - RelativePath="..\..\apr-1.2.7\threadproc\win32\threadpriv.c" + RelativePath="..\..\apr\threadproc\win32\threadpriv.c" > </File> </Filter> @@ -527,15 +527,15 @@ Name="time" > <File - RelativePath="..\..\apr-1.2.7\time\win32\access.c" + RelativePath="..\..\apr\time\win32\access.c" > </File> <File - RelativePath="..\..\apr-1.2.7\time\win32\time.c" + RelativePath="..\..\apr\time\win32\time.c" > </File> <File - RelativePath="..\..\apr-1.2.7\time\win32\timestr.c" + RelativePath="..\..\apr\time\win32\timestr.c" > </File> </Filter> @@ -543,11 +543,11 @@ Name="user" > <File - RelativePath="..\..\apr-1.2.7\user\win32\groupinfo.c" + RelativePath="..\..\apr\user\win32\groupinfo.c" > </File> <File - RelativePath="..\..\apr-1.2.7\user\win32\userinfo.c" + RelativePath="..\..\apr\user\win32\userinfo.c" > </File> </Filter> @@ -556,51 +556,51 @@ Name="Private Header Files" > <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_atime.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_atime.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_dso.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_dso.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_file_io.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_file_io.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_inherit.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_inherit.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_misc.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_misc.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_networkio.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_networkio.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_thread_mutex.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_thread_mutex.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_thread_rwlock.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_thread_rwlock.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_threadproc.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_threadproc.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_utf8.h" + RelativePath="..\..\apr\include\arch\win32\apr_arch_utf8.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_private.h" + RelativePath="..\..\apr\include\arch\win32\apr_private.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\arch\apr_private_common.h" + RelativePath="..\..\apr\include\arch\apr_private_common.h" > </File> </Filter> @@ -608,151 +608,151 @@ Name="Public Header Files" > <File - RelativePath="..\..\apr-1.2.7\include\apr_allocator.h" + RelativePath="..\..\apr\include\apr_allocator.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_atomic.h" + RelativePath="..\..\apr\include\apr_atomic.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_dso.h" + RelativePath="..\..\apr\include\apr_dso.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_env.h" + RelativePath="..\..\apr\include\apr_env.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_errno.h" + RelativePath="..\..\apr\include\apr_errno.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_file_info.h" + RelativePath="..\..\apr\include\apr_file_info.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_file_io.h" + RelativePath="..\..\apr\include\apr_file_io.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_fnmatch.h" + RelativePath="..\..\apr\include\apr_fnmatch.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_general.h" + RelativePath="..\..\apr\include\apr_general.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_getopt.h" + RelativePath="..\..\apr\include\apr_getopt.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_global_mutex.h" + RelativePath="..\..\apr\include\apr_global_mutex.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_hash.h" + RelativePath="..\..\apr\include\apr_hash.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_inherit.h" + RelativePath="..\..\apr\include\apr_inherit.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_lib.h" + RelativePath="..\..\apr\include\apr_lib.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_mmap.h" + RelativePath="..\..\apr\include\apr_mmap.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_network_io.h" + RelativePath="..\..\apr\include\apr_network_io.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_poll.h" + RelativePath="..\..\apr\include\apr_poll.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_pools.h" + RelativePath="..\..\apr\include\apr_pools.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_portable.h" + RelativePath="..\..\apr\include\apr_portable.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_proc_mutex.h" + RelativePath="..\..\apr\include\apr_proc_mutex.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_ring.h" + RelativePath="..\..\apr\include\apr_ring.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_shm.h" + RelativePath="..\..\apr\include\apr_shm.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_signal.h" + RelativePath="..\..\apr\include\apr_signal.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_strings.h" + RelativePath="..\..\apr\include\apr_strings.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_support.h" + RelativePath="..\..\apr\include\apr_support.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_tables.h" + RelativePath="..\..\apr\include\apr_tables.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_thread_cond.h" + RelativePath="..\..\apr\include\apr_thread_cond.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_thread_mutex.h" + RelativePath="..\..\apr\include\apr_thread_mutex.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_thread_proc.h" + RelativePath="..\..\apr\include\apr_thread_proc.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_thread_rwlock.h" + RelativePath="..\..\apr\include\apr_thread_rwlock.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_time.h" + RelativePath="..\..\apr\include\apr_time.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_user.h" + RelativePath="..\..\apr\include\apr_user.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_version.h" + RelativePath="..\..\apr\include\apr_version.h" > </File> <File - RelativePath="..\..\apr-1.2.7\include\apr_want.h" + RelativePath="..\..\apr\include\apr_want.h" > </File> </Filter> <File - RelativePath="..\..\apr-1.2.7\libapr.rc" + RelativePath="..\..\apr\libapr.rc" > <FileConfiguration Name="Release|Win32" > <Tool Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\apr-1.2.7\include" + AdditionalIncludeDirectories="..\..\apr\include" /> </FileConfiguration> </File> Modified: freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj Tue Dec 19 22:00:59 2006 @@ -25,6 +25,7 @@ > <Tool Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"" /> <Tool Name="VCCustomBuildTool" @@ -48,8 +49,8 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\include" - PreprocessorDefinitions="NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE" + AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include" + PreprocessorDefinitions="NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -73,11 +74,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib libnspr4.lib" + AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib" OutputFile="$(OutDir)\js32.dll" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib" + AdditionalLibraryDirectories="" ProgramDatabaseFile=".\Release/js32.pdb" SubSystem="2" OptimizeReferences="1" @@ -124,6 +125,7 @@ > <Tool Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"" /> <Tool Name="VCCustomBuildTool" @@ -146,8 +148,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\include" - PreprocessorDefinitions="_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE" + AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include" + PreprocessorDefinitions="_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_" MinimalRebuild="true" RuntimeLibrary="3" PrecompiledHeaderFile="$(IntDir)\js.pch" @@ -171,11 +173,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib libnspr4.lib" + AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib" OutputFile="$(OutDir)\js32.dll" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib" + AdditionalLibraryDirectories="" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/js32.pdb" SubSystem="2" @@ -219,139 +221,751 @@ Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" > <File - RelativePath="..\..\js20051231\src\jsapi.c" + RelativePath="..\..\js\src\fdlibm\e_acos.c" > </File> <File - RelativePath="..\..\js20051231\src\jsarena.c" + RelativePath="..\..\js\src\fdlibm\e_acosh.c" > </File> <File - RelativePath="..\..\js20051231\src\jsarray.c" + RelativePath="..\..\js\src\fdlibm\e_asin.c" > </File> <File - RelativePath="..\..\js20051231\src\jsatom.c" + RelativePath="..\..\js\src\fdlibm\e_atan2.c" > </File> <File - RelativePath="..\..\js20051231\src\jsbool.c" + RelativePath="..\..\js\src\fdlibm\e_atanh.c" > </File> <File - RelativePath="..\..\js20051231\src\jscntxt.c" + RelativePath="..\..\js\src\fdlibm\e_cosh.c" > </File> <File - RelativePath="..\..\js20051231\src\jsdate.c" + RelativePath="..\..\js\src\fdlibm\e_exp.c" > </File> <File - RelativePath="..\..\js20051231\src\jsdbgapi.c" + RelativePath="..\..\js\src\fdlibm\e_fmod.c" > </File> <File - RelativePath="..\..\js20051231\src\jsdhash.c" + RelativePath="..\..\js\src\fdlibm\e_gamma.c" > </File> <File - RelativePath="..\..\js20051231\src\jsdtoa.c" + RelativePath="..\..\js\src\fdlibm\e_gamma_r.c" > </File> <File - RelativePath="..\..\js20051231\src\jsemit.c" + RelativePath="..\..\js\src\fdlibm\e_hypot.c" > </File> <File - RelativePath="..\..\js20051231\src\jsexn.c" + RelativePath="..\..\js\src\fdlibm\e_j0.c" > </File> <File - RelativePath="..\..\js20051231\src\jsfun.c" + RelativePath="..\..\js\src\fdlibm\e_j1.c" > </File> <File - RelativePath="..\..\js20051231\src\jsgc.c" + RelativePath="..\..\js\src\fdlibm\e_jn.c" > </File> <File - RelativePath="..\..\js20051231\src\jshash.c" + RelativePath="..\..\js\src\fdlibm\e_lgamma.c" > </File> <File - RelativePath="..\..\js20051231\src\jsinterp.c" + RelativePath="..\..\js\src\fdlibm\e_lgamma_r.c" > </File> <File - RelativePath="..\..\js20051231\src\jslock.c" + RelativePath="..\..\js\src\fdlibm\e_log.c" > </File> <File - RelativePath="..\..\js20051231\src\jslog2.c" + RelativePath="..\..\js\src\fdlibm\e_log10.c" > </File> <File - RelativePath="..\..\js20051231\src\jslong.c" + RelativePath="..\..\js\src\fdlibm\e_pow.c" > </File> <File - RelativePath="..\..\js20051231\src\jsmath.c" + RelativePath="..\..\js\src\fdlibm\e_rem_pio2.c" > </File> <File - RelativePath="..\..\js20051231\src\jsnum.c" + RelativePath="..\..\js\src\fdlibm\e_remainder.c" > </File> <File - RelativePath="..\..\js20051231\src\jsobj.c" + RelativePath="..\..\js\src\fdlibm\e_scalb.c" > </File> <File - RelativePath="..\..\js20051231\src\jsopcode.c" + RelativePath="..\..\js\src\fdlibm\e_sinh.c" > </File> <File - RelativePath="..\..\js20051231\src\jsparse.c" + RelativePath="..\..\js\src\fdlibm\e_sqrt.c" > </File> <File - RelativePath="..\..\js20051231\src\jsprf.c" + RelativePath="..\..\js\src\jsapi.c" > </File> <File - RelativePath="..\..\js20051231\src\jsregexp.c" + RelativePath="..\..\js\src\jsarena.c" > </File> <File - RelativePath="..\..\js20051231\src\jsscan.c" + RelativePath="..\..\js\src\jsarray.c" > </File> <File - RelativePath="..\..\js20051231\src\jsscope.c" + RelativePath="..\..\js\src\jsatom.c" > </File> <File - RelativePath="..\..\js20051231\src\jsscript.c" + RelativePath="..\..\js\src\jsbool.c" > </File> <File - RelativePath="..\..\js20051231\src\jsstr.c" + RelativePath="..\..\js\src\jscntxt.c" > </File> <File - RelativePath="..\..\js20051231\src\jsutil.c" + RelativePath="..\..\js\src\jsdate.c" > </File> <File - RelativePath="..\..\js20051231\src\jsxdrapi.c" + RelativePath="..\..\js\src\jsdbgapi.c" > </File> <File - RelativePath="..\..\js20051231\src\jsxml.c" + RelativePath="..\..\js\src\jsdhash.c" > </File> <File - RelativePath="..\..\js20051231\src\prmjtime.c" + RelativePath="..\..\js\src\jsdso.c" + > + </File> + <File + RelativePath="..\..\js\src\jsdtoa.c" + > + </File> + <File + RelativePath="..\..\js\src\jsemit.c" + > + </File> + <File + RelativePath="..\..\js\src\jsexn.c" + > + </File> + <File + RelativePath="..\..\js\src\jsfile.c" + > + </File> + <File + RelativePath="..\..\js\src\jsfun.c" + > + </File> + <File + RelativePath="..\..\js\src\jsgc.c" + > + </File> + <File + RelativePath="..\..\js\src\jshash.c" + > + </File> + <File + RelativePath="..\..\js\src\jsinterp.c" + > + </File> + <File + RelativePath="..\..\js\src\jslock.c" + > + </File> + <File + RelativePath="..\..\js\src\jslog2.c" + > + </File> + <File + RelativePath="..\..\js\src\jslong.c" + > + </File> + <File + RelativePath="..\..\js\src\jsmath.c" + > + </File> + <File + RelativePath="..\..\js\src\jsnum.c" + > + </File> + <File + RelativePath="..\..\js\src\jsobj.c" + > + </File> + <File + RelativePath="..\..\js\src\jsopcode.c" + > + </File> + <File + RelativePath="..\..\js\src\jsparse.c" + > + </File> + <File + RelativePath="..\..\js\src\jsprf.c" + > + </File> + <File + RelativePath="..\..\js\src\jsregexp.c" + > + </File> + <File + RelativePath="..\..\js\src\jsscan.c" + > + </File> + <File + RelativePath="..\..\js\src\jsscope.c" + > + </File> + <File + RelativePath="..\..\js\src\jsscript.c" + > + </File> + <File + RelativePath="..\..\js\src\jsstr.c" + > + </File> + <File + RelativePath="..\..\js\src\jsutil.c" + > + </File> + <File + RelativePath="..\..\js\src\jsxdrapi.c" + > + </File> + <File + RelativePath="..\..\js\src\jsxml.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_cos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_rem_pio2.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_sin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_standard.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_tan.c" + > + </File> + <File + RelativePath="..\..\js\src\prmjtime.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_asinh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_atan.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_cbrt.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_ceil.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_copysign.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_cos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_erf.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_expm1.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_fabs.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_finite.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_floor.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_frexp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_ilogb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_isnan.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_ldexp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_lib_version.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_log1p.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_logb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_matherr.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_modf.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_nextafter.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_rint.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_scalbn.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_signgam.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_significand.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_sin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_tan.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_tanh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_acos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_acosh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_asin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_atan2.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_atanh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_cosh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_exp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_fmod.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_gamma.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_gamma_r.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_hypot.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_j0.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_j1.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_jn.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_lgamma.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_lgamma_r.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_log.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_log10.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_pow.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_remainder.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_scalb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_sinh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_sqrt.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + > + </Filter> + <Filter + Name="NSPR Source" + > + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntgc.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntio.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntsec.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntsem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntthread.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\pralarm.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\pratom.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prcmon.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prcountr.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prcthr.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prdir.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prdtoa.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prdump.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prenv.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prerr.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prerror.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prerrortable.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prfdcach.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prfile.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prinit.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prinrval.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prio.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\priometh.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\pripc.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\pripcsem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\pripv6.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prlayer.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\linking\prlink.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prlog.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prlog2.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prlong.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\malloc\prmalloc.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prmapopt.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\malloc\prmem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prmmap.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prmon.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prmwait.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prnetdb.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prolock.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\prosdep.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prpolevt.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prprf.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prrng.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prrwlock.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prscanf.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\memory\prseg.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prsem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\memory\prshm.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\memory\prshma.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prsocket.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prstdio.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prsystem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prthinfo.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prtime.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prtpd.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prtpool.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prtrace.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucv.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prulock.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prustack.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32ipcsem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32poll.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32rng.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32shm.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/pcre/libpcre.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/pcre/libpcre.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/pcre/libpcre.vcproj Tue Dec 19 22:00:59 2006 @@ -97,7 +97,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre-6.7\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> </Configuration> <Configuration @@ -183,7 +183,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre-6.7\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> </Configuration> <Configuration @@ -254,7 +254,7 @@ OutputFile="$(OutDir)\$(ProjectName).dll" LinkIncremental="1" SuppressStartupBanner="true" - ModuleDefinitionFile="$(InputDir)..\..\pcre-6.7\pcre.def" + ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" ImportLibrary="$(IntDir)\$(ProjectName).lib" @@ -285,7 +285,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre-6.7\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> </Configuration> <Configuration @@ -356,7 +356,7 @@ OutputFile="$(OutDir)\$(ProjectName).dll" LinkIncremental="1" SuppressStartupBanner="true" - ModuleDefinitionFile="$(InputDir)..\..\pcre-6.7\pcre.def" + ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" ImportLibrary="$(IntDir)\$(ProjectName).lib" TargetMachine="1" @@ -386,7 +386,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre-6.7\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\pcre\pcre.h" "$(ProjectDir)..\..\include\" /C /D /Y
" /> </Configuration> </Configurations> @@ -402,11 +402,11 @@ > </File> <File - RelativePath="..\..\pcre-6.7\pcre_compile.c" + RelativePath="..\..\pcre\pcre_compile.c" > </File> <File - RelativePath="..\..\pcre-6.7\pcre_config.c" + RelativePath="..\..\pcre\pcre_config.c" > <FileConfiguration Name="Debug|Win32" @@ -446,7 +446,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_dfa_exec.c" + RelativePath="..\..\pcre\pcre_dfa_exec.c" > <FileConfiguration Name="Debug|Win32" @@ -486,7 +486,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_exec.c" + RelativePath="..\..\pcre\pcre_exec.c" > <FileConfiguration Name="Debug|Win32" @@ -526,7 +526,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_fullinfo.c" + RelativePath="..\..\pcre\pcre_fullinfo.c" > <FileConfiguration Name="Debug|Win32" @@ -566,7 +566,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_get.c" + RelativePath="..\..\pcre\pcre_get.c" > <FileConfiguration Name="Debug|Win32" @@ -606,7 +606,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_globals.c" + RelativePath="..\..\pcre\pcre_globals.c" > <FileConfiguration Name="Debug|Win32" @@ -646,7 +646,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_info.c" + RelativePath="..\..\pcre\pcre_info.c" > <FileConfiguration Name="Debug|Win32" @@ -686,7 +686,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_maketables.c" + RelativePath="..\..\pcre\pcre_maketables.c" > <FileConfiguration Name="Debug|Win32" @@ -726,7 +726,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_ord2utf8.c" + RelativePath="..\..\pcre\pcre_ord2utf8.c" > <FileConfiguration Name="Debug|Win32" @@ -766,7 +766,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_refcount.c" + RelativePath="..\..\pcre\pcre_refcount.c" > <FileConfiguration Name="Debug|Win32" @@ -806,7 +806,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_study.c" + RelativePath="..\..\pcre\pcre_study.c" > <FileConfiguration Name="Debug|Win32" @@ -846,7 +846,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_tables.c" + RelativePath="..\..\pcre\pcre_tables.c" > <FileConfiguration Name="Debug|Win32" @@ -886,7 +886,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_try_flipped.c" + RelativePath="..\..\pcre\pcre_try_flipped.c" > <FileConfiguration Name="Debug|Win32" @@ -926,11 +926,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_ucp_searchfuncs.c" + RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c" > </File> <File - RelativePath="..\..\pcre-6.7\pcre_valid_utf8.c" + RelativePath="..\..\pcre\pcre_valid_utf8.c" > <FileConfiguration Name="Debug|Win32" @@ -970,7 +970,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_version.c" + RelativePath="..\..\pcre\pcre_version.c" > <FileConfiguration Name="Debug|Win32" @@ -1010,7 +1010,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcre_xclass.c" + RelativePath="..\..\pcre\pcre_xclass.c" > <FileConfiguration Name="Debug|Win32" @@ -1050,7 +1050,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\pcre-6.7\pcreposix.c" + RelativePath="..\..\pcre\pcreposix.c" > <FileConfiguration Name="Debug|Win32" @@ -1099,7 +1099,7 @@ > </File> <File - RelativePath="..\..\pcre-6.7\internal.h" + RelativePath="..\..\pcre\internal.h" > </File> <File @@ -1107,11 +1107,11 @@ > </File> <File - RelativePath="..\..\pcre-6.7\pcre_internal.h" + RelativePath="..\..\pcre\pcre_internal.h" > </File> <File - RelativePath="..\..\pcre-6.7\pcreposix.h" + RelativePath="..\..\pcre\pcreposix.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/libs/win32/pcre/pcre_chartables.c.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/pcre/pcre_chartables.c.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/pcre/pcre_chartables.c.vcproj Tue Dec 19 22:00:59 2006 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\pcre-6.7\" + AdditionalIncludeDirectories="..\..\pcre\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -120,7 +120,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\pcre-6.7\" + AdditionalIncludeDirectories="..\..\pcre\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/branches/knhor/trunk/libs/win32/sqlite/sqlite.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/sqlite/sqlite.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/sqlite/sqlite.vcproj Tue Dec 19 22:00:59 2006 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="if not exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" type "$(ProjectDir)sqlite3.h" > "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.h" type "$(ProjectDir)parse.h" > "$(ProjectDir)..\..\sqlite\src\parse.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.c" type "$(ProjectDir)parse.c" > "$(ProjectDir)..\..\sqlite\src\parse.c"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" type "$(ProjectDir)opcodes.h" > "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" type "$(ProjectDir)opcodes.c" > "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if not exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" type "$(ProjectDir)keywordhash.h" > "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" /> <Tool Name="VCCustomBuildTool" @@ -77,7 +77,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite-source-3_3_6\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> <Configuration @@ -90,7 +90,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="if not exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" type "$(ProjectDir)sqlite3.h" > "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.h" type "$(ProjectDir)parse.h" > "$(ProjectDir)..\..\sqlite\src\parse.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.c" type "$(ProjectDir)parse.c" > "$(ProjectDir)..\..\sqlite\src\parse.c"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" type "$(ProjectDir)opcodes.h" > "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" type "$(ProjectDir)opcodes.c" > "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if not exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" type "$(ProjectDir)keywordhash.h" > "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" /> <Tool Name="VCCustomBuildTool" @@ -140,7 +140,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite-source-3_3_6\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> <Configuration @@ -153,7 +153,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="if not exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" type "$(ProjectDir)sqlite3.h" > "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.h" type "$(ProjectDir)parse.h" > "$(ProjectDir)..\..\sqlite\src\parse.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.c" type "$(ProjectDir)parse.c" > "$(ProjectDir)..\..\sqlite\src\parse.c"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" type "$(ProjectDir)opcodes.h" > "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" type "$(ProjectDir)opcodes.c" > "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if not exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" type "$(ProjectDir)keywordhash.h" > "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" /> <Tool Name="VCCustomBuildTool" @@ -191,7 +191,7 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" - ModuleDefinitionFile="../../sqlite-source-3_3_6/sqlite3.def" + ModuleDefinitionFile="sqlite3.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" SubSystem="2" @@ -221,7 +221,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite-source-3_3_6\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> <Configuration @@ -234,7 +234,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="if not exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" type "$(ProjectDir)sqlite3.h" > "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.h" type "$(ProjectDir)parse.h" > "$(ProjectDir)..\..\sqlite\src\parse.h"
if not exist "$(ProjectDir)..\..\sqlite\src\parse.c" type "$(ProjectDir)parse.c" > "$(ProjectDir)..\..\sqlite\src\parse.c"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" type "$(ProjectDir)opcodes.h" > "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if not exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" type "$(ProjectDir)opcodes.c" > "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if not exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" type "$(ProjectDir)keywordhash.h" > "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" /> <Tool Name="VCCustomBuildTool" @@ -269,7 +269,7 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" - ModuleDefinitionFile="../../sqlite-source-3_3_6/sqlite3.def" + ModuleDefinitionFile="sqlite3.def" ImportLibrary="$(IntDir)/$(TargetName).lib" /> <Tool @@ -295,7 +295,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite-source-3_3_6\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> </Configurations> @@ -308,169 +308,177 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\sqlite-source-3_3_6\alter.c" + RelativePath="..\..\sqlite\src\alter.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\analyze.c" + RelativePath="..\..\sqlite\src\analyze.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\attach.c" + RelativePath="..\..\sqlite\src\attach.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\auth.c" + RelativePath="..\..\sqlite\src\auth.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\btree.c" + RelativePath="..\..\sqlite\src\btree.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\build.c" + RelativePath="..\..\sqlite\src\build.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\callback.c" + RelativePath="..\..\sqlite\src\callback.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\complete.c" + RelativePath="..\..\sqlite\src\complete.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\date.c" + RelativePath="..\..\sqlite\src\date.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\delete.c" + RelativePath="..\..\sqlite\src\delete.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\expr.c" + RelativePath="..\..\sqlite\src\expr.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\func.c" + RelativePath="..\..\sqlite\src\func.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\hash.c" + RelativePath="..\..\sqlite\src\hash.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\insert.c" + RelativePath="..\..\sqlite\src\insert.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\legacy.c" + RelativePath="..\..\sqlite\src\legacy.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\main.c" + RelativePath="..\..\sqlite\src\loadext.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\opcodes.c" + RelativePath="..\..\sqlite\src\main.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\os.c" + RelativePath="..\..\sqlite\src\opcodes.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\os_unix.c" + RelativePath="..\..\sqlite\src\os.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\os_win.c" + RelativePath="..\..\sqlite\src\os_unix.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\pager.c" + RelativePath="..\..\sqlite\src\os_win.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\parse.c" + RelativePath="..\..\sqlite\src\pager.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\pragma.c" + RelativePath="..\..\sqlite\src\parse.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\prepare.c" + RelativePath="..\..\sqlite\src\pragma.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\printf.c" + RelativePath="..\..\sqlite\src\prepare.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\random.c" + RelativePath="..\..\sqlite\src\printf.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\select.c" + RelativePath="..\..\sqlite\src\random.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\shell.c" + RelativePath="..\..\sqlite\src\select.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\table.c" + RelativePath="..\..\sqlite\src\shell.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\tokenize.c" + RelativePath="..\..\sqlite\src\table.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\trigger.c" + RelativePath="..\..\sqlite\src\tokenize.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\update.c" + RelativePath="..\..\sqlite\src\trigger.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\utf.c" + RelativePath="..\..\sqlite\src\update.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\util.c" + RelativePath="..\..\sqlite\src\utf.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vacuum.c" + RelativePath="..\..\sqlite\src\util.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbe.c" + RelativePath="..\..\sqlite\src\vacuum.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbeapi.c" + RelativePath="..\..\sqlite\src\vdbe.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbeaux.c" + RelativePath="..\..\sqlite\src\vdbeapi.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbefifo.c" + RelativePath="..\..\sqlite\src\vdbeaux.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbemem.c" + RelativePath="..\..\sqlite\src\vdbefifo.c" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\where.c" + RelativePath="..\..\sqlite\src\vdbemem.c" > </File> + <File + RelativePath="..\..\sqlite\src\vtab.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\where.c" + > + </File> </Filter> <Filter Name="Header Files" @@ -478,51 +486,51 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath="..\..\sqlite-source-3_3_6\btree.h" + RelativePath="..\..\sqlite\src\btree.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\hash.h" + RelativePath="..\..\sqlite\src\hash.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\keywordhash.h" + RelativePath="..\..\sqlite\src\keywordhash.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\opcodes.h" + RelativePath="..\..\sqlite\src\opcodes.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\os.h" + RelativePath="..\..\sqlite\src\os.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\os_common.h" + RelativePath="..\..\sqlite\src\os_common.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\pager.h" + RelativePath="..\..\sqlite\src\pager.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\parse.h" + RelativePath="..\..\sqlite\src\parse.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\sqlite3.h" + RelativePath="..\..\sqlite\src\sqlite3.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\sqliteInt.h" + RelativePath="..\..\sqlite\src\sqliteInt.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbe.h" + RelativePath="..\..\sqlite\src\vdbe.h" > </File> <File - RelativePath="..\..\sqlite-source-3_3_6\vdbeInt.h" + RelativePath="..\..\sqlite\src\vdbeInt.h" > </File> </Filter> Modified: freeswitch/branches/knhor/trunk/src/include/switch.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch.h Tue Dec 19 22:00:59 2006 @@ -43,14 +43,11 @@ #define SWITCH_END_EXTERN_C #endif - -//Need to include this before any other includes (MSVC Bug) -#include <switch_platform.h> - #ifndef WIN32 #include <switch_am_config.h> #endif +#include <switch_platform.h> #include <assert.h> #include <setjmp.h> #include <switch_apr.h> Modified: freeswitch/branches/knhor/trunk/src/include/switch_am_config.h.in ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_am_config.h.in (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_am_config.h.in Tue Dec 19 22:00:59 2006 @@ -1,5 +1,8 @@ /* src/include/switch_am_config.h.in. Generated from configure.in by autoheader. */ +/* Enable extra debugging. */ +#undef DEBUG + /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -70,6 +73,9 @@ /* Define to 1 if you have the `vasprintf' function. */ #undef HAVE_VASPRINTF +/* Enable Optimization. */ +#undef OPTIMZER + /* Name of package */ #undef PACKAGE @@ -94,6 +100,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Little Endian */ +#undef SWITCH_BYTE_ORDER + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME @@ -103,14 +112,8 @@ /* Version number of package */ #undef VERSION -/* for the places where it is not defined */ -#undef __BIG_ENDIAN - -/* Little Endian */ -#undef __BYTE_ORDER - -/* for the places where it is not defined */ -#undef __LITTLE_ENDIAN +/* sunpro is bad at inline */ +#undef __inline__ /* Define to empty if `const' does not conform to ANSI C. */ #undef const Modified: freeswitch/branches/knhor/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_channel.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_channel.h Tue Dec 19 22:00:59 2006 @@ -76,10 +76,10 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, - const char *file, - const char *func, - int line, - switch_channel_state_t state); + const char *file, + const char *func, + int line, + switch_channel_state_t state); /*! \brief Set the current state of a channel @@ -87,7 +87,7 @@ \param state new state \return current state of channel after application of new state */ -#define switch_channel_set_state(channel, state) switch_channel_perform_set_state(channel, __FILE__, __FUNCTION__, __LINE__, state) +#define switch_channel_set_state(channel, state) switch_channel_perform_set_state(channel, __FILE__, __SWITCH_FUNC__, __LINE__, state) /*! \brief return a cause code for a given string @@ -271,28 +271,28 @@ SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch_channel_flag_t flags); SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, - const char *file, - const char *func, - int line); + const char *file, + const char *func, + int line); SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_channel_t *channel, - const char *file, - const char *func, - int line); + const char *file, + const char *func, + int line); /*! \brief Answer a channel (initiate/acknowledge a successful connection) \param channel channel to answer \return SWITCH_STATUS_SUCCESS if channel was answered successfully */ -#define switch_channel_answer(channel) switch_channel_perform_answer(channel, __FILE__, __FUNCTION__, __LINE__) +#define switch_channel_answer(channel) switch_channel_perform_answer(channel, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief Mark a channel answered with no indication (for outbound calls) \param channel channel to mark answered \return SWITCH_STATUS_SUCCESS if channel was answered successfully */ -#define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, __FUNCTION__, __LINE__) +#define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, __SWITCH_FUNC__, __LINE__) SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t *channel, const char *file, @@ -303,19 +303,19 @@ \param channel channel to ring \return SWITCH_STATUS_SUCCESS if successful */ -#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, __FUNCTION__, __LINE__) +#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, __SWITCH_FUNC__, __LINE__) SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, - const char *file, - const char *func, - int line); + const char *file, + const char *func, + int line); /*! \brief Indicate progress on a channel to attempt early media \param channel channel to pre-answer \return SWITCH_STATUS_SUCCESS */ -#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, __FUNCTION__, __LINE__) +#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief add a state handler table to a given channel @@ -374,10 +374,10 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel, - const char *file, - const char *func, - int line, - switch_call_cause_t hangup_cause); + const char *file, + const char *func, + int line, + switch_call_cause_t hangup_cause); /*! \brief Hangup a channel flagging it's state machine to end @@ -385,7 +385,7 @@ \param hangup_cause the appropriate hangup cause \return the resulting channel state. */ -#define switch_channel_hangup(channel, hangup_cause) switch_channel_perform_hangup(channel, __FILE__, __FUNCTION__, __LINE__, hangup_cause) +#define switch_channel_hangup(channel, hangup_cause) switch_channel_perform_hangup(channel, __FILE__, __SWITCH_FUNC__, __LINE__, hangup_cause) /*! \brief Test for presence of DTMF on a given channel Modified: freeswitch/branches/knhor/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_core.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_core.h Tue Dec 19 22:00:59 2006 @@ -96,6 +96,7 @@ /*! array of void pointers to pass mutiple data objects */ void *objs[SWITCH_MAX_CORE_THREAD_SESSION_OBJS]; /*! a pointer to a memory pool if the thread has it's own pool */ + switch_input_callback_function_t input_callback; switch_memory_pool_t *pool; }; @@ -637,17 +638,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_core_session_t *session, - const char *file, - const char *func, - int line, - switch_signal_t sig); + const char *file, + const char *func, + int line, + switch_signal_t sig); /*! \brief Send a signal to a channel \param session session to send signal to \param sig signal to send \return status returned by the session's signal handler */ -#define switch_core_session_kill_channel(session, sig) switch_core_session_perform_kill_channel(session, __FILE__, __FUNCTION__, __LINE__, sig) +#define switch_core_session_kill_channel(session, sig) switch_core_session_perform_kill_channel(session, __FILE__, __SWITCH_FUNC__, __LINE__, sig) /*! \brief Wait for a session to be ready for input Modified: freeswitch/branches/knhor/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_event.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_event.h Tue Dec 19 22:00:59 2006 @@ -298,7 +298,7 @@ \return SWITCH_STATUS_SUCCESS if the operation was successful \note the body supplied by this function will supersede an existing body the event may have */ -#define switch_event_fire(event) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, NULL) +#define switch_event_fire(event) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, NULL) /*! \brief Fire an event filling in most of the arguements with obvious values and allowing user_data to be sent @@ -307,7 +307,7 @@ \return SWITCH_STATUS_SUCCESS if the operation was successful \note the body supplied by this function will supersede an existing body the event may have */ -#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, data) +#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, data) ///\} SWITCH_END_EXTERN_C Modified: freeswitch/branches/knhor/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_ivr.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_ivr.h Tue Dec 19 22:00:59 2006 @@ -43,7 +43,7 @@ SWITCH_BEGIN_EXTERN_C -static const switch_state_handler_table_t noop_state_handler = {0}; + /** * @defgroup switch_ivr IVR Library Modified: freeswitch/branches/knhor/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_log.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_log.h Tue Dec 19 22:00:59 2006 @@ -94,7 +94,7 @@ \param ... variable args \note there are channel macros to supply the first 4 parameters */ -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...); +SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...); /*! \brief Shut down the logging engine Modified: freeswitch/branches/knhor/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_platform.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_platform.h Tue Dec 19 22:00:59 2006 @@ -43,8 +43,14 @@ #include <stdio.h> #ifdef _MSC_VER +#define __SWITCH_FUNC__ __FUNCTION__ +#else +#define __SWITCH_FUNC__ (const char *)__func__ +#endif +#ifdef _MSC_VER + /* disable the following warnings * C4152: non standard extension, function/data ptr conversion in expression * C4054: A function pointer is cast (possibly incorrectly) to a data pointer. @@ -60,16 +66,6 @@ */ #pragma warning(disable:4152 4054 4100 4142 4200 4204 4706 4055 4214 4819 4132 4510 4512 4610) -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN 1234 -#endif -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN 4321 -#endif -#ifndef __BYTE_ORDER -#define __BYTE_ORDER __LITTLE_ENDIAN -#endif - #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE @@ -115,6 +111,19 @@ #include <time.h> #endif // _MSC_VER +#ifndef __LITTLE_ENDIAN +#define __LITTLE_ENDIAN 1234 +#endif +#ifndef __BIG_ENDIAN +#define __BIG_ENDIAN 4321 +#endif +#ifndef __BYTE_ORDER +#ifdef SWITCH_BYTE_ORDER +#define __BYTE_ORDER SWITCH_BYTE_ORDER +#else +#define __BYTE_ORDER __LITTLE_ENDIAN +#endif +#endif #ifdef WIN32 #if defined(SWITCH_CORE_DECLARE_STATIC) Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_types.h Tue Dec 19 22:00:59 2006 @@ -393,9 +393,9 @@ } switch_core_session_message_flag_t; #define SWITCH_UUID_FORMATTED_LENGTH APR_UUID_FORMATTED_LENGTH -#define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __FILE__, __FUNCTION__, __LINE__ -#define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __FUNCTION__, __LINE__ -#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __FUNCTION__, __LINE__ +#define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__ +#define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __SWITCH_FUNC__, __LINE__ +#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __SWITCH_FUNC__, __LINE__ /*! \enum switch_channel_state_t @@ -500,7 +500,8 @@ typedef enum { SWITCH_SIG_NONE, SWITCH_SIG_KILL, - SWITCH_SIG_XFER + SWITCH_SIG_XFER, + SWITCH_SIG_BREAK } switch_signal_t; /*! Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Dec 19 22:00:59 2006 @@ -35,6 +35,7 @@ #include <switch.h> #include <switch_version.h> +static const switch_state_handler_table_t noop_state_handler = {0}; static const char modname[] = "mod_commands"; static switch_api_interface_t ctl_api_interface; static switch_api_interface_t uuid_bridge_api_interface; Modified: freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g711/Makefile Tue Dec 19 22:00:59 2006 @@ -2,7 +2,7 @@ all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) Modified: freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/codecs/mod_g729/mod_g729.c Tue Dec 19 22:00:59 2006 @@ -262,13 +262,14 @@ &g729_10ms_8k_implementation }; -static const switch_codec_interface_t g729_codec_interface = { - /*.interface_name */ "g729", - /*.implementations */ &g729_8k_implementation, +static const switch_codec_interface_t g729_codec_interface = { + /*.interface_name */ "g729", + /*.implementations */ &g729_8k_implementation, + /*.next */ NULL }; static switch_loadable_module_interface_t g729_module_interface = { - /*.module_name */ modname, + /*.module_name */ "g729", /*.endpoint_interface */ NULL, /*.timer_interface */ NULL, /*.dialplan_interface */ NULL, Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Dec 19 22:00:59 2006 @@ -187,9 +187,10 @@ switch_io_flag_t flags, int stream_id); static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig); -static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t signal, char *to, char *from, char *subject, char *msg); +static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t dl_signal, char *to, char *from, char *subject, char *msg); static ldl_status handle_response(ldl_handle_t *handle, char *id); static switch_status_t load_config(void); +static int sin_callback(void *pArg, int argc, char **argv, char **columnNames); #define is_special(s) (s && (strstr(s, "ext+") || strstr(s, "user+"))) @@ -305,6 +306,34 @@ } switch(event->event_id) { + case SWITCH_EVENT_PRESENCE_PROBE: + if (proto) { + char *sql; + switch_core_db_t *db; + char *errmsg; + char *to = switch_event_get_header(event, "to"); + char *f_host = NULL; + if (to) { + if ((f_host = strchr(to, '@'))) { + f_host++; + } + } + + if (f_host && (profile = switch_core_hash_find(globals.profile_hash, f_host))) { + if (to && (sql = switch_mprintf("select * from subscriptions where sub_to='%q'", to))) { + if (!(db = switch_core_db_open_file(profile->dbname))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); + return; + } + switch_mutex_lock(profile->mutex); + switch_core_db_exec(db, sql, sin_callback, profile, &errmsg); + switch_mutex_unlock(profile->mutex); + switch_core_db_close(db); + switch_safe_free(sql); + } + } + } + return; case SWITCH_EVENT_PRESENCE_IN: if (!status) { status = "Available"; @@ -669,6 +698,10 @@ return 1; } + if (!(tech_pvt->remote_ip && tech_pvt->remote_port)) { + return 0; + } + if (switch_core_codec_init(&tech_pvt->read_codec, tech_pvt->codec_name, NULL, @@ -1618,6 +1651,11 @@ return SWITCH_STATUS_GENERR; } + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + return SWITCH_STATUS_GENERR; + } + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; @@ -2065,7 +2103,7 @@ switch_safe_free(xmlstr); } -static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t signal, char *to, char *from, char *subject, char *msg) +static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t dl_signal, char *to, char *from, char *subject, char *msg) { struct mdl_profile *profile = NULL; switch_core_session_t *session = NULL; @@ -2085,7 +2123,7 @@ if (!dlsession) { if (profile->user_flags & LDL_FLAG_COMPONENT) { - switch(signal) { + switch(dl_signal) { case LDL_SIGNAL_VCARD: do_vcard(handle, to, from, subject); break; @@ -2174,8 +2212,8 @@ switch_event_fire(&event); } } - break; #endif + break; case LDL_SIGNAL_PRESENCE_OUT: @@ -2183,7 +2221,6 @@ execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); @@ -2196,7 +2233,7 @@ } } - switch(signal) { + switch(dl_signal) { case LDL_SIGNAL_MSG: { switch_chat_interface_t *ci; char *proto = MDL_CHAT_PROTO; @@ -2284,7 +2321,7 @@ } } else { - if (signal != LDL_SIGNAL_INITIATE) { + if (dl_signal != LDL_SIGNAL_INITIATE) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session is already dead\n"); status = LDL_STATUS_FALSE; goto done; @@ -2325,7 +2362,7 @@ } - switch(signal) { + switch(dl_signal) { case LDL_SIGNAL_MSG: if (msg) { if (*msg == '+') { @@ -2370,7 +2407,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); break; case LDL_SIGNAL_INITIATE: - if (signal) { + if (dl_signal) { ldl_payload_t *payloads; unsigned int len = 0; int match = 0; @@ -2448,7 +2485,7 @@ break; case LDL_SIGNAL_CANDIDATES: - if (signal) { + if (dl_signal) { ldl_candidate_t *candidates; unsigned int len = 0; unsigned int x; Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Dec 19 22:00:59 2006 @@ -40,7 +40,7 @@ /*************************************************************************************************************************************************************/ #define HAVE_APR #include <switch.h> - +static const switch_state_handler_table_t noop_state_handler = {0}; struct outbound_reg; typedef struct outbound_reg outbound_reg_t; @@ -267,10 +267,10 @@ uint32_t codec_ms; switch_caller_profile_t *caller_profile; int32_t timestamp_send; - int32_t timestamp_recv; + //int32_t timestamp_recv; switch_rtp_t *rtp_session; int ssrc; - switch_time_t last_read; + //switch_time_t last_read; sofia_profile_t *profile; char *local_sdp_audio_ip; switch_port_t local_sdp_audio_port; @@ -1531,7 +1531,6 @@ switch_io_flag_t flags, int stream_id) { private_object_t *tech_pvt = NULL; - size_t bytes = 0, samples = 0, frames = 0, ms = 0; switch_channel_t *channel = NULL; int payload = 0; @@ -1557,20 +1556,16 @@ tech_pvt->read_frame.datalen = 0; switch_set_flag_locked(tech_pvt, TFLAG_READING); - - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - samples = tech_pvt->read_codec.implementation->samples_per_frame; - ms = tech_pvt->read_codec.implementation->microseconds_per_frame; - +#if 0 if (tech_pvt->last_read) { -#if 0 elapsed = (unsigned int)((switch_time_now() - tech_pvt->last_read) / 1000); if (elapsed > 60000) { return SWITCH_STATUS_TIMEOUT; } -#endif } +#endif + if (switch_test_flag(tech_pvt, TFLAG_IO)) { switch_status_t status; @@ -1616,23 +1611,16 @@ if (tech_pvt->read_frame.datalen > 0) { - tech_pvt->last_read = switch_time_now(); - - if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); - } else - frames = 1; - - samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; - ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; - tech_pvt->timestamp_recv += (int32_t) samples; - tech_pvt->read_frame.samples = (int) samples; + size_t bytes = 0; + int frames = 0; + //tech_pvt->last_read = switch_time_now(); + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = (tech_pvt->read_frame.datalen / bytes); + tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame); break; } } - - } + } switch_clear_flag_locked(tech_pvt, TFLAG_READING); @@ -1724,13 +1712,22 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag_locked(tech_pvt, TFLAG_IO); - switch_set_flag_locked(tech_pvt, TFLAG_HUP); - if (switch_rtp_ready(tech_pvt->rtp_session)) { - switch_rtp_kill_socket(tech_pvt->rtp_session); - } + switch(sig) { + case SWITCH_SIG_BREAK: + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); + break; + case SWITCH_SIG_KILL: + default: + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_HUP); + if (switch_rtp_ready(tech_pvt->rtp_session)) { + switch_rtp_kill_socket(tech_pvt->rtp_session); + } + break; + } + return SWITCH_STATUS_SUCCESS; } @@ -3237,7 +3234,10 @@ open = "closed"; } - if (strcasecmp(proto, SOFIA_CHAT_PROTO)) { + if (!strcasecmp(sub_to_host, host)) { + /* same host */ + id = switch_mprintf("sip:%s+%s@%s", proto, sub_to_user, sub_to_host); + } else if (strcasecmp(proto, SOFIA_CHAT_PROTO)) { /*encapsulate*/ id = switch_mprintf("sip:%s+%s+%s@%s", proto, sub_to_user, sub_to_host, host); } else { @@ -3271,7 +3271,7 @@ nua_notify(nh, NUTAG_URL(contact), SIPTAG_TO_STR(full_from), - SIPTAG_FROM_STR(to), + SIPTAG_FROM_STR(id), SIPTAG_CONTACT_STR(profile->url), SIPTAG_CALL_ID_STR(callid), SIPTAG_VIA_STR(full_via), @@ -3409,6 +3409,13 @@ exp_raw = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600); exp = (long) time(NULL) + exp_raw; + if (sip && sip->sip_from) { + from_user = (char *) sip->sip_from->a_url->url_user; + from_host = (char *) sip->sip_from->a_url->url_host; + } else { + from_user = "n/a"; + from_host = "n/a"; + } if ((sql = switch_mprintf("delete from sip_subscriptions where " "proto='%q' and user='%q' and host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q';\n" @@ -5319,6 +5326,43 @@ switch(event->event_id) { + case SWITCH_EVENT_PRESENCE_PROBE: + if (proto) { + switch_core_db_t *db = NULL; + char *to = switch_event_get_header(event, "to"); + char *user, *euser, *host, *p; + + if (!to || !(user = strdup(to))) { + return; + } + + if ((host = strchr(user, '@'))) { + *host++ = '\0'; + } + euser = user; + if ((p = strchr(euser, '+'))) { + euser = (p+1); + } + + if (euser && host && + (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", euser, host)) && + (profile = (sofia_profile_t *) switch_core_hash_find(globals.profile_hash, host))) { + if (!(db = switch_core_db_open_file(profile->dbname))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); + switch_safe_free(user); + switch_safe_free(sql); + return; + } + + switch_mutex_lock(profile->ireg_mutex); + switch_core_db_exec(db, sql, resub_callback, profile, &errmsg); + switch_mutex_unlock(profile->ireg_mutex); + switch_safe_free(sql); + } + switch_safe_free(user); + switch_core_db_close(db); + } + return; case SWITCH_EVENT_PRESENCE_IN: sql = switch_mprintf("select 1,'%q','%q',* from sip_subscriptions where proto='%q' and event='%q' and sub_to_user='%q' and sub_to_host='%q'", status , rpid, proto, event_type, euser, host); @@ -5395,6 +5439,11 @@ } if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + return SWITCH_STATUS_GENERR; + } + + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/Makefile Tue Dec 19 22:00:59 2006 @@ -1,17 +1,15 @@ include sm.mak -OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl -LINKER=$(CC) - all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - BUILD_OPT=$(BO) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js/nsprpub --prefix=$(PREFIX) --with-pic + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js --prefix=$(PREFIX) --with-pic --with-nspr=yes MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) --without-libidn $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Dec 19 22:00:59 2006 @@ -2248,35 +2248,6 @@ }; -SWITCH_SM_DECLARE(int) eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval) -{ - JSScript *script = NULL; - char *cptr; - char *path = NULL; - int res = 0; - - JS_ClearPendingException(cx); - - if (code[0] == '~') { - cptr = code + 1; - script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1); - } else { - if (*code == '/') { - script = JS_CompileFile(cx, obj, code); - } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) { - script = JS_CompileFile(cx, obj, path); - switch_safe_free(path); - } - } - - if (script) { - res = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0; - JS_DestroyScript(cx, script); - } - - return res; -} - static int env_init(JSContext *cx, JSObject *javascript_object) { Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Tue Dec 19 22:00:59 2006 @@ -76,7 +76,35 @@ #define SWITCH_SM_DECLARE(type) type #endif -SWITCH_SM_DECLARE(int) eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval); +int eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval) +{ + JSScript *script = NULL; + char *cptr; + char *path = NULL; + int res = 0; + + JS_ClearPendingException(cx); + + if (code[0] == '~') { + cptr = code + 1; + script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1); + } else { + if (*code == '/') { + script = JS_CompileFile(cx, obj, code); + } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) { + script = JS_CompileFile(cx, obj, path); + switch_safe_free(path); + } + } + + if (script) { + res = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0; + JS_DestroyScript(cx, script); + } + + return res; +} + typedef switch_status_t(*spidermonkey_load_t)(JSContext *cx, JSObject *obj); Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/sm.mak Tue Dec 19 22:00:59 2006 @@ -1,67 +1,2 @@ -# This is all used to make sure we use the right options during build and link. - -OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) -#VER=DBG -#BO=0 -VER=OPT -BO=1 - -# Attempt to differentiate between SunOS 5.4 and x86 5.4 -OS_CPUARCH := $(shell uname -m) -ifeq ($(OS_CPUARCH),i86pc) -OS_RELEASE := $(shell uname -r)_$(OS_CPUARCH) -else -ifeq ($(OS_ARCH),AIX) -OS_RELEASE := $(shell uname -v).$(shell uname -r) -else -OS_RELEASE := $(shell uname -r) -endif -endif -ifeq ($(OS_ARCH),IRIX64) -OS_ARCH := IRIX -endif - -# Handle output from win32 unames other than Netscape's version -ifeq (,$(filter-out Windows_95 Windows_98 CYGWIN_95-4.0 CYGWIN_98-4.10, $(OS_ARCH))) - OS_ARCH := WIN95 -endif -ifeq ($(OS_ARCH),WIN95) - OS_ARCH := WINNT - OS_RELEASE := 4.0 -endif -ifeq ($(OS_ARCH), Windows_NT) - OS_ARCH := WINNT - OS_MINOR_RELEASE := $(shell uname -v) - ifeq ($(OS_MINOR_RELEASE),00) - OS_MINOR_RELEASE = 0 - endif - OS_RELEASE := $(OS_RELEASE).$(OS_MINOR_RELEASE) -endif -ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) - OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH)) - OS_ARCH := WINNT -endif -ifeq ($(OS_ARCH), CYGWIN32_NT) - OS_ARCH := WINNT -endif -ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) - OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) - OS_ARCH := WINNT -endif - -ifeq ($(OS_ARCH),Linux) -OS_CONFIG := Linux_All -else -ifeq ($(OS_ARCH),dgux) -OS_CONFIG := dgux -else -ifeq ($(OS_ARCH),Darwin) -OS_CONFIG := Darwin -else -OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE) -endif -endif -endif - -CFLAGS += -I../mod_spidermonkey -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_$(VER).OBJ -LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -lteletone +CFLAGS += -I$(PREFIX)/include/js -I$(PREFIX)/include/nspr -DXP_UNIX -I../mod_spidermonkey +LDFLAGS += -lnspr4 -ljs -lcurl Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile Tue Dec 19 22:00:59 2006 @@ -1,16 +1,12 @@ include ../mod_spidermonkey/sm.mak -OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -LINKER=$(CC) - - all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Tue Dec 19 22:00:59 2006 @@ -1,7 +1,4 @@ include ../mod_spidermonkey/sm.mak - -OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -LINKER=$(CC) LDFLAGS+=-lodbc all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) @@ -11,7 +8,7 @@ $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Tue Dec 19 22:00:59 2006 @@ -1,16 +1,13 @@ include ../mod_spidermonkey/sm.mak +LDFLAGS+=-lteletone -OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -LINKER=$(CC) - - all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ Modified: freeswitch/branches/knhor/trunk/src/switch_channel.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_channel.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_channel.c Tue Dec 19 22:00:59 2006 @@ -451,10 +451,10 @@ } SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, - const char *file, - const char *func, - int line, - switch_channel_state_t state) + const char *file, + const char *func, + int line, + switch_channel_state_t state) { switch_channel_state_t last_state; int ok = 0; @@ -935,10 +935,10 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel, - const char *file, - const char *func, - int line, - switch_call_cause_t hangup_cause) + const char *file, + const char *func, + int line, + switch_call_cause_t hangup_cause) { assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); @@ -975,9 +975,9 @@ } SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, - const char *file, - const char *func, - int line) + const char *file, + const char *func, + int line) { switch_core_session_message_t msg; char *uuid = switch_core_session_get_uuid(channel->session); @@ -1050,9 +1050,9 @@ } SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_channel_t *channel, - const char *file, - const char *func, - int line) + const char *file, + const char *func, + int line) { switch_event_t *event; @@ -1085,9 +1085,9 @@ } SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, - const char *file, - const char *func, - int line) + const char *file, + const char *func, + int line) { assert(channel != NULL); Modified: freeswitch/branches/knhor/trunk/src/switch_console.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_console.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_console.c Tue Dec 19 22:00:59 2006 @@ -224,11 +224,14 @@ FD_ZERO(&efds); FD_SET(fileno(stdin), &rfds); FD_SET(fileno(stdin), &efds); - activity = select(fileno(stdin)+1, &rfds, NULL, &efds, &tv); + if ((activity = select(fileno(stdin)+1, &rfds, NULL, &efds, &tv)) < 0) { + break; + } #ifdef _MSC_VER #pragma warning(pop) #endif + if (activity == 0) { fflush(stdout); continue; @@ -236,7 +239,15 @@ memset(&cmd, 0, sizeof(cmd)); for (x = 0; x < (sizeof(cmd)-1); x++) { - cmd[x] = (char) getchar(); + int c = getchar(); + if (c < 0) { + int y = read(fileno(stdin), cmd, sizeof(cmd)); + cmd[y-1] = '\0'; + break; + } + + cmd[x] = (char) c; + if (cmd[x] == '\n') { cmd[x] = '\0'; break; Modified: freeswitch/branches/knhor/trunk/src/switch_core.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_core.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_core.c Tue Dec 19 22:00:59 2006 @@ -2307,10 +2307,10 @@ } SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_core_session_t *session, - const char *file, - const char *func, - int line, - switch_signal_t sig) + const char *file, + const char *func, + int line, + switch_signal_t sig) { switch_io_event_hook_kill_channel_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Tue Dec 19 22:00:59 2006 @@ -35,6 +35,8 @@ #include <switch_ivr.h> #include <libteletone.h> +static const switch_state_handler_table_t noop_state_handler = {0}; + static const switch_state_handler_table_t audio_bridge_peer_state_handlers; typedef enum { @@ -1801,7 +1803,7 @@ session_b = data->objs[1]; stream_id_p = data->objs[2]; - input_callback = (switch_input_callback_function_t) data->objs[3]; + input_callback = data->input_callback; user_data = data->objs[4]; his_thread = data->objs[5]; @@ -3221,7 +3223,7 @@ other_audio_thread->objs[0] = session; other_audio_thread->objs[1] = peer_session; other_audio_thread->objs[2] = &stream_id; - other_audio_thread->objs[3] = (void *) input_callback; + other_audio_thread->input_callback = input_callback; other_audio_thread->objs[4] = session_data; other_audio_thread->objs[5] = this_audio_thread; other_audio_thread->running = 5; @@ -3230,7 +3232,7 @@ this_audio_thread->objs[0] = peer_session; this_audio_thread->objs[1] = session; this_audio_thread->objs[2] = &stream_id; - this_audio_thread->objs[3] = (void *) input_callback; + this_audio_thread->input_callback = input_callback; this_audio_thread->objs[4] = peer_session_data; this_audio_thread->objs[5] = other_audio_thread; this_audio_thread->running = 2; @@ -3303,7 +3305,7 @@ this_audio_thread->objs[0] = NULL; this_audio_thread->objs[1] = NULL; this_audio_thread->objs[2] = NULL; - this_audio_thread->objs[3] = NULL; + this_audio_thread->input_callback = NULL; this_audio_thread->objs[4] = NULL; this_audio_thread->objs[5] = NULL; switch_mutex_lock(this_audio_thread->mutex); Modified: freeswitch/branches/knhor/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_loadable_module.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_loadable_module.c Tue Dec 19 22:00:59 2006 @@ -271,7 +271,6 @@ switch_loadable_module_t *module = NULL; apr_dso_handle_t *dso = NULL; apr_status_t status = SWITCH_STATUS_SUCCESS; - apr_dso_handle_sym_t function_handle = NULL; switch_module_load_t load_func_ptr = NULL; int loading = 1; const char *err = NULL; @@ -290,11 +289,10 @@ break; } - status = apr_dso_sym(&function_handle, dso, "switch_module_load"); - load_func_ptr = (switch_module_load_t) function_handle; + status = apr_dso_sym((apr_dso_handle_sym_t *)&load_func_ptr, dso, "switch_module_load"); if (load_func_ptr == NULL) { - err = "Cannot Load"; + err = "Cannot locate symbol 'switch_module_load' please make sure this is a vaild module."; break; } @@ -321,13 +319,8 @@ module->module_interface = module_interface; module->switch_module_load = load_func_ptr; - if ((status = apr_dso_sym(&function_handle, dso, "switch_module_shutdown")) == APR_SUCCESS) { - module->switch_module_shutdown = (switch_module_shutdown_t) function_handle; - } - - if ((status = apr_dso_sym(&function_handle, dso, "switch_module_runtime")) == APR_SUCCESS) { - module->switch_module_runtime = (switch_module_runtime_t) function_handle; - } + apr_dso_sym((apr_dso_handle_sym_t *)&module->switch_module_shutdown, dso, "switch_module_shutdown"); + apr_dso_sym((apr_dso_handle_sym_t *)&module->switch_module_runtime, dso, "switch_module_runtime"); module->lib = dso; Modified: freeswitch/branches/knhor/trunk/src/switch_log.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_log.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_log.c Tue Dec 19 22:00:59 2006 @@ -162,14 +162,14 @@ return NULL; } -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...) +SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...) { char *data = NULL; char *new_fmt = NULL; int ret = 0; va_list ap; FILE *handle; - char *filep = (file ? switch_cut_path(file): ""); + const char *filep = (file ? (const char *)switch_cut_path((char *)file): ""); const char *funcp = (func ? func : ""); char *content = NULL; switch_time_t now = switch_time_now(); Modified: freeswitch/branches/knhor/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_rtp.c Tue Dec 19 22:00:59 2006 @@ -220,7 +220,7 @@ elapsed = (unsigned int)((switch_time_now() - rtp_session->last_stun) / 1000); if (elapsed > 30000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s", "No stun for a long time (PUNT!)\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); return SWITCH_STATUS_FALSE; } } @@ -776,7 +776,13 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); - return 0; + + memset(&rtp_session->recv_msg, 0, SWITCH_RTP_CNG_PAYLOAD); + rtp_session->recv_msg.header.pt = SWITCH_RTP_CNG_PAYLOAD; + *flags |= SFF_CNG; + /* Return a CNG frame */ + *payload_type = SWITCH_RTP_CNG_PAYLOAD; + return SWITCH_RTP_CNG_PAYLOAD; } if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { @@ -857,7 +863,7 @@ if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) { - switch_yield(rtp_session->ms_per_packet); + switch_yield(rtp_session->ms_per_packet/2); continue; } return 0; @@ -891,7 +897,7 @@ rtp_session->recv_msg.header.pt = 97; } rtp_session->rseq = ntohs(rtp_session->recv_msg.header.seq); - rtp_session->rpayload = rtp_session->recv_msg.header.pt; + rtp_session->rpayload = (switch_payload_t)rtp_session->recv_msg.header.pt; } else { if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes); @@ -939,7 +945,7 @@ } rtp_session->last_read = switch_time_now(); - *payload_type = rtp_session->recv_msg.header.pt; + *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; if (*payload_type == SWITCH_RTP_CNG_PAYLOAD) { @@ -1289,7 +1295,7 @@ if (!rtp_session->mini && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { rtp_session->mini++; - rtp_session->rpayload = send_msg->header.pt; + rtp_session->rpayload = (switch_payload_t)send_msg->header.pt; rtp_session->rseq = ntohs(send_msg->header.seq); }

1 0

[commit] r3716 - freeswitch/branches/lawrence
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: sphere Date: Tue Dec 19 01:39:36 2006 New Revision: 3716 Added: freeswitch/branches/lawrence/ Log: Creating empty folder for lawrence

1 0

Jump to page: