Author: mikej Date: Mon Mar 19 15:26:25 2007 New Revision: 4662 Added: freeswitch/trunk/acinclude.m4 - copied unchanged from r4661, /freeswitch/trunk/acsite.m4 freeswitch/trunk/build/indent_options.sh - copied, changed from r4661, /freeswitch/trunk/indent_options.sh freeswitch/trunk/build/modules.conf.in - copied unchanged from r4661, /freeswitch/trunk/modules.conf.in freeswitch/trunk/docs/AUTHORS - copied unchanged from r4661, /freeswitch/trunk/AUTHORS freeswitch/trunk/docs/COPYING - copied unchanged from r4661, /freeswitch/trunk/COPYING Removed: freeswitch/trunk/.indent.pro freeswitch/trunk/AUTHORS freeswitch/trunk/COPYING freeswitch/trunk/ChangeLog freeswitch/trunk/Makefile.in freeswitch/trunk/NEWS freeswitch/trunk/README freeswitch/trunk/aclocal.m4 freeswitch/trunk/acsite.m4 freeswitch/trunk/build.sh freeswitch/trunk/build/config/compile freeswitch/trunk/build/config/config.guess freeswitch/trunk/build/config/depcomp freeswitch/trunk/build/config/install-sh freeswitch/trunk/build/config/ltmain.sh freeswitch/trunk/build/config/missing freeswitch/trunk/configure freeswitch/trunk/indent_options.sh freeswitch/trunk/libs/apr-util/build/config.guess freeswitch/trunk/libs/apr-util/build/config.sub freeswitch/trunk/libs/apr-util/xml/expat/aclocal.m4 freeswitch/trunk/libs/apr/build/config.guess freeswitch/trunk/libs/apr/build/ltmain.sh freeswitch/trunk/libs/codec/g726/aclocal.m4 freeswitch/trunk/libs/codec/g726/build/compile freeswitch/trunk/libs/codec/g726/build/config.guess freeswitch/trunk/libs/codec/g726/build/config.sub freeswitch/trunk/libs/codec/g726/build/depcomp freeswitch/trunk/libs/codec/g726/build/install-sh freeswitch/trunk/libs/codec/g726/build/ltmain.sh freeswitch/trunk/libs/codec/g726/build/missing freeswitch/trunk/libs/codec/g7xx/aclocal.m4 freeswitch/trunk/libs/codec/g7xx/build/compile freeswitch/trunk/libs/codec/g7xx/build/config.guess freeswitch/trunk/libs/codec/g7xx/build/config.sub freeswitch/trunk/libs/codec/g7xx/build/depcomp freeswitch/trunk/libs/codec/g7xx/build/install-sh freeswitch/trunk/libs/codec/g7xx/build/ltmain.sh freeswitch/trunk/libs/codec/g7xx/build/missing freeswitch/trunk/libs/codec/gsm/aclocal.m4 freeswitch/trunk/libs/codec/gsm/compile freeswitch/trunk/libs/codec/gsm/config.guess freeswitch/trunk/libs/codec/gsm/config.sub freeswitch/trunk/libs/codec/gsm/depcomp freeswitch/trunk/libs/codec/gsm/install-sh freeswitch/trunk/libs/codec/gsm/ltmain.sh freeswitch/trunk/libs/codec/gsm/missing freeswitch/trunk/libs/codec/ilbc/aclocal.m4 freeswitch/trunk/libs/codec/ilbc/build/compile freeswitch/trunk/libs/codec/ilbc/build/config.guess freeswitch/trunk/libs/codec/ilbc/build/config.sub freeswitch/trunk/libs/codec/ilbc/build/depcomp freeswitch/trunk/libs/codec/ilbc/build/install-sh freeswitch/trunk/libs/codec/ilbc/build/ltmain.sh freeswitch/trunk/libs/codec/ilbc/build/missing freeswitch/trunk/libs/codec/lpc10/aclocal.m4 freeswitch/trunk/libs/codec/lpc10/build/compile freeswitch/trunk/libs/codec/lpc10/build/config.guess freeswitch/trunk/libs/codec/lpc10/build/config.sub freeswitch/trunk/libs/codec/lpc10/build/depcomp freeswitch/trunk/libs/codec/lpc10/build/install-sh freeswitch/trunk/libs/codec/lpc10/build/ltmain.sh freeswitch/trunk/libs/codec/lpc10/build/missing freeswitch/trunk/libs/curl/aclocal.m4 freeswitch/trunk/libs/curl/compile freeswitch/trunk/libs/curl/config.guess freeswitch/trunk/libs/curl/config.sub freeswitch/trunk/libs/curl/depcomp freeswitch/trunk/libs/curl/install-sh freeswitch/trunk/libs/curl/ltmain.sh freeswitch/trunk/libs/curl/missing freeswitch/trunk/libs/iax/aclocal.m4 freeswitch/trunk/libs/iax/build/config.guess freeswitch/trunk/libs/iax/build/config.sub freeswitch/trunk/libs/iax/build/depcomp freeswitch/trunk/libs/iax/build/install-sh freeswitch/trunk/libs/iax/build/ltmain.sh freeswitch/trunk/libs/iax/build/missing freeswitch/trunk/libs/iksemel/aclocal.m4 freeswitch/trunk/libs/iksemel/build/compile freeswitch/trunk/libs/iksemel/build/config.guess freeswitch/trunk/libs/iksemel/build/config.sub freeswitch/trunk/libs/iksemel/build/depcomp freeswitch/trunk/libs/iksemel/build/install-sh freeswitch/trunk/libs/iksemel/build/ltmain.sh freeswitch/trunk/libs/iksemel/build/missing freeswitch/trunk/libs/js/aclocal.m4 freeswitch/trunk/libs/js/config.guess freeswitch/trunk/libs/js/config.sub freeswitch/trunk/libs/js/ltmain.sh freeswitch/trunk/libs/js/nsprpub/build/autoconf/config.guess freeswitch/trunk/libs/libdingaling/aclocal.m4 freeswitch/trunk/libs/libdingaling/build/compile freeswitch/trunk/libs/libdingaling/build/config.guess freeswitch/trunk/libs/libdingaling/build/config.sub freeswitch/trunk/libs/libdingaling/build/depcomp freeswitch/trunk/libs/libdingaling/build/install-sh freeswitch/trunk/libs/libdingaling/build/ltmain.sh freeswitch/trunk/libs/libdingaling/build/missing freeswitch/trunk/libs/libetpan/aclocal.m4 freeswitch/trunk/libs/libetpan/config.guess freeswitch/trunk/libs/libetpan/config.sub freeswitch/trunk/libs/libetpan/ltmain.sh freeswitch/trunk/libs/libresample-0.1.3.build.sh freeswitch/trunk/libs/libresample/aclocal.m4 freeswitch/trunk/libs/libresample/build/compile freeswitch/trunk/libs/libresample/build/config.guess freeswitch/trunk/libs/libresample/build/config.sub freeswitch/trunk/libs/libresample/build/depcomp freeswitch/trunk/libs/libresample/build/install-sh freeswitch/trunk/libs/libresample/build/ltmain.sh freeswitch/trunk/libs/libresample/build/missing freeswitch/trunk/libs/libsndfile/aclocal.m4 freeswitch/trunk/libs/libsndfile/compile freeswitch/trunk/libs/libsndfile/config.guess freeswitch/trunk/libs/libsndfile/config.sub freeswitch/trunk/libs/libsndfile/depcomp freeswitch/trunk/libs/libsndfile/install-sh freeswitch/trunk/libs/libsndfile/ltmain.sh freeswitch/trunk/libs/libsndfile/missing freeswitch/trunk/libs/libspeakup/aclocal.m4 freeswitch/trunk/libs/libspeakup/build/compile freeswitch/trunk/libs/libspeakup/build/config.guess freeswitch/trunk/libs/libspeakup/build/config.sub freeswitch/trunk/libs/libspeakup/build/depcomp freeswitch/trunk/libs/libspeakup/build/install-sh freeswitch/trunk/libs/libspeakup/build/ltmain.sh freeswitch/trunk/libs/libspeakup/build/missing freeswitch/trunk/libs/libteletone/aclocal.m4 freeswitch/trunk/libs/libteletone/build/compile freeswitch/trunk/libs/libteletone/build/config.guess freeswitch/trunk/libs/libteletone/build/config.sub freeswitch/trunk/libs/libteletone/build/depcomp freeswitch/trunk/libs/libteletone/build/install-sh freeswitch/trunk/libs/libteletone/build/ltmain.sh freeswitch/trunk/libs/libteletone/build/missing freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/libs/pcre/aclocal.m4 freeswitch/trunk/libs/pcre/config.guess freeswitch/trunk/libs/pcre/config.sub freeswitch/trunk/libs/pcre/ltmain.sh freeswitch/trunk/libs/portaudio/aclocal.m4 freeswitch/trunk/libs/portaudio/bindings/cpp/aclocal.m4 freeswitch/trunk/libs/portaudio/bindings/cpp/build/gnu/aclocal.m4 freeswitch/trunk/libs/sofia-sip/aclocal.m4 freeswitch/trunk/libs/sofia-sip/compile freeswitch/trunk/libs/sofia-sip/config.guess freeswitch/trunk/libs/sofia-sip/config.sub freeswitch/trunk/libs/sofia-sip/depcomp freeswitch/trunk/libs/sofia-sip/install-sh freeswitch/trunk/libs/sofia-sip/ltmain.sh freeswitch/trunk/libs/sofia-sip/missing freeswitch/trunk/libs/speex/aclocal.m4 freeswitch/trunk/libs/speex/config.guess freeswitch/trunk/libs/speex/config.sub freeswitch/trunk/libs/speex/depcomp freeswitch/trunk/libs/speex/install-sh freeswitch/trunk/libs/speex/ltmain.sh freeswitch/trunk/libs/speex/missing freeswitch/trunk/libs/sqlite-3.3.6.build.sh freeswitch/trunk/libs/sqlite/aclocal.m4 freeswitch/trunk/libs/sqlite/config.guess freeswitch/trunk/libs/sqlite/config.sub freeswitch/trunk/libs/sqlite/ltmain.sh freeswitch/trunk/libs/srtp.build.sh freeswitch/trunk/libs/srtp/aclocal.m4 freeswitch/trunk/libs/srtp/config.guess freeswitch/trunk/libs/srtp/config.sub freeswitch/trunk/libs/srtp/install-sh freeswitch/trunk/libs/udns.build.sh freeswitch/trunk/libs/xmlrpc-c/aclocal.m4 freeswitch/trunk/libs/xmlrpc-c/config.guess freeswitch/trunk/libs/xmlrpc-c/config.sub freeswitch/trunk/libs/xmlrpc-c/ltmain.sh freeswitch/trunk/libs/xmlrpc-c/missing freeswitch/trunk/modules.conf.in freeswitch/trunk/src/Makefile.in freeswitch/trunk/src/mod/Makefile.in Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/libs/srtp/Makefile.in freeswitch/trunk/src/mod/Makefile.am Log: removing most of the generated files from tree. You will need to run bootstrap.sh and configure again after you do this update and have autoconf, automake, and libtool installed on the box. Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Mar 19 15:26:25 2007 @@ -7,6 +7,13 @@ js js/nsprpub libdingaling libetpan libresample libsndfile libteletone pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; +# keep automake from making us magically GPL, and to stop complaining about missing files. +cp -f docs/COPYING . +cp -f docs/AUTHORS . +touch NEWS +touch README +touch ChangeLog + # autoconf 2.59 or newer ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` if test -z "$ac_version"; then Copied: freeswitch/trunk/build/indent_options.sh (from r4661, /freeswitch/trunk/indent_options.sh) ============================================================================== --- /freeswitch/trunk/indent_options.sh (original) +++ freeswitch/trunk/build/indent_options.sh Mon Mar 19 15:26:25 2007 @@ -1,4 +1,4 @@ #!/bin/bash -echo -n "-brs -npsl -di0 -br -ce -d0 -cli0 -npcs -nfc1 -ut -i4 -ts4 -l120 -cs -T size_t " > .indent.pro -grep typedef src/include/*.h | grep switch_ | grep -v "\*\|{" | sed -e s/struct// | perl -ne '@l = split; $l[2] =~ s/;//g ; print "-T $l[2] "' >> .indent.pro -grep "} switch_" src/include/*.h | perl -ne '@l = split; $l[1] =~ s/;//g ; print " -T $l[1] "' >> .indent.pro +echo -n "-brs -npsl -di0 -br -ce -d0 -cli0 -npcs -nfc1 -ut -i4 -ts4 -l120 -cs -T size_t " > ../.indent.pro +grep typedef ../src/include/*.h | grep switch_ | grep -v "\*\|{" | sed -e s/struct// | perl -ne '@l = split; $l[2] =~ s/;//g ; print "-T $l[2] "' >> ../.indent.pro +grep "} switch_" ../src/include/*.h | perl -ne '@l = split; $l[1] =~ s/;//g ; print " -T $l[1] "' >> ../.indent.pro Modified: freeswitch/trunk/libs/srtp/Makefile.in ============================================================================== --- freeswitch/trunk/libs/srtp/Makefile.in (original) +++ freeswitch/trunk/libs/srtp/Makefile.in Mon Mar 19 15:26:25 2007 @@ -51,8 +51,7 @@ $(top_srcdir)/configure $(top_srcdir)/crypto/Makefile.in \ $(top_srcdir)/doc/Makefile.in AUTHORS COPYING ChangeLog \ INSTALL NEWS TODO build/config.guess build/config.sub \ - build/depcomp build/install-sh build/ltmain.sh build/missing \ - config.guess config.sub install-sh + build/depcomp build/install-sh build/ltmain.sh build/missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = \ Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Mon Mar 19 15:26:25 2007 @@ -1,4 +1,4 @@ -CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; +CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/build/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; FOUND_MODULES=found_modules=`find . -type d -name mod_\* | sed -e 's|^\./||'` ; OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ; OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_modules $$found_modules`; \