Author: ms Date: Wed May 2 11:57:15 2007 New Revision: 5068 Modified: freeswitch/branches/ms/Makefile.am freeswitch/branches/ms/build/fixautomake.sh (props changed) freeswitch/branches/ms/src/mod/endpoints/mod_alsa/mod_alsa.c Log: Updating branche to 5057 Modified: freeswitch/branches/ms/Makefile.am ============================================================================== --- freeswitch/branches/ms/Makefile.am (original) +++ freeswitch/branches/ms/Makefile.am Wed May 2 11:57:15 2007 @@ -110,11 +110,6 @@ CORE_LIBS += -lodbc endif -if ADD_LIBEDIT -CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT -CORE_LIBS += libs/libedit/src/.libs/libedit.a -endif - lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) @@ -132,7 +127,15 @@ nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) -freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la -ltermcap +freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la + + +if ADD_LIBEDIT +CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT +CORE_LIBS += libs/libedit/src/.libs/libedit.a +freeswitch_LDADD += -ltermcap +endif + libs/libedit/Makefile: Modified: freeswitch/branches/ms/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/branches/ms/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/branches/ms/src/mod/endpoints/mod_alsa/mod_alsa.c Wed May 2 11:57:15 2007 @@ -1622,11 +1622,11 @@ } if (func) { - if (stream->event) { + if (http) { stream->write_function(stream, "<pre>"); } status = func(&argv[lead], argc - lead, stream); - if (stream->event) { + if (http) { stream->write_function(stream, "\n\n</pre>"); } } else {