Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

revert fb2ffbafe2

This commit is contained in:
Michael Jerris 2012-09-24 15:38:06 -04:00
parent d565fdece5
commit 4ff9b2f102
7 changed files with 17 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -311,7 +311,7 @@ bin_PROGRAMS = freeswitch fs_cli fs_ivrd tone2wav fs_encode
## ##
fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c \ fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c \
libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c libs/esl/src/esl_json.c libs/esl/src/esl_buffer.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c libs/esl/src/esl_json.c libs/esl/src/esl_buffer.c
fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include -include src/include/switch_private.h fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include
fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) -lm fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) -lm
if HAVE_LIBEDIT if HAVE_LIBEDIT
@ -660,15 +660,13 @@ sofia-reconf:
cd libs/sofia-sip && ./configure --prefix=$(prefix) --with-pic --with-glib=no --disable-shared cd libs/sofia-sip && ./configure --prefix=$(prefix) --with-pic --with-glib=no --disable-shared
cluecon: cluecon:
@if $(ENABLE_CLUECON_NAG); then \ @clear
clear; \ @echo Thank you for updating. This is going to take a while so relax.
echo "Thank you for updating. This is going to take a while so relax."; \ @echo Now would be a good time to register for ClueCon!
echo "Now would be a good time to register for ClueCon!"; \ @cat cluecon2.tmpl
cat cluecon2.tmpl; \ @echo
echo; \ @echo http://www.cluecon.com
echo "http://www.cluecon.com"; \ @sleep 5
sleep 5; \
fi
current: cluecon update-clean is-scm current: cluecon update-clean is-scm
$(MAKE) update $(MAKE) update
$(MAKE) all $(MAKE) all

4
build/Makefile.am
View File

@ -11,7 +11,7 @@ all:
@echo " + http://www.cluecon.com +" @echo " + http://www.cluecon.com +"
@echo " + +" @echo " + +"
@echo " +-----------------------------------------------+" @echo " +-----------------------------------------------+"
@-$(ENABLE_CLUECON_NAG) && cat ../cluecon2.tmpl @cat ../cluecon2.tmpl
install: install:
@echo " +---------- FreeSWITCH install Complete ----------+" @echo " +---------- FreeSWITCH install Complete ----------+"
@ -69,7 +69,7 @@ install:
@echo " + http://www.cluecon.com +" @echo " + http://www.cluecon.com +"
@echo " + +" @echo " + +"
@echo " +-------------------------------------------------+" @echo " +-------------------------------------------------+"
@-$(ENABLE_CLUECON_NAG) && cat ../cluecon2.tmpl @cat ../cluecon2.tmpl
.PHONY: check dvi html info install-data \ .PHONY: check dvi html info install-data \

22
configure.in
View File

@ -335,26 +335,6 @@ AC_ARG_ENABLE(skip-subdirectories,
[AC_HELP_STRING([--enable-skip-subdirectories],[skip configuration of subdirectories])], [AC_HELP_STRING([--enable-skip-subdirectories],[skip configuration of subdirectories])],
[enable_skip_subdirectories="$enableval"],[enable_skip_subdirectories="no"]) [enable_skip_subdirectories="$enableval"],[enable_skip_subdirectories="no"])
# Enable ClueCon nag banner (default: on)
AC_ARG_ENABLE(huge-cluecon-nag,
[AC_HELP_STRING([--disable-huge-cluecon-nag],[build without huge ClueCon banners])],
[enable_huge_cluecon_nag="$enableval"],[enable_huge_cluecon_nag="yes"])
AC_ARG_ENABLE(modest-cluecon-nag,
[AC_HELP_STRING([--enable-modest-cluecon-nag],[build with modest ClueCon announcements])],
[enable_modest_cluecon_nag="$enableval"],[enable_modest_cluecon_nag="no"])
if test "${enable_modest_cluecon_nag}" = "yes"; then
enable_huge_cluecon_nag="no"
AC_DEFINE([SHOW_MODEST_CLUECON_NAG],[1],[Show modest ClueCon nag messages.])
AC_SUBST([ENABLE_CLUECON_NAG],[false])
elif test "${enable_huge_cluecon_nag}" = "yes"; then
AC_DEFINE([SHOW_HUGE_CLUECON_NAG],[1],[Show huge ClueCon nag messages.])
AC_SUBST([ENABLE_CLUECON_NAG],[true])
else
AC_SUBST([ENABLE_CLUECON_NAG],[false])
fi
# Enable debugging (default: on) # Enable debugging (default: on)
# (rename option if the default is changed) # (rename option if the default is changed)
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
@ -1141,7 +1121,7 @@ AC_OUTPUT
## ##
## Registering for ClueCon ## Registering for ClueCon
## ##
if ! test -f noreg && test "${enable_huge_cluecon_nag}" = "yes" ; then if ! test -f noreg ; then
echo "" echo ""
echo "" echo ""
echo $ECHO_N "Registering you for ClueCon http://www.cluecon.com $ECHO_C" 1>&6 echo $ECHO_N "Registering you for ClueCon http://www.cluecon.com $ECHO_C" 1>&6

