Merge branch 'master' into bootstrap

diff --cc tests/unit/Makefile.am
index 16d6e065eeb635ac2d57bf4c4a672a9d689bcc2d,c795fd7d9f41b66bb66e9aee6ea15eedb2673d2b..a1bce908e8ca51cda82c47a3d3f597379ee9480c
--- 1/tests/unit/Makefile.am
--- 2/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@@ -1,11 -1,15 +1,16 @@@
  include $(top_srcdir)/build/modmake.rulesam
  
 +undefine AM_CFLAGS
 +
  noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx switch_core_file \
                           switch_ivr_play_say switch_core_codec switch_rtp switch_xml
- noinst_PROGRAMS+= switch_core_video switch_core_db
- AM_LDFLAGS += -avoid-version -no-undefined $(openssl_LIBS)
++
+ noinst_PROGRAMS+= switch_core_video switch_core_db switch_vad
 -AM_LDFLAGS  = -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) $(openssl_LIBS)
++AM_LDFLAGS  = -avoid-version -no-undefined $(openssl_LIBS)
  AM_LDFLAGS += $(FREESWITCH_LIBS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
 -AM_CFLAGS   = $(SWITCH_AM_CPPFLAGS)
 -AM_CPPFLAGS = $(SWITCH_AM_CPPFLAGS)
  
+ if HAVE_FVAD
+ AM_CFLAGS += -DSWITCH_HAVE_FVAD
+ endif
+ 
  TESTS = $(noinst_PROGRAMS)