10
libs/esl/fs_cli.c
View File

@ -931,17 +931,17 @@ static void print_banner(FILE *stream)
WriteFile(hStdout, banner, (DWORD) strlen(banner), NULL, NULL); WriteFile(hStdout, banner, (DWORD) strlen(banner), NULL, NULL);
WriteFile(hStdout, cc, (DWORD) strlen(cc), NULL, NULL); WriteFile(hStdout, cc, (DWORD) strlen(cc), NULL, NULL);
SetConsoleTextAttribute(hStdout, wOldColorAttrs); SetConsoleTextAttribute(hStdout, wOldColorAttrs);
/* Print the rest info in default colors */ /* Print the rest info in default colors */
fprintf(stream, "\n%s\n", inf); fprintf(stream, "\n%s\n", inf);
#elif SHOW_HUGE_CLUECON_NAG #else
fprintf(stream, "%s%s%s%s%s%s\n%s\n", fprintf(stream,
"%s%s%s%s%s%s\n%s\n",
ESL_SEQ_DEFAULT_COLOR, ESL_SEQ_DEFAULT_COLOR,
ESL_SEQ_FYELLOW, ESL_SEQ_BBLUE, ESL_SEQ_FYELLOW, ESL_SEQ_BBLUE,
banner, banner,
cc, ESL_SEQ_DEFAULT_COLOR, inf); cc, ESL_SEQ_DEFAULT_COLOR, inf);
fprintf(stream, "%s", output_text_color);
#else
fprintf(stream, "%s%s%s\n%s\n", ESL_SEQ_DEFAULT_COLOR, banner, cc, inf);
fprintf(stream, "%s", output_text_color); fprintf(stream, "%s", output_text_color);
#endif #endif
} }

6
libs/esl/src/include/cc.h
View File

@ -1,8 +1,2 @@
#ifdef SHOW_HUGE_CLUECON_NAG
const char *cc = ".========================================================================================================.\n| ____ _____ ____ _ ____ _ _ _____ |\n| / ___|___ _ __ ___ ___ |_ _|__ / ___| |_ _ ___ / ___|___ _ __ ( ) |___ / |\n| | | / _ \\| '_ ` _ \\ / _ \\ | |/ _ \\ | | | | | | |/ _ \\ | / _ \\| '_ \\ |/| | |_ \\ |\n| | |__| (_) | | | | | | __/ | | (_) | | |___| | |_| | __/ |__| (_) | | | | | |___) | |\n| \\____\\___/|_| |_| |_|\\___| |_|\\___/ \\____|_|\\__,_|\\___|\\____\\___/|_| |_| |_|____/ |\n| |\n| ____ _ _ _ _ ____ _ |\n| / ___| |__ (_) ___ __ _ __ _ ___ | | | / ___| / \\ |\n| | | | '_ \\| |/ __/ _` |/ _` |/ _ \\ | | | \\___ \\ / _ \\ |\n| | |___| | | | | (_| (_| | (_| | (_) | | |_| |___) / ___ \\ |\n| \\____|_| |_|_|\\___\\__,_|\\__, |\\___( ) \\___/|____/_/ \\_\\ |\n| |___/ |/ |\n| _ _ __ _ _ ___ _ _ ____ ___ _ _____ |\n| / \\ _ _ __ _ _ _ ___| |_ / /_ | |_| |__ ( _ )| |_| |__ |___ \\ / _ \\/ |___ / |\n| / _ \\| | | |/ _` | | | / __| __| | '_ \\| __| '_ \\ _____ / _ \\| __| '_ \\ __) | | | | | |_ \\ |\n| / ___ \\ |_| | (_| | |_| \\__ \\ |_ | (_) | |_| | | | |_____| | (_) | |_| | | | / __/| |_| | |___) | |\n| /_/ \\_\\__,_|\\__, |\\__,_|___/\\__| \\___/ \\__|_| |_| \\___/ \\__|_| |_| |_____|\\___/|_|____/ |\n| |___/ |\n| _ |\n| __ ____ ____ __ ___| |_ _ ___ ___ ___ _ __ ___ ___ _ __ ___ |\n| \\ \\ /\\ / /\\ \\ /\\ / /\\ \\ /\\ / / / __| | | | |/ _ \\/ __/ _ \\| '_ \\ / __/ _ \\| '_ ` _ \\ |\n| \\ V V / \\ V V / \\ V V / _ | (__| | |_| | __/ (_| (_) | | | | _ | (_| (_) | | | | | | |\n| \\_/\\_/ \\_/\\_/ \\_/\\_/ (_) \\___|_|\\__,_|\\___|\\___\\___/|_| |_| (_) \\___\\___/|_| |_| |_| |\n| |\n.========================================================================================================.\n"; const char *cc = ".========================================================================================================.\n| ____ _____ ____ _ ____ _ _ _____ |\n| / ___|___ _ __ ___ ___ |_ _|__ / ___| |_ _ ___ / ___|___ _ __ ( ) |___ / |\n| | | / _ \\| '_ ` _ \\ / _ \\ | |/ _ \\ | | | | | | |/ _ \\ | / _ \\| '_ \\ |/| | |_ \\ |\n| | |__| (_) | | | | | | __/ | | (_) | | |___| | |_| | __/ |__| (_) | | | | | |___) | |\n| \\____\\___/|_| |_| |_|\\___| |_|\\___/ \\____|_|\\__,_|\\___|\\____\\___/|_| |_| |_|____/ |\n| |\n| ____ _ _ _ _ ____ _ |\n| / ___| |__ (_) ___ __ _ __ _ ___ | | | / ___| / \\ |\n| | | | '_ \\| |/ __/ _` |/ _` |/ _ \\ | | | \\___ \\ / _ \\ |\n| | |___| | | | | (_| (_| | (_| | (_) | | |_| |___) / ___ \\ |\n| \\____|_| |_|_|\\___\\__,_|\\__, |\\___( ) \\___/|____/_/ \\_\\ |\n| |___/ |/ |\n| _ _ __ _ _ ___ _ _ ____ ___ _ _____ |\n| / \\ _ _ __ _ _ _ ___| |_ / /_ | |_| |__ ( _ )| |_| |__ |___ \\ / _ \\/ |___ / |\n| / _ \\| | | |/ _` | | | / __| __| | '_ \\| __| '_ \\ _____ / _ \\| __| '_ \\ __) | | | | | |_ \\ |\n| / ___ \\ |_| | (_| | |_| \\__ \\ |_ | (_) | |_| | | | |_____| | (_) | |_| | | | / __/| |_| | |___) | |\n| /_/ \\_\\__,_|\\__, |\\__,_|___/\\__| \\___/ \\__|_| |_| \\___/ \\__|_| |_| |_____|\\___/|_|____/ |\n| |___/ |\n| _ |\n| __ ____ ____ __ ___| |_ _ ___ ___ ___ _ __ ___ ___ _ __ ___ |\n| \\ \\ /\\ / /\\ \\ /\\ / /\\ \\ /\\ / / / __| | | | |/ _ \\/ __/ _ \\| '_ \\ / __/ _ \\| '_ ` _ \\ |\n| \\ V V / \\ V V / \\ V V / _ | (__| | |_| | __/ (_| (_) | | | | _ | (_| (_) | | | | | | |\n| \\_/\\_/ \\_/\\_/ \\_/\\_/ (_) \\___|_|\\__,_|\\___|\\___\\___/|_| |_| (_) \\___\\___/|_| |_| |_| |\n| |\n.========================================================================================================.\n";
#elif SHOW_MODEST_CLUECON_NAG
const char *cc = "Come to ClueCon '13 August 6-8th, 2013, Chicago, USA\nwww.cluecon.com\n";
#else
const char *cc = "";
#endif

6
src/include/cc.h
View File

@ -1,8 +1,2 @@
#ifdef SHOW_HUGE_CLUECON_NAG
const char *cc = ".========================================================================================================.\n| ____ _____ ____ _ ____ _ _ _____ |\n| / ___|___ _ __ ___ ___ |_ _|__ / ___| |_ _ ___ / ___|___ _ __ ( ) |___ / |\n| | | / _ \\| '_ ` _ \\ / _ \\ | |/ _ \\ | | | | | | |/ _ \\ | / _ \\| '_ \\ |/| | |_ \\ |\n| | |__| (_) | | | | | | __/ | | (_) | | |___| | |_| | __/ |__| (_) | | | | | |___) | |\n| \\____\\___/|_| |_| |_|\\___| |_|\\___/ \\____|_|\\__,_|\\___|\\____\\___/|_| |_| |_|____/ |\n| |\n| ____ _ _ _ _ ____ _ |\n| / ___| |__ (_) ___ __ _ __ _ ___ | | | / ___| / \\ |\n| | | | '_ \\| |/ __/ _` |/ _` |/ _ \\ | | | \\___ \\ / _ \\ |\n| | |___| | | | | (_| (_| | (_| | (_) | | |_| |___) / ___ \\ |\n| \\____|_| |_|_|\\___\\__,_|\\__, |\\___( ) \\___/|____/_/ \\_\\ |\n| |___/ |/ |\n| _ _ __ _ _ ___ _ _ ____ ___ _ _____ |\n| / \\ _ _ __ _ _ _ ___| |_ / /_ | |_| |__ ( _ )| |_| |__ |___ \\ / _ \\/ |___ / |\n| / _ \\| | | |/ _` | | | / __| __| | '_ \\| __| '_ \\ _____ / _ \\| __| '_ \\ __) | | | | | |_ \\ |\n| / ___ \\ |_| | (_| | |_| \\__ \\ |_ | (_) | |_| | | | |_____| | (_) | |_| | | | / __/| |_| | |___) | |\n| /_/ \\_\\__,_|\\__, |\\__,_|___/\\__| \\___/ \\__|_| |_| \\___/ \\__|_| |_| |_____|\\___/|_|____/ |\n| |___/ |\n| _ |\n| __ ____ ____ __ ___| |_ _ ___ ___ ___ _ __ ___ ___ _ __ ___ |\n| \\ \\ /\\ / /\\ \\ /\\ / /\\ \\ /\\ / / / __| | | | |/ _ \\/ __/ _ \\| '_ \\ / __/ _ \\| '_ ` _ \\ |\n| \\ V V / \\ V V / \\ V V / _ | (__| | |_| | __/ (_| (_) | | | | _ | (_| (_) | | | | | | |\n| \\_/\\_/ \\_/\\_/ \\_/\\_/ (_) \\___|_|\\__,_|\\___|\\___\\___/|_| |_| (_) \\___\\___/|_| |_| |_| |\n| |\n.========================================================================================================.\n"; const char *cc = ".========================================================================================================.\n| ____ _____ ____ _ ____ _ _ _____ |\n| / ___|___ _ __ ___ ___ |_ _|__ / ___| |_ _ ___ / ___|___ _ __ ( ) |___ / |\n| | | / _ \\| '_ ` _ \\ / _ \\ | |/ _ \\ | | | | | | |/ _ \\ | / _ \\| '_ \\ |/| | |_ \\ |\n| | |__| (_) | | | | | | __/ | | (_) | | |___| | |_| | __/ |__| (_) | | | | | |___) | |\n| \\____\\___/|_| |_| |_|\\___| |_|\\___/ \\____|_|\\__,_|\\___|\\____\\___/|_| |_| |_|____/ |\n| |\n| ____ _ _ _ _ ____ _ |\n| / ___| |__ (_) ___ __ _ __ _ ___ | | | / ___| / \\ |\n| | | | '_ \\| |/ __/ _` |/ _` |/ _ \\ | | | \\___ \\ / _ \\ |\n| | |___| | | | | (_| (_| | (_| | (_) | | |_| |___) / ___ \\ |\n| \\____|_| |_|_|\\___\\__,_|\\__, |\\___( ) \\___/|____/_/ \\_\\ |\n| |___/ |/ |\n| _ _ __ _ _ ___ _ _ ____ ___ _ _____ |\n| / \\ _ _ __ _ _ _ ___| |_ / /_ | |_| |__ ( _ )| |_| |__ |___ \\ / _ \\/ |___ / |\n| / _ \\| | | |/ _` | | | / __| __| | '_ \\| __| '_ \\ _____ / _ \\| __| '_ \\ __) | | | | | |_ \\ |\n| / ___ \\ |_| | (_| | |_| \\__ \\ |_ | (_) | |_| | | | |_____| | (_) | |_| | | | / __/| |_| | |___) | |\n| /_/ \\_\\__,_|\\__, |\\__,_|___/\\__| \\___/ \\__|_| |_| \\___/ \\__|_| |_| |_____|\\___/|_|____/ |\n| |___/ |\n| _ |\n| __ ____ ____ __ ___| |_ _ ___ ___ ___ _ __ ___ ___ _ __ ___ |\n| \\ \\ /\\ / /\\ \\ /\\ / /\\ \\ /\\ / / / __| | | | |/ _ \\/ __/ _ \\| '_ \\ / __/ _ \\| '_ ` _ \\ |\n| \\ V V / \\ V V / \\ V V / _ | (__| | |_| | __/ (_| (_) | | | | _ | (_| (_) | | | | | | |\n| \\_/\\_/ \\_/\\_/ \\_/\\_/ (_) \\___|_|\\__,_|\\___|\\___\\___/|_| |_| (_) \\___\\___/|_| |_| |_| |\n| |\n.========================================================================================================.\n";
#elif SHOW_MODEST_CLUECON_NAG
const char *cc = "Come to ClueCon '13 August 6-8th, 2013, Chicago, USA\nwww.cluecon.com\n";
#else
const char *cc = "";
#endif

6
src/switch_core.c
View File

@ -2002,16 +2002,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t
#ifdef WIN32 #ifdef WIN32
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s%s\n\n", switch_core_banner(), cc); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s%s\n\n", switch_core_banner(), cc);
#elif SHOW_HUGE_CLUECON_NAG #else
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s%s%s%s%s%s\n\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s%s%s%s%s%s\n\n",
SWITCH_SEQ_DEFAULT_COLOR, SWITCH_SEQ_DEFAULT_COLOR,
SWITCH_SEQ_FYELLOW, SWITCH_SEQ_BBLUE, SWITCH_SEQ_FYELLOW, SWITCH_SEQ_BBLUE,
switch_core_banner(), switch_core_banner(),
cc, SWITCH_SEQ_DEFAULT_COLOR); cc, SWITCH_SEQ_DEFAULT_COLOR);
#else
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s%s%s\n\n",
SWITCH_SEQ_DEFAULT_COLOR,
switch_core_banner(), cc);
#endif #endif