[Freeswitch-branches] [commit] r3701 - in freeswitch/branches/outcast: . build build/config conf libs libs/codec/g726 libs/codec/g7xx libs/codec/g7xx/build libs/codec/g7xx/build/config libs/codec/gsm libs/codec/gsm/inc libs/codec/gsm/src libs/codec/ilbc libs/codec/ilbc/build libs/codec/ilbc/build/config libs/iax libs/iax/build libs/iax/build/config libs/iax/src libs/js libs/js/nsprpub libs/js/nsprpub/CVS libs/js/nsprpub/admin libs/js/nsprpub/admin/CVS libs/js/nsprpub/build libs/js/nsprpub/build/CVS libs/js/nsprpub/build/autoconf libs/js/nsprpub/build/autoconf/CVS libs/js/nsprpub/config libs/js/nsprpub/config/CVS libs/js/nsprpub/include libs/js/nsprpub/include/CVS libs/js/nsprpub/lib libs/js/nsprpub/lib/CVS libs/js/nsprpub/lib/ds libs/js/nsprpub/lib/ds/CVS libs/js/nsprpub/lib/libc libs/js/nsprpub/lib/libc/CVS libs/js/nsprpub/lib/libc/include libs/js/nsprpub/lib/libc/include/CVS libs/js/nsprpub/lib/libc/src libs/js/nsprpub/lib/libc/src/CVS libs/js/nsprpub/lib/msgc libs/js/nsprpub/lib/msgc/CVS libs/js/nsprpub/lib/msgc/include libs/js/nsprpub/lib/msgc/include/CVS libs/js/nsprpub/lib/msgc/src libs/js/nsprpub/lib/msgc/src/CVS libs/js/nsprpub/lib/msgc/tests libs/js/nsprpub/lib/msgc/tests/CVS libs/js/nsprpub/lib/prstreams libs/js/nsprpub/lib/prstreams/CVS libs/js/nsprpub/lib/prstreams/tests libs/js/nsprpub/lib/prstreams/tests/CVS libs/js/nsprpub/lib/prstreams/tests/testprstrm libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS libs/js/nsprpub/lib/tests libs/js/nsprpub/lib/tests/CVS libs/js/nsprpub/lib/tests/windows libs/js/nsprpub/lib/tests/windows/CVS libs/js/nsprpub/macbuild libs/js/nsprpub/macbuild/CVS libs/js/nsprpub/pkg libs/js/nsprpub/pkg/CVS libs/js/nsprpub/pkg/linux libs/js/nsprpub/pkg/linux/CVS libs/js/nsprpub/pkg/solaris libs/js/nsprpub/pkg/solaris/CVS libs/js/nsprpub/pkg/solaris/SUNWnspr libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS libs/js/nsprpub/pkg/solaris/SUNWnsprx libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS libs/js/nsprpub/pkg/solaris/SUNWpr libs/js/nsprpub/pkg/solaris/SUNWpr-devl libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS libs/js/nsprpub/pkg/solaris/SUNWpr/CVS libs/js/nsprpub/pkg/solaris/SUNWprd libs/js/nsprpub/pkg/solaris/SUNWprd/CVS libs/js/nsprpub/pkg/solaris/SUNWprdx libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS libs/js/nsprpub/pkg/solaris/SUNWprx libs/js/nsprpub/pkg/solaris/SUNWprx-devl libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS libs/js/nsprpub/pkg/solaris/SUNWprx/CVS libs/js/nsprpub/pkg/solaris/common_files libs/js/nsprpub/pkg/solaris/common_files/CVS libs/js/nsprpub/pr libs/js/nsprpub/pr/CVS libs/js/nsprpub/pr/include libs/js/nsprpub/pr/include/CVS libs/js/nsprpub/pr/include/md libs/js/nsprpub/pr/include/md/CVS libs/js/nsprpub/pr/include/obsolete libs/js/nsprpub/pr/include/obsolete/CVS libs/js/nsprpub/pr/include/private libs/js/nsprpub/pr/include/private/CVS libs/js/nsprpub/pr/src libs/js/nsprpub/pr/src/CVS libs/js/nsprpub/pr/src/bthreads libs/js/nsprpub/pr/src/bthreads/CVS libs/js/nsprpub/pr/src/cplus libs/js/nsprpub/pr/src/cplus/CVS libs/js/nsprpub/pr/src/cplus/tests libs/js/nsprpub/pr/src/cplus/tests/CVS libs/js/nsprpub/pr/src/cthreads libs/js/nsprpub/pr/src/cthreads/CVS libs/js/nsprpub/pr/src/io libs/js/nsprpub/pr/src/io/CVS libs/js/nsprpub/pr/src/linking libs/js/nsprpub/pr/src/linking/CVS libs/js/nsprpub/pr/src/malloc libs/js/nsprpub/pr/src/malloc/CVS libs/js/nsprpub/pr/src/md libs/js/nsprpub/pr/src/md/CVS libs/js/nsprpub/pr/src/md/beos libs/js/nsprpub/pr/src/md/beos/CVS libs/js/nsprpub/pr/src/md/mac libs/js/nsprpub/pr/src/md/mac/CVS libs/js/nsprpub/pr/src/md/os2 libs/js/nsprpub/pr/src/md/os2/CVS libs/js/nsprpub/pr/src/md/unix libs/js/nsprpub/pr/src/md/unix/CVS libs/js/nsprpub/pr/src/md/windows libs/js/nsprpub/pr/src/md/windows/CVS libs/js/nsprpub/pr/src/memory libs/js/nsprpub/pr/src/memory/CVS libs/js/nsprpub/pr/src/misc libs/js/nsprpub/pr/src/misc/CVS libs/js/nsprpub/pr/src/pthreads libs/js/nsprpub/pr/src/pthreads/CVS libs/js/nsprpub/pr/src/threads libs/js/nsprpub/pr/src/threads/CVS libs/js/nsprpub/pr/src/threads/combined libs/js/nsprpub/pr/src/threads/combined/CVS libs/js/nsprpub/pr/tests libs/js/nsprpub/pr/tests/CVS libs/js/nsprpub/pr/tests/dll libs/js/nsprpub/pr/tests/dll/CVS libs/js/nsprpub/pr/tests/macbuild libs/js/nsprpub/pr/tests/macbuild/CVS libs/js/nsprpub/pr/tests/w16gui libs/js/nsprpub/pr/tests/w16gui/CVS libs/js/nsprpub/tools libs/js/nsprpub/tools/CVS libs/js/src libs/js/src/fdlibm libs/js/src/perlconnect libs/libdingaling libs/libdingaling/build libs/libdingaling/build/config libs/libdingaling/src libs/libresample libs/libresample/build libs/libresample/src libs/libspeakup libs/libspeakup/build libs/libteletone libs/libteletone/src libs/srtp libs/srtp/build libs/srtp/build/config libs/srtp/crypto/cipher libs/srtp/crypto/hash libs/srtp/crypto/include libs/srtp/crypto/kernel libs/srtp/crypto/math libs/srtp/crypto/replay libs/srtp/crypto/rng libs/srtp/include libs/srtp/test libs/udns libs/udns/debian libs/win32 libs/win32/etpan libs/win32/js libs/win32/pthread libs/win32/sofia libs/win32/udns scripts scripts/POE-Filter-FSSocket scripts/POE-Filter-FSSocket/examples scripts/POE-Filter-FSSocket/lib scripts/POE-Filter-FSSocket/lib/POE scripts/POE-Filter-FSSocket/lib/POE/Filter scripts/POE-Filter-FSSocket/t scripts/js_modules scripts/socket src src/dotnet src/dotnet/Marshaling/Types src/dotnet/Modules src/include src/mod/applications/mod_bridgecall src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_dptools src/mod/applications/mod_echo src/mod/applications/mod_enum src/mod/applications/mod_hello src/mod/applications/mod_ivrtest src/mod/applications/mod_park src/mod/applications/mod_playback src/mod/applications/mod_rss src/mod/applications/mod_skel src/mod/asr_tts/mod_cepstral src/mod/codecs/mod_amr src/mod/codecs/mod_g711 src/mod/codecs/mod_g722 src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g726 src/mod/codecs/mod_g729 src/mod/codecs/mod_gsm src/mod/codecs/mod_ilbc src/mod/codecs/mod_l16 src/mod/codecs/mod_lpc10 src/mod/codecs/mod_speex src/mod/dialplans src/mod/dialplans/mod_dialplan_directory src/mod/dialplans/mod_dialplan_xml src/mod/directories/mod_ldap src/mod/endpoints src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_iax src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia src/mod/endpoints/mod_wanpipe src/mod/endpoints/mod_woomera src/mod/event_handlers/mod_cdr src/mod/event_handlers/mod_event_multicast src/mod/event_handlers/mod_event_socket src/mod/event_handlers/mod_event_test src/mod/event_handlers/mod_xmpp_event src/mod/event_handlers/mod_zeroconf src/mod/formats/mod_native_file src/mod/formats/mod_sndfile src/mod/languages src/mod/languages/mod_mono 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/languages/mod_spidermonkey_core_db src/mod/languages/mod_spidermonkey_etpan src/mod/languages/mod_spidermonkey_odbc src/mod/languages/mod_spidermonkey_skel src/mod/languages/mod_spidermonkey_teletone src/mod/loggers/mod_console src/mod/loggers/mod_syslog src/mod/timers/mod_softtimer src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc support w32/Library w32/Setup

Freeswitch SVN outcast at freeswitch.org
Mon Dec 18 15:45:18 EST 2006


Author: outcast
Date: Mon Dec 18 15:44:37 2006
New Revision: 3701

Added:
   freeswitch/branches/outcast/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/acsite.m4
   freeswitch/branches/outcast/libs/codec/g7xx/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/acsite.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/
      - copied from r3697, /freeswitch/trunk/libs/codec/g7xx/build/
   freeswitch/branches/outcast/libs/codec/g7xx/build/compile   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/compile
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/
      - copied from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/
   freeswitch/branches/outcast/libs/codec/g7xx/build/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config.guess
   freeswitch/branches/outcast/libs/codec/g7xx/build/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config.sub
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ac_cflags_gcc_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ac_cflags_gcc_option.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ac_cflags_sun_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ac_cflags_sun_option.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ac_gcc_archflag.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ac_gcc_archflag.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ac_gcc_x86_cpuid.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ac_gcc_x86_cpuid.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ac_prog_gzip.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ac_prog_gzip.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ac_prog_wget.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ac_prog_wget.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ax_cc_maxopt.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ax_cc_maxopt.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ax_cflags_warn_all_ansi.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ax_cflags_warn_all_ansi.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ax_check_compiler_flags.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ax_check_compiler_flags.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/config/ax_compiler_vendor.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/config/ax_compiler_vendor.m4
   freeswitch/branches/outcast/libs/codec/g7xx/build/depcomp   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/depcomp
   freeswitch/branches/outcast/libs/codec/g7xx/build/install-sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/install-sh
   freeswitch/branches/outcast/libs/codec/g7xx/build/ltmain.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/ltmain.sh
   freeswitch/branches/outcast/libs/codec/g7xx/build/missing   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/g7xx/build/missing
   freeswitch/branches/outcast/libs/codec/ilbc/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/acsite.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/
      - copied from r3697, /freeswitch/trunk/libs/codec/ilbc/build/
   freeswitch/branches/outcast/libs/codec/ilbc/build/compile   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/compile
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/
      - copied from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/
   freeswitch/branches/outcast/libs/codec/ilbc/build/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config.guess
   freeswitch/branches/outcast/libs/codec/ilbc/build/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config.sub
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ac_cflags_gcc_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ac_cflags_gcc_option.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ac_cflags_sun_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ac_cflags_sun_option.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ac_gcc_archflag.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ac_gcc_archflag.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ac_gcc_x86_cpuid.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ac_gcc_x86_cpuid.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ac_prog_gzip.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ac_prog_gzip.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ac_prog_wget.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ac_prog_wget.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ax_cc_maxopt.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ax_cc_maxopt.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ax_cflags_warn_all_ansi.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ax_cflags_warn_all_ansi.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ax_check_compiler_flags.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ax_check_compiler_flags.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/config/ax_compiler_vendor.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/config/ax_compiler_vendor.m4
   freeswitch/branches/outcast/libs/codec/ilbc/build/depcomp   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/depcomp
   freeswitch/branches/outcast/libs/codec/ilbc/build/install-sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/install-sh
   freeswitch/branches/outcast/libs/codec/ilbc/build/ltmain.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/ltmain.sh
   freeswitch/branches/outcast/libs/codec/ilbc/build/missing   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/codec/ilbc/build/missing
   freeswitch/branches/outcast/libs/iax/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/acsite.m4
   freeswitch/branches/outcast/libs/iax/build/
      - copied from r3697, /freeswitch/trunk/libs/iax/build/
   freeswitch/branches/outcast/libs/iax/build/config/
      - copied from r3697, /freeswitch/trunk/libs/iax/build/config/
   freeswitch/branches/outcast/libs/iax/build/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config.guess
   freeswitch/branches/outcast/libs/iax/build/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config.sub
   freeswitch/branches/outcast/libs/iax/build/config/ac_cflags_gcc_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ac_cflags_gcc_option.m4
   freeswitch/branches/outcast/libs/iax/build/config/ac_cflags_sun_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ac_cflags_sun_option.m4
   freeswitch/branches/outcast/libs/iax/build/config/ac_gcc_archflag.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ac_gcc_archflag.m4
   freeswitch/branches/outcast/libs/iax/build/config/ac_gcc_x86_cpuid.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ac_gcc_x86_cpuid.m4
   freeswitch/branches/outcast/libs/iax/build/config/ac_prog_gzip.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ac_prog_gzip.m4
   freeswitch/branches/outcast/libs/iax/build/config/ac_prog_wget.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ac_prog_wget.m4
   freeswitch/branches/outcast/libs/iax/build/config/ax_cc_maxopt.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ax_cc_maxopt.m4
   freeswitch/branches/outcast/libs/iax/build/config/ax_cflags_warn_all_ansi.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ax_cflags_warn_all_ansi.m4
   freeswitch/branches/outcast/libs/iax/build/config/ax_check_compiler_flags.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ax_check_compiler_flags.m4
   freeswitch/branches/outcast/libs/iax/build/config/ax_compiler_vendor.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/config/ax_compiler_vendor.m4
   freeswitch/branches/outcast/libs/iax/build/depcomp   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/depcomp
   freeswitch/branches/outcast/libs/iax/build/install-sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/install-sh
   freeswitch/branches/outcast/libs/iax/build/ltmain.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/ltmain.sh
   freeswitch/branches/outcast/libs/iax/build/missing   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/iax/build/missing
   freeswitch/branches/outcast/libs/js/
      - copied from r3697, /freeswitch/trunk/libs/js/
   freeswitch/branches/outcast/libs/js/AUTHORS
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/AUTHORS
   freeswitch/branches/outcast/libs/js/ChangeLog
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/ChangeLog
   freeswitch/branches/outcast/libs/js/LINKS
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/LINKS
   freeswitch/branches/outcast/libs/js/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/Makefile.in
   freeswitch/branches/outcast/libs/js/README
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/README
   freeswitch/branches/outcast/libs/js/THANKS
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/THANKS
   freeswitch/branches/outcast/libs/js/TODO
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/TODO
   freeswitch/branches/outcast/libs/js/VERSION
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/VERSION
   freeswitch/branches/outcast/libs/js/aclocal.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/aclocal.m4
   freeswitch/branches/outcast/libs/js/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/config.guess
   freeswitch/branches/outcast/libs/js/config.h.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/config.h.in
   freeswitch/branches/outcast/libs/js/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/config.sub
   freeswitch/branches/outcast/libs/js/configure   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/configure
   freeswitch/branches/outcast/libs/js/configure.ac
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/configure.ac
   freeswitch/branches/outcast/libs/js/js-config.1
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/js-config.1
   freeswitch/branches/outcast/libs/js/js-config.sh.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/js-config.sh.in
   freeswitch/branches/outcast/libs/js/js.1
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/js.1
   freeswitch/branches/outcast/libs/js/js.3
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/js.3
   freeswitch/branches/outcast/libs/js/js.pc.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/js.pc.in
   freeswitch/branches/outcast/libs/js/jslint.js
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/jslint.js
   freeswitch/branches/outcast/libs/js/libtool.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/libtool.m4
   freeswitch/branches/outcast/libs/js/ltmain.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/ltmain.sh
   freeswitch/branches/outcast/libs/js/nsprpub/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/
   freeswitch/branches/outcast/libs/js/nsprpub/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/admin/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/
   freeswitch/branches/outcast/libs/js/nsprpub/admin/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/admin/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/admin/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/admin/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/admin/explode.pl
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/explode.pl
   freeswitch/branches/outcast/libs/js/nsprpub/admin/makeTargetDirs.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/makeTargetDirs.sh
   freeswitch/branches/outcast/libs/js/nsprpub/admin/repackage.sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/repackage.sh
   freeswitch/branches/outcast/libs/js/nsprpub/admin/symlinks.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/admin/symlinks.sh
   freeswitch/branches/outcast/libs/js/nsprpub/build/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/build/
   freeswitch/branches/outcast/libs/js/nsprpub/build/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/build/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/build/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/build/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/build/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/build/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/config.guess
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/config.sub
   freeswitch/branches/outcast/libs/js/nsprpub/build/autoconf/install-sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/autoconf/install-sh
   freeswitch/branches/outcast/libs/js/nsprpub/build/cygwin-wrapper   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/build/cygwin-wrapper
   freeswitch/branches/outcast/libs/js/nsprpub/config/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/config/
   freeswitch/branches/outcast/libs/js/nsprpub/config/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/config/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/config/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/config/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/config/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/config/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/config/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/config/autoconf.mk.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/autoconf.mk.in
   freeswitch/branches/outcast/libs/js/nsprpub/config/config.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/config.mk
   freeswitch/branches/outcast/libs/js/nsprpub/config/gcc_hidden.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/gcc_hidden.h
   freeswitch/branches/outcast/libs/js/nsprpub/config/libc_r.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/libc_r.h
   freeswitch/branches/outcast/libs/js/nsprpub/config/make-system-wrappers.pl
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/make-system-wrappers.pl
   freeswitch/branches/outcast/libs/js/nsprpub/config/nfspwd.pl
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/nfspwd.pl
   freeswitch/branches/outcast/libs/js/nsprpub/config/now.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/now.c
   freeswitch/branches/outcast/libs/js/nsprpub/config/nsinstall.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/nsinstall.c
   freeswitch/branches/outcast/libs/js/nsprpub/config/nspr-config.in   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/nspr-config.in
   freeswitch/branches/outcast/libs/js/nsprpub/config/nspr.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/nspr.m4
   freeswitch/branches/outcast/libs/js/nsprpub/config/nsprincl.mk.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/nsprincl.mk.in
   freeswitch/branches/outcast/libs/js/nsprpub/config/nsprincl.sh.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/nsprincl.sh.in
   freeswitch/branches/outcast/libs/js/nsprpub/config/pathsub.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/pathsub.h
   freeswitch/branches/outcast/libs/js/nsprpub/config/prdepend.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/prdepend.h
   freeswitch/branches/outcast/libs/js/nsprpub/config/prmkdir.bat   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/prmkdir.bat
   freeswitch/branches/outcast/libs/js/nsprpub/config/rules.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/rules.mk
   freeswitch/branches/outcast/libs/js/nsprpub/config/system-headers
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/config/system-headers
   freeswitch/branches/outcast/libs/js/nsprpub/configure   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/configure
   freeswitch/branches/outcast/libs/js/nsprpub/configure.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/configure.in
   freeswitch/branches/outcast/libs/js/nsprpub/include/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/include/
   freeswitch/branches/outcast/libs/js/nsprpub/include/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/include/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/include/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/include/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/include/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/include/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/include/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/include/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/lib/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/MANIFEST
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/MANIFEST
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plarena.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plarena.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plarena.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plarena.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plarenas.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plarenas.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plds.def
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plds.def
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plds.rc
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plds.rc
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plds_symvec.opt
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plds_symvec.opt
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plhash.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plhash.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plhash.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plhash.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/ds/plvrsion.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/ds/plvrsion.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/README
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/README
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/MANIFEST
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/MANIFEST
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/README
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/README
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/plbase64.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plbase64.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/plerror.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plerror.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/plgetopt.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plgetopt.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/plresolv.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plresolv.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/include/plstr.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/include/plstr.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/README
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/README
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/base64.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/base64.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/plc.def
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plc.def
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/plc.rc
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plc.rc
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/plc_symvec.opt
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plc_symvec.opt
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/plerror.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plerror.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/plgetopt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plgetopt.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/plvrsion.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/plvrsion.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strcat.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcat.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strccmp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strccmp.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strchr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strchr.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strcmp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcmp.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strcpy.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcpy.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strcstr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strcstr.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strdup.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strdup.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strlen.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strlen.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strpbrk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strpbrk.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strstr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strstr.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/libc/src/strtok.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/libc/src/strtok.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/MANIFEST
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/MANIFEST
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/gcint.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/gcint.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/include/prgc.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/include/prgc.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/macgc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/macgc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/os2gc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/os2gc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/prgcapi.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/prgcapi.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/prmsgc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/prmsgc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/unixgc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/unixgc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/win16gc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/win16gc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/src/win32gc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/src/win32gc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/gc1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/gc1.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/msgc/tests/thrashgc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/msgc/tests/thrashgc.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/plvrsion.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/plvrsion.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/prstrms.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/prstrms.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/prstrms.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/prstrms.h
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/prstrms.rc
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/prstrms.rc
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/arena.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/arena.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/base64t.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/base64t.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/string.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/string.c
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/makefile
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/makefile
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/readme.1st
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/readme.1st
   freeswitch/branches/outcast/libs/js/nsprpub/lib/tests/windows/winevent.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/lib/tests/windows/winevent.c
   freeswitch/branches/outcast/libs/js/nsprpub/macbuild/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/macbuild/
   freeswitch/branches/outcast/libs/js/nsprpub/macbuild/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/macbuild/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/macbuild/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/macbuild/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/macbuild/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/macbuild/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/macbuild/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/macbuild/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/linux/sun-nspr.spec
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/linux/sun-nspr.spec
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/Makefile-devl.com   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile-devl.com
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/Makefile.com
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile.com
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/Makefile.targ
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/Makefile.targ
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnspr/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnsprx/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/depend
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/depend
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/depend   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/depend
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprdx/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/common_files/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/common_files/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/common_files/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/common_files/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/common_files/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/common_files/copyright
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/common_files/copyright
   freeswitch/branches/outcast/libs/js/nsprpub/pkg/solaris/proto64.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pkg/solaris/proto64.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/MANIFEST
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/MANIFEST
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/gencfg.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/gencfg.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_aix.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_aix.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_aix32.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_aix32.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_aix64.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_aix64.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_beos.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_beos.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_beos.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_beos.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_bsdi.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_bsdi.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_bsdi.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_bsdi.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_darwin.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_darwin.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_darwin.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_darwin.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_dgux.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_dgux.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_dgux.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_dgux.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_freebsd.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_freebsd.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_hpux.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_hpux.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_hpux32.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_hpux32.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_hpux64.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_hpux64.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_irix.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_irix.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_irix32.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_irix32.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_irix64.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_irix64.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_linux.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_linux.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_linux.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_linux.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_macos.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_macos.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_ncr.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_ncr.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_ncr.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_ncr.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nec.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nec.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nec.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nec.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_netbsd.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_netbsd.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_netbsd.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_netbsd.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nextstep.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nextstep.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nextstep.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nextstep.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nspr_pthread.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nspr_pthread.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nto.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nto.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_nto.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_nto.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_openbsd.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openbsd.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_openbsd.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openbsd.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_openvms.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openvms.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_openvms.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_openvms.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_os2.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_os2.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_os2.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_os2.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_os2_errors.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_os2_errors.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_osf1.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_osf1.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_osf1.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_osf1.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_pcos.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_pcos.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_pth.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_pth.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_qnx.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_qnx.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_qnx.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_qnx.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_reliantunix.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_reliantunix.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_reliantunix.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_reliantunix.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_rhapsody.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_rhapsody.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_rhapsody.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_rhapsody.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_riscos.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_riscos.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_riscos.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_riscos.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_scoos.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_scoos.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_scoos.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_scoos.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_solaris.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_solaris.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_solaris.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_solaris.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_sony.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sony.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_sony.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sony.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_sunos4.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sunos4.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_sunos4.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_sunos4.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_unix_errors.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unix_errors.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_unixos.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixos.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_unixware.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixware.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_unixware.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixware.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_unixware7.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_unixware7.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_win16.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win16.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_win16.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win16.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_win32_errors.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win32_errors.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_win95.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win95.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_win95.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_win95.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_winnt.cfg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_winnt.cfg
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/_winnt.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/_winnt.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/prosdep.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/prosdep.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/md/sunos4.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/md/sunos4.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/nspr.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/nspr.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/pralarm.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/pralarm.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/probslet.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/probslet.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/protypes.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/protypes.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/obsolete/prsem.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/obsolete/prsem.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/pratom.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/pratom.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prbit.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prbit.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prclist.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prclist.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prcmon.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prcmon.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prcountr.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prcountr.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prcvar.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prcvar.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prdtoa.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prdtoa.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prenv.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prenv.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prerr.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prerr.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prerror.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prerror.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prinet.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prinet.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prinit.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prinit.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prinrval.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prinrval.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prio.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prio.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/pripcsem.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/pripcsem.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/pprio.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/pprio.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/pprmwait.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/pprmwait.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/pprthred.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/pprthred.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/primpl.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/primpl.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/private/prpriv.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/private/prpriv.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prlink.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlink.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prlock.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlock.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prlog.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlog.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prlong.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prlong.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prmem.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prmem.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prmon.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prmon.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prmwait.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prmwait.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prnetdb.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prnetdb.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prolock.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prolock.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prpdce.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prpdce.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prprf.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prprf.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prproces.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prproces.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prrng.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prrng.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prrwlock.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prrwlock.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prshm.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prshm.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prshma.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prshma.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prsystem.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prsystem.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prthread.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prthread.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prtime.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtime.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prtpool.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtpool.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prtrace.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtrace.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prtypes.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prtypes.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prvrsion.h   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prvrsion.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/include/prwin16.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/include/prwin16.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/btcvar.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btcvar.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/btlocks.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btlocks.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/btmisc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btmisc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/btmon.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btmon.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/btsem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btsem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/btthread.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/btthread.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/bthreads/objs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/bthreads/objs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcascii.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcascii.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcbase.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcbase.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcbase.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcbase.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rccv.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rccv.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rccv.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rccv.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcfileio.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcfileio.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcinrval.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcinrval.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcio.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcio.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcio.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcio.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rclock.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rclock.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rclock.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rclock.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcmon.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcmon.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcnetdb.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetdb.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcnetio.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcnetio.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcthread.cpp   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcthread.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rcthread.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rcthread.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rctime.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rctime.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/rctime.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/rctime.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/time.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/time.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cthreads/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cthreads/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cthreads/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cthreads/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/cthreads/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prdir.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prdir.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prfdcach.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/priometh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/priometh.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/pripv6.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prlayer.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlayer.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prlog.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prmapopt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prmapopt.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prmmap.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prmmap.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prmwait.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prmwait.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prpolevt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prpolevt.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prprf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prprf.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prscanf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prscanf.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prsocket.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prsocket.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/io/prstdio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/io/prstdio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/linking/prlink.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/linking/prlink.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/prmalloc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmalloc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/malloc/prmem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bcpu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bcpu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/beos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/beos.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/beos_errors.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/beos_errors.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bmemory.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bmemory.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bmisc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bmisc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bmmap.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bmmap.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bnet.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bnet.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bproc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bproc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/brng.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/brng.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bseg.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bseg.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/btime.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/btime.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/beos/objs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/beos/objs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/MANIFEST
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/MANIFEST
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macdll.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macdll.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macdll.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macdll.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macio.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macio.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macrng.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macrng.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macsocket.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macsocket.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/macthr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/macthr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/mactime.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mactime.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/mactime.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mactime.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/mdmac.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdmac.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/mdmac.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/mdmac.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/objs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/objs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2_errors.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2_errors.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2cv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2cv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2emx.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2emx.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2gc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2gc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2inrval.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2inrval.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2io.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2io.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2misc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2misc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2poll.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2poll.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2rng.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2rng.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2sem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2sem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2sock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2sock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2thred.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2thred.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/prosdep.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/prosdep.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/aix.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/aix.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/aixwrap.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/aixwrap.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/bsdi.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/bsdi.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/darwin.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/darwin.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/dgux.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/dgux.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/freebsd.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/freebsd.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/hpux.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/hpux.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/irix.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/irix.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/linux.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/linux.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/ncr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/ncr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/nec.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/nec.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/netbsd.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/netbsd.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/nextstep.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/nextstep.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/nto.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/nto.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/objs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/openbsd.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/openbsd.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/openvms.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/openvms.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_AIX.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_AIX.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_Irix.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Irix.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/osf1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/osf1.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/qnx.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/qnx.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/reliantunix.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/reliantunix.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/rhapsody.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/rhapsody.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/riscos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/riscos.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/scoos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/scoos.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/solaris.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/solaris.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/sony.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/sony.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/sunos4.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/sunos4.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/unix.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/unix.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/unix_errors.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/unix_errors.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/unixware.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/unixware.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/uxpoll.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxpoll.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/uxproces.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxproces.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/uxrng.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxrng.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/uxshm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxshm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/unix/uxwrap.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/uxwrap.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntgc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntgc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntinrval.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntinrval.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntmisc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntmisc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntsec.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntsec.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntsem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntsem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/ntthread.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/ntthread.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/objs.mk
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/objs.mk
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16callb.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16callb.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16error.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16error.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16fmem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16fmem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16gc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16gc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16io.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16io.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16mem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16mem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16null.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16null.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16proc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16proc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16sock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16sock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16stdio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16stdio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w16thred.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w16thred.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w32poll.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32poll.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w32rng.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32rng.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w32shm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w32shm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w95cv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95cv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w95io.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95io.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w95sock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95sock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/w95thred.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/w95thred.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/md/windows/win32_errors.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/md/windows/win32_errors.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/prgcleak.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prgcleak.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/prseg.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prseg.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/prshm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prshm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/memory/prshma.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/memory/prshma.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/compile-et.pl
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/compile-et.pl
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/pralarm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pralarm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/pratom.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pratom.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prcountr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prcountr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prdtoa.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prdtoa.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prenv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prenv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prerr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prerr.et
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerr.et
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prerr.properties
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerr.properties
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prerror.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerror.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prerrortable.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prerrortable.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prinit.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prinrval.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinrval.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/pripc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pripc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/pripcsem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pripcsem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prlog2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prlog2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prlong.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prlong.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prnetdb.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prnetdb.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prolock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prolock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prrng.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prrng.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prsystem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prsystem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prthinfo.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prthinfo.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prtime.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prtime.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prtpool.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prtpool.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/misc/prtrace.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prtrace.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/nspr.def
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/nspr.def
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/nspr.rc
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/nspr.rc
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/nspr_symvec.opt
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/nspr_symvec.opt
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/os2extra.def
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/os2extra.def
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/prvrsion.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/prvrsion.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/ptio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/ptmisc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptmisc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/ptsynch.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptsynch.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/pthreads/ptthread.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/README
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/README
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/prucpu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prucpu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/prucv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prucv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/prulock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prulock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/prustack.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/prustack.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/combined/pruthr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/combined/pruthr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prcmon.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prcmon.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prcthr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prcthr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prdump.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prdump.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prmon.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prmon.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prrwlock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prrwlock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prsem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prsem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/src/threads/prtpd.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/src/threads/prtpd.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/CVS/Entries.Log
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/CVS/Entries.Log
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/README.TXT
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/README.TXT
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/accept.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/accept.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/acceptread.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/acceptread.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/acceptreademu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/acceptreademu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/addrstr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/addrstr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/affinity.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/affinity.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/alarm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/alarm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/anonfm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/anonfm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/append.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/append.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/atomic.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/atomic.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/attach.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/attach.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/bigfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bigfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/bigfile2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bigfile2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/bigfile3.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bigfile3.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/bug1test.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/bug1test.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/cleanup.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cleanup.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/cltsrv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cltsrv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/concur.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/concur.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/cvar.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cvar.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/cvar2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/cvar2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dbmalloc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dbmalloc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dbmalloc1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dbmalloc1.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dceemu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dceemu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/depend.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/depend.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/my.def
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/my.def
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/mygetval.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/mygetval.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dll/mysetval.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dll/mysetval.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dlltest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dlltest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/dtoa.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/dtoa.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/env.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/env.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/errcodes.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/errcodes.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/errset.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/errset.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/exit.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/exit.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/fdcach.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/fdcach.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/fileio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/fileio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/foreign.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/foreign.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/forktest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/forktest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/formattm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/formattm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/freeif.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/freeif.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/fsync.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/fsync.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/getai.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/getai.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/gethost.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/gethost.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/getproto.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/getproto.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/i2l.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/i2l.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/initclk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/initclk.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/inrval.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/inrval.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/instrumt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/instrumt.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/intrio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/intrio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/intrupt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/intrupt.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/io_timeout.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/io_timeout.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/io_timeoutk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/io_timeoutk.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/io_timeoutu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/io_timeoutu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/ioconthr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ioconthr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/ipv6.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ipv6.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/join.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/join.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/joinkk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinkk.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/joinku.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinku.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/joinuk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinuk.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/joinuu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/joinuu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/layer.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/layer.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/lazyinit.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lazyinit.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/libfilename.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/libfilename.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/lltest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lltest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/lock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/lockfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/lockfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/logger.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/logger.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/macbuild/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/macbuild/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/macbuild/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/macbuild/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/macbuild/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/makedir.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/makedir.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/many_cv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/many_cv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/mbcs.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/mbcs.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/multiacc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/multiacc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/multiwait.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/multiwait.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/nameshm1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nameshm1.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/nbconn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nbconn.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/nblayer.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nblayer.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/nonblock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/nonblock.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/ntioto.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ntioto.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/ntoh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ntoh.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/obsints.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/obsints.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/op_2long.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_2long.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/op_excl.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_excl.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/op_filnf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_filnf.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/op_filok.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_filok.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/op_noacc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_noacc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/op_nofil.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/op_nofil.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/openfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/openfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/parent.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/parent.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/peek.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/peek.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/perf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/perf.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/pipeping.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipeping.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/pipeping2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipeping2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/pipepong.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipepong.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/pipepong2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipepong2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/pipeself.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pipeself.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/poll_er.c   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/poll_er.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/poll_nm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/poll_nm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/poll_to.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/poll_to.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/pollable.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/pollable.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prftest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prftest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prftest1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prftest1.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prftest2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prftest2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/primblok.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/primblok.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/priotest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/priotest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/provider.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/provider.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prpoll.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prpoll.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prpollml.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prpollml.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prselect.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prselect.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/prttools.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/prttools.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/randseed.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/randseed.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/ranfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ranfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/rmdir.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/rmdir.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/runtests.ksh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/runtests.ksh
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/runtests.sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/runtests.sh
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/runy2ktests.ksh
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/runy2ktests.ksh
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/rwlocktest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/rwlocktest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sel_spd.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sel_spd.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/selct_er.c   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selct_er.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/selct_nm.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selct_nm.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/selct_to.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selct_to.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/select2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/select2.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/selintr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/selintr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sem.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sem.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sema.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sema.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/semaerr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semaerr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/semaerr1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semaerr1.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/semaping.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semaping.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/semapong.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/semapong.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sendzlf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sendzlf.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/server_test.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/server_test.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/servr_kk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_kk.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/servr_ku.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_ku.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/servr_uk.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_uk.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/servr_uu.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/servr_uu.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/short_thread.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/short_thread.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sigpipe.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sigpipe.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sleep.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sleep.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/socket.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/socket.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sockopt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sockopt.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sockping.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sockping.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sockpong.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sockpong.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sprintf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sprintf.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sproc_ch.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sproc_ch.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/sproc_p.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/sproc_p.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/stack.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/stack.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/stat.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/stat.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/stdio.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/stdio.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/str2addr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/str2addr.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/strod.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/strod.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/suspend.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/suspend.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/switch.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/switch.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/system.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/system.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/testbit.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/testbit.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/testfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/testfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/threads.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/threads.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/thrpool_client.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/thrpool_client.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/thrpool_server.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/thrpool_server.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/thruput.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/thruput.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/time.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/time.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/timemac.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/timemac.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/timetest.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/timetest.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/tmoacc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/tmoacc.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/tmocon.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/tmocon.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/tpd.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/tpd.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/udpsrv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/udpsrv.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/ut_ttools.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/ut_ttools.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/vercheck.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/vercheck.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/version.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/version.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/popfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popfile.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/popfind.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popfind.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/popfont.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popfont.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/poppad.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/poppad.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.h
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/poppad.ico   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.ico
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/poppad.rc
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/poppad.rc
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/w16gui/readme.1st
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/w16gui/readme.1st
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/writev.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/writev.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/xnotify.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/xnotify.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/y2k.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/y2k.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/y2ktmo.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/y2ktmo.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/yield.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/yield.c
   freeswitch/branches/outcast/libs/js/nsprpub/pr/tests/zerolen.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/pr/tests/zerolen.c
   freeswitch/branches/outcast/libs/js/nsprpub/tools/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/
   freeswitch/branches/outcast/libs/js/nsprpub/tools/.cvsignore
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/.cvsignore
   freeswitch/branches/outcast/libs/js/nsprpub/tools/CVS/
      - copied from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/CVS/
   freeswitch/branches/outcast/libs/js/nsprpub/tools/CVS/Entries
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/CVS/Entries
   freeswitch/branches/outcast/libs/js/nsprpub/tools/CVS/Repository
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/CVS/Repository
   freeswitch/branches/outcast/libs/js/nsprpub/tools/CVS/Root
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/CVS/Root
   freeswitch/branches/outcast/libs/js/nsprpub/tools/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/Makefile.in
   freeswitch/branches/outcast/libs/js/nsprpub/tools/httpget.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/httpget.c
   freeswitch/branches/outcast/libs/js/nsprpub/tools/tail.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/nsprpub/tools/tail.c
   freeswitch/branches/outcast/libs/js/shtool   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/shtool
   freeswitch/branches/outcast/libs/js/src/
      - copied from r3697, /freeswitch/trunk/libs/js/src/
   freeswitch/branches/outcast/libs/js/src/fdlibm/
      - copied from r3697, /freeswitch/trunk/libs/js/src/fdlibm/
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_acos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_acos.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_acosh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_acosh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_asin.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_asin.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_atan2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_atan2.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_atanh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_atanh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_cosh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_cosh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_exp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_exp.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_fmod.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_fmod.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_gamma.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_gamma.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_gamma_r.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_gamma_r.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_hypot.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_hypot.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_j0.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_j0.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_j1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_j1.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_jn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_jn.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_lgamma.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_lgamma.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_lgamma_r.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_lgamma_r.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_log.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_log.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_log10.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_log10.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_pow.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_pow.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_rem_pio2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_rem_pio2.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_remainder.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_remainder.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_scalb.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_scalb.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_sinh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_sinh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/e_sqrt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/e_sqrt.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/fdlibm.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/fdlibm.h
   freeswitch/branches/outcast/libs/js/src/fdlibm/k_cos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/k_cos.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/k_rem_pio2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/k_rem_pio2.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/k_sin.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/k_sin.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/k_standard.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/k_standard.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/k_tan.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/k_tan.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_asinh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_asinh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_atan.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_atan.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_cbrt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_cbrt.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_ceil.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_ceil.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_copysign.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_copysign.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_cos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_cos.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_erf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_erf.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_expm1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_expm1.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_fabs.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_fabs.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_finite.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_finite.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_floor.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_floor.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_frexp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_frexp.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_ilogb.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_ilogb.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_isnan.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_isnan.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_ldexp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_ldexp.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_lib_version.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_lib_version.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_log1p.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_log1p.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_logb.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_logb.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_matherr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_matherr.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_modf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_modf.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_nextafter.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_nextafter.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_rint.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_rint.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_scalbn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_scalbn.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_signgam.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_signgam.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_significand.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_significand.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_sin.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_sin.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_tan.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_tan.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/s_tanh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/s_tanh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_acos.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_acos.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_acosh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_acosh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_asin.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_asin.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_atan2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_atan2.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_atanh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_atanh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_cosh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_cosh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_exp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_exp.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_fmod.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_fmod.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_gamma.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_gamma.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_gamma_r.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_gamma_r.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_hypot.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_hypot.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_j0.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_j0.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_j1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_j1.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_jn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_jn.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_lgamma.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_lgamma.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_lgamma_r.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_lgamma_r.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_log.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_log.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_log10.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_log10.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_pow.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_pow.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_remainder.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_remainder.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_scalb.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_scalb.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_sinh.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_sinh.c
   freeswitch/branches/outcast/libs/js/src/fdlibm/w_sqrt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/fdlibm/w_sqrt.c
   freeswitch/branches/outcast/libs/js/src/js.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/js.c
   freeswitch/branches/outcast/libs/js/src/js.msg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/js.msg
   freeswitch/branches/outcast/libs/js/src/jsapi.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsapi.c
   freeswitch/branches/outcast/libs/js/src/jsapi.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsapi.h
   freeswitch/branches/outcast/libs/js/src/jsarena.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsarena.c
   freeswitch/branches/outcast/libs/js/src/jsarena.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsarena.h
   freeswitch/branches/outcast/libs/js/src/jsarray.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsarray.c
   freeswitch/branches/outcast/libs/js/src/jsarray.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsarray.h
   freeswitch/branches/outcast/libs/js/src/jsatom.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsatom.c
   freeswitch/branches/outcast/libs/js/src/jsatom.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsatom.h
   freeswitch/branches/outcast/libs/js/src/jsautocfg.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsautocfg.h
   freeswitch/branches/outcast/libs/js/src/jsbit.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsbit.h
   freeswitch/branches/outcast/libs/js/src/jsbool.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsbool.c
   freeswitch/branches/outcast/libs/js/src/jsbool.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsbool.h
   freeswitch/branches/outcast/libs/js/src/jsclist.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsclist.h
   freeswitch/branches/outcast/libs/js/src/jscntxt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jscntxt.c
   freeswitch/branches/outcast/libs/js/src/jscntxt.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jscntxt.h
   freeswitch/branches/outcast/libs/js/src/jscompat.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jscompat.h
   freeswitch/branches/outcast/libs/js/src/jsconfig.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsconfig.h
   freeswitch/branches/outcast/libs/js/src/jscpucfg.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jscpucfg.c
   freeswitch/branches/outcast/libs/js/src/jscpucfg.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jscpucfg.h
   freeswitch/branches/outcast/libs/js/src/jsdate.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdate.c
   freeswitch/branches/outcast/libs/js/src/jsdate.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdate.h
   freeswitch/branches/outcast/libs/js/src/jsdbgapi.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdbgapi.c
   freeswitch/branches/outcast/libs/js/src/jsdbgapi.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdbgapi.h
   freeswitch/branches/outcast/libs/js/src/jsdhash.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdhash.c
   freeswitch/branches/outcast/libs/js/src/jsdhash.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdhash.h
   freeswitch/branches/outcast/libs/js/src/jsdso.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdso.c
   freeswitch/branches/outcast/libs/js/src/jsdso.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdso.h
   freeswitch/branches/outcast/libs/js/src/jsdtoa.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdtoa.c
   freeswitch/branches/outcast/libs/js/src/jsdtoa.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsdtoa.h
   freeswitch/branches/outcast/libs/js/src/jsemit.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsemit.c
   freeswitch/branches/outcast/libs/js/src/jsemit.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsemit.h
   freeswitch/branches/outcast/libs/js/src/jsexn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsexn.c
   freeswitch/branches/outcast/libs/js/src/jsexn.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsexn.h
   freeswitch/branches/outcast/libs/js/src/jsfile.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsfile.c
   freeswitch/branches/outcast/libs/js/src/jsfile.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsfile.h
   freeswitch/branches/outcast/libs/js/src/jsfile.msg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsfile.msg
   freeswitch/branches/outcast/libs/js/src/jsfun.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsfun.c
   freeswitch/branches/outcast/libs/js/src/jsfun.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsfun.h
   freeswitch/branches/outcast/libs/js/src/jsgc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsgc.c
   freeswitch/branches/outcast/libs/js/src/jsgc.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsgc.h
   freeswitch/branches/outcast/libs/js/src/jshash.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jshash.c
   freeswitch/branches/outcast/libs/js/src/jshash.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jshash.h
   freeswitch/branches/outcast/libs/js/src/jsinterp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsinterp.c
   freeswitch/branches/outcast/libs/js/src/jsinterp.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsinterp.h
   freeswitch/branches/outcast/libs/js/src/jslibmath.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jslibmath.h
   freeswitch/branches/outcast/libs/js/src/jslock.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jslock.c
   freeswitch/branches/outcast/libs/js/src/jslock.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jslock.h
   freeswitch/branches/outcast/libs/js/src/jslog2.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jslog2.c
   freeswitch/branches/outcast/libs/js/src/jslong.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jslong.c
   freeswitch/branches/outcast/libs/js/src/jslong.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jslong.h
   freeswitch/branches/outcast/libs/js/src/jsmath.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsmath.c
   freeswitch/branches/outcast/libs/js/src/jsmath.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsmath.h
   freeswitch/branches/outcast/libs/js/src/jsnum.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsnum.c
   freeswitch/branches/outcast/libs/js/src/jsnum.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsnum.h
   freeswitch/branches/outcast/libs/js/src/jsobj.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsobj.c
   freeswitch/branches/outcast/libs/js/src/jsobj.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsobj.h
   freeswitch/branches/outcast/libs/js/src/jsopcode.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsopcode.c
   freeswitch/branches/outcast/libs/js/src/jsopcode.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsopcode.h
   freeswitch/branches/outcast/libs/js/src/jsopcode.tbl
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsopcode.tbl
   freeswitch/branches/outcast/libs/js/src/jsosdep.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsosdep.h
   freeswitch/branches/outcast/libs/js/src/jsotypes.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsotypes.h
   freeswitch/branches/outcast/libs/js/src/jsparse.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsparse.c
   freeswitch/branches/outcast/libs/js/src/jsparse.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsparse.h
   freeswitch/branches/outcast/libs/js/src/jsprf.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsprf.c
   freeswitch/branches/outcast/libs/js/src/jsprf.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsprf.h
   freeswitch/branches/outcast/libs/js/src/jsprvtd.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsprvtd.h
   freeswitch/branches/outcast/libs/js/src/jspubtd.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jspubtd.h
   freeswitch/branches/outcast/libs/js/src/jsregexp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsregexp.c
   freeswitch/branches/outcast/libs/js/src/jsregexp.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsregexp.h
   freeswitch/branches/outcast/libs/js/src/jsscan.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsscan.c
   freeswitch/branches/outcast/libs/js/src/jsscan.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsscan.h
   freeswitch/branches/outcast/libs/js/src/jsscope.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsscope.c
   freeswitch/branches/outcast/libs/js/src/jsscope.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsscope.h
   freeswitch/branches/outcast/libs/js/src/jsscript.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsscript.c
   freeswitch/branches/outcast/libs/js/src/jsscript.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsscript.h
   freeswitch/branches/outcast/libs/js/src/jsshell.msg
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsshell.msg
   freeswitch/branches/outcast/libs/js/src/jsstddef.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsstddef.h
   freeswitch/branches/outcast/libs/js/src/jsstr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsstr.c
   freeswitch/branches/outcast/libs/js/src/jsstr.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsstr.h
   freeswitch/branches/outcast/libs/js/src/jstypes.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jstypes.h
   freeswitch/branches/outcast/libs/js/src/jsutil.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsutil.c
   freeswitch/branches/outcast/libs/js/src/jsutil.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsutil.h
   freeswitch/branches/outcast/libs/js/src/jsxdrapi.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsxdrapi.c
   freeswitch/branches/outcast/libs/js/src/jsxdrapi.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsxdrapi.h
   freeswitch/branches/outcast/libs/js/src/jsxml.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsxml.c
   freeswitch/branches/outcast/libs/js/src/jsxml.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/jsxml.h
   freeswitch/branches/outcast/libs/js/src/perlconnect/
      - copied from r3697, /freeswitch/trunk/libs/js/src/perlconnect/
   freeswitch/branches/outcast/libs/js/src/perlconnect/JS.pm
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/JS.pm
   freeswitch/branches/outcast/libs/js/src/perlconnect/JS.xs
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/JS.xs
   freeswitch/branches/outcast/libs/js/src/perlconnect/MANIFEST
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/MANIFEST
   freeswitch/branches/outcast/libs/js/src/perlconnect/Makefile.PL.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/Makefile.PL.in
   freeswitch/branches/outcast/libs/js/src/perlconnect/PerlConnect.pm
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/PerlConnect.pm
   freeswitch/branches/outcast/libs/js/src/perlconnect/jsperl.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/jsperl.c
   freeswitch/branches/outcast/libs/js/src/perlconnect/jsperl.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/jsperl.h
   freeswitch/branches/outcast/libs/js/src/perlconnect/jsperlpvt.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/jsperlpvt.h
   freeswitch/branches/outcast/libs/js/src/perlconnect/typemap
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/perlconnect/typemap
   freeswitch/branches/outcast/libs/js/src/prmjtime.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/prmjtime.c
   freeswitch/branches/outcast/libs/js/src/prmjtime.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/js/src/prmjtime.h
   freeswitch/branches/outcast/libs/libdingaling/.update
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/.update
   freeswitch/branches/outcast/libs/libdingaling/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/acsite.m4
   freeswitch/branches/outcast/libs/libdingaling/build/
      - copied from r3697, /freeswitch/trunk/libs/libdingaling/build/
   freeswitch/branches/outcast/libs/libdingaling/build/compile   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/compile
   freeswitch/branches/outcast/libs/libdingaling/build/config/
      - copied from r3697, /freeswitch/trunk/libs/libdingaling/build/config/
   freeswitch/branches/outcast/libs/libdingaling/build/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config.guess
   freeswitch/branches/outcast/libs/libdingaling/build/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config.sub
   freeswitch/branches/outcast/libs/libdingaling/build/config/ac_cflags_gcc_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ac_cflags_gcc_option.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ac_cflags_sun_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ac_cflags_sun_option.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ac_gcc_archflag.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ac_gcc_archflag.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ac_gcc_x86_cpuid.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ac_gcc_x86_cpuid.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ac_prog_gzip.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ac_prog_gzip.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ac_prog_wget.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ac_prog_wget.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ax_cc_maxopt.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ax_cc_maxopt.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ax_cflags_warn_all_ansi.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ax_cflags_warn_all_ansi.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ax_check_compiler_flags.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ax_check_compiler_flags.m4
   freeswitch/branches/outcast/libs/libdingaling/build/config/ax_compiler_vendor.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/config/ax_compiler_vendor.m4
   freeswitch/branches/outcast/libs/libdingaling/build/depcomp   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/depcomp
   freeswitch/branches/outcast/libs/libdingaling/build/install-sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/install-sh
   freeswitch/branches/outcast/libs/libdingaling/build/ltmain.sh
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/ltmain.sh
   freeswitch/branches/outcast/libs/libdingaling/build/missing   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/build/missing
   freeswitch/branches/outcast/libs/libdingaling/src/config.h.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/src/config.h.in
   freeswitch/branches/outcast/libs/libdingaling/src/sha1.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/src/sha1.c
   freeswitch/branches/outcast/libs/libdingaling/src/sha1.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/libdingaling/src/sha1.h
   freeswitch/branches/outcast/libs/libspeakup/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/libspeakup/acsite.m4
   freeswitch/branches/outcast/libs/srtp/AUTHORS
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/AUTHORS
   freeswitch/branches/outcast/libs/srtp/COPYING
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/COPYING
   freeswitch/branches/outcast/libs/srtp/ChangeLog
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/ChangeLog
   freeswitch/branches/outcast/libs/srtp/INSTALL
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/INSTALL
   freeswitch/branches/outcast/libs/srtp/Makefile.am
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/Makefile.am
   freeswitch/branches/outcast/libs/srtp/NEWS
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/NEWS
   freeswitch/branches/outcast/libs/srtp/aclocal.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/aclocal.m4
   freeswitch/branches/outcast/libs/srtp/acsite.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/acsite.m4
   freeswitch/branches/outcast/libs/srtp/build/
      - copied from r3697, /freeswitch/trunk/libs/srtp/build/
   freeswitch/branches/outcast/libs/srtp/build/config/
      - copied from r3697, /freeswitch/trunk/libs/srtp/build/config/
   freeswitch/branches/outcast/libs/srtp/build/config.guess   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config.guess
   freeswitch/branches/outcast/libs/srtp/build/config.sub   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config.sub
   freeswitch/branches/outcast/libs/srtp/build/config/ac_cflags_gcc_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ac_cflags_gcc_option.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ac_cflags_sun_option.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ac_cflags_sun_option.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ac_gcc_archflag.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ac_gcc_archflag.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ac_gcc_x86_cpuid.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ac_gcc_x86_cpuid.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ac_prog_gzip.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ac_prog_gzip.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ac_prog_wget.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ac_prog_wget.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ax_cc_maxopt.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ax_cc_maxopt.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ax_cflags_warn_all_ansi.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ax_cflags_warn_all_ansi.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ax_check_compiler_flags.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ax_check_compiler_flags.m4
   freeswitch/branches/outcast/libs/srtp/build/config/ax_compiler_vendor.m4
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/config/ax_compiler_vendor.m4
   freeswitch/branches/outcast/libs/srtp/build/depcomp   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/depcomp
   freeswitch/branches/outcast/libs/srtp/build/install-sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/install-sh
   freeswitch/branches/outcast/libs/srtp/build/ltmain.sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/ltmain.sh
   freeswitch/branches/outcast/libs/srtp/build/missing   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/build/missing
   freeswitch/branches/outcast/libs/srtp/srtp-1.42.pc.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/srtp-1.42.pc.in
   freeswitch/branches/outcast/libs/srtp/test/Makefile.am
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/test/Makefile.am
   freeswitch/branches/outcast/libs/srtp/test/Makefile.in
      - copied unchanged from r3697, /freeswitch/trunk/libs/srtp/test/Makefile.in
   freeswitch/branches/outcast/libs/udns/
      - copied from r3697, /freeswitch/trunk/libs/udns/
   freeswitch/branches/outcast/libs/udns.build.sh   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns.build.sh
   freeswitch/branches/outcast/libs/udns/COPYING.LGPL
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/COPYING.LGPL
   freeswitch/branches/outcast/libs/udns/Makefile   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/Makefile
   freeswitch/branches/outcast/libs/udns/NOTES
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/NOTES
   freeswitch/branches/outcast/libs/udns/TODO
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/TODO
   freeswitch/branches/outcast/libs/udns/debian/
      - copied from r3697, /freeswitch/trunk/libs/udns/debian/
   freeswitch/branches/outcast/libs/udns/debian/changelog
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/debian/changelog
   freeswitch/branches/outcast/libs/udns/debian/control
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/debian/control
   freeswitch/branches/outcast/libs/udns/debian/copyright
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/debian/copyright
   freeswitch/branches/outcast/libs/udns/debian/rules   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/debian/rules
   freeswitch/branches/outcast/libs/udns/dnsget.1
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/dnsget.1
   freeswitch/branches/outcast/libs/udns/dnsget.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/dnsget.c
   freeswitch/branches/outcast/libs/udns/ex-rdns.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/ex-rdns.c
   freeswitch/branches/outcast/libs/udns/inet_pton.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/inet_pton.c
   freeswitch/branches/outcast/libs/udns/inet_pton.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/inet_pton.h
   freeswitch/branches/outcast/libs/udns/rblcheck.1
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/rblcheck.1
   freeswitch/branches/outcast/libs/udns/rblcheck.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/rblcheck.c
   freeswitch/branches/outcast/libs/udns/udns.3
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns.3
   freeswitch/branches/outcast/libs/udns/udns.h
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns.h
   freeswitch/branches/outcast/libs/udns/udns_bl.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_bl.c
   freeswitch/branches/outcast/libs/udns/udns_codes.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_codes.c
   freeswitch/branches/outcast/libs/udns/udns_dn.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_dn.c
   freeswitch/branches/outcast/libs/udns/udns_dntosp.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_dntosp.c
   freeswitch/branches/outcast/libs/udns/udns_misc.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_misc.c
   freeswitch/branches/outcast/libs/udns/udns_parse.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_parse.c
   freeswitch/branches/outcast/libs/udns/udns_resolver.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_resolver.c
   freeswitch/branches/outcast/libs/udns/udns_rr_a.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_rr_a.c
   freeswitch/branches/outcast/libs/udns/udns_rr_mx.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_rr_mx.c
   freeswitch/branches/outcast/libs/udns/udns_rr_naptr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_rr_naptr.c
   freeswitch/branches/outcast/libs/udns/udns_rr_ptr.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_rr_ptr.c
   freeswitch/branches/outcast/libs/udns/udns_rr_srv.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_rr_srv.c
   freeswitch/branches/outcast/libs/udns/udns_rr_txt.c
      - copied unchanged from r3697, /freeswitch/trunk/libs/udns/udns_rr_txt.c
   freeswitch/branches/outcast/libs/win32/Download ETPAN.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/libs/win32/Download ETPAN.vcproj
   freeswitch/branches/outcast/libs/win32/etpan/
      - copied from r3697, /freeswitch/trunk/libs/win32/etpan/
   freeswitch/branches/outcast/libs/win32/etpan/cleancount
      - copied unchanged from r3697, /freeswitch/trunk/libs/win32/etpan/cleancount
   freeswitch/branches/outcast/libs/win32/etpan/libetpan.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/libs/win32/etpan/libetpan.vcproj
   freeswitch/branches/outcast/libs/win32/udns/
      - copied from r3697, /freeswitch/trunk/libs/win32/udns/
   freeswitch/branches/outcast/libs/win32/udns/libudns.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/libs/win32/udns/libudns.vcproj
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/
      - copied from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/CHANGES
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/CHANGES
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/INSTALL
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/INSTALL
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/LICENSE
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/LICENSE
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/Makefile.PL
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/Makefile.PL
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/README
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/README
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/TODO
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/TODO
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/examples/
      - copied from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/examples/
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/examples/fsconsole.pl
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/examples/fsconsole.pl
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/examples/poetest.pl
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/examples/poetest.pl
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/lib/
      - copied from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/lib/
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/lib/POE/
      - copied from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/lib/POE/
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/lib/POE/Filter/
      - copied from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/lib/POE/Filter/
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/lib/POE/Filter/FSSocket.pm   (props changed)
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/lib/POE/Filter/FSSocket.pm
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/t/
      - copied from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/t/
   freeswitch/branches/outcast/scripts/POE-Filter-FSSocket/t/01_basic.t
      - copied unchanged from r3697, /freeswitch/trunk/scripts/POE-Filter-FSSocket/t/01_basic.t
   freeswitch/branches/outcast/scripts/js_modules/
      - copied from r3697, /freeswitch/trunk/scripts/js_modules/
   freeswitch/branches/outcast/scripts/js_modules/SpeechTools.jm
      - copied unchanged from r3697, /freeswitch/trunk/scripts/js_modules/SpeechTools.jm
   freeswitch/branches/outcast/scripts/mytest.py
      - copied unchanged from r3697, /freeswitch/trunk/scripts/mytest.py
   freeswitch/branches/outcast/scripts/socket/fsconsole.pl
      - copied unchanged from r3697, /freeswitch/trunk/scripts/socket/fsconsole.pl
   freeswitch/branches/outcast/src/mod/applications/mod_enum/
      - copied from r3697, /freeswitch/trunk/src/mod/applications/mod_enum/
   freeswitch/branches/outcast/src/mod/applications/mod_enum/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/applications/mod_enum/Makefile
   freeswitch/branches/outcast/src/mod/applications/mod_enum/mod_enum.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c
   freeswitch/branches/outcast/src/mod/applications/mod_enum/mod_enum.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/odbccdr.cpp
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/odbccdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/odbccdr.h
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/odbccdr.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/schema-update.odbc
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema-update.odbc
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/xmlcdr.cpp
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/xmlcdr.h
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey/sm.mak
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_core_db/   (props changed)
      - copied from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_core_db/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_etpan/
      - copied from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_etpan/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_odbc/
      - copied from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_odbc/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_skel/   (props changed)
      - copied from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_skel/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_teletone/   (props changed)
      - copied from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_teletone/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
   freeswitch/branches/outcast/src/mod/xml_int/mod_xml_curl/
      - copied from r3697, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/
   freeswitch/branches/outcast/src/mod/xml_int/mod_xml_curl/Makefile
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile
   freeswitch/branches/outcast/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
   freeswitch/branches/outcast/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
      - copied unchanged from r3697, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
Removed:
   freeswitch/branches/outcast/libs/codec/g7xx/compile
   freeswitch/branches/outcast/libs/codec/g7xx/config.guess
   freeswitch/branches/outcast/libs/codec/g7xx/config.sub
   freeswitch/branches/outcast/libs/codec/g7xx/configure.scan
   freeswitch/branches/outcast/libs/codec/g7xx/depcomp
   freeswitch/branches/outcast/libs/codec/g7xx/install-sh
   freeswitch/branches/outcast/libs/codec/g7xx/ltmain.sh
   freeswitch/branches/outcast/libs/codec/g7xx/missing
   freeswitch/branches/outcast/libs/codec/ilbc/compile
   freeswitch/branches/outcast/libs/codec/ilbc/config.guess
   freeswitch/branches/outcast/libs/codec/ilbc/config.sub
   freeswitch/branches/outcast/libs/codec/ilbc/depcomp
   freeswitch/branches/outcast/libs/codec/ilbc/install-sh
   freeswitch/branches/outcast/libs/codec/ilbc/ltmain.sh
   freeswitch/branches/outcast/libs/codec/ilbc/missing
   freeswitch/branches/outcast/libs/iax/.cvsignore
   freeswitch/branches/outcast/libs/iax/config.guess
   freeswitch/branches/outcast/libs/iax/config.sub
   freeswitch/branches/outcast/libs/iax/depcomp
   freeswitch/branches/outcast/libs/iax/install-sh
   freeswitch/branches/outcast/libs/iax/ltmain.sh
   freeswitch/branches/outcast/libs/iax/missing
   freeswitch/branches/outcast/libs/libresample/libtool
   freeswitch/branches/outcast/libs/libresample/src/config.h
   freeswitch/branches/outcast/libs/libspeakup/compile
   freeswitch/branches/outcast/libs/libspeakup/config.guess
   freeswitch/branches/outcast/libs/libspeakup/config.sub
   freeswitch/branches/outcast/libs/libspeakup/depcomp
   freeswitch/branches/outcast/libs/libspeakup/install-sh
   freeswitch/branches/outcast/libs/libspeakup/ltmain.sh
   freeswitch/branches/outcast/libs/libspeakup/missing
   freeswitch/branches/outcast/libs/libspeakup/mkinstalldirs
   freeswitch/branches/outcast/libs/libteletone/mkinstalldirs
   freeswitch/branches/outcast/mkinstalldirs
   freeswitch/branches/outcast/src/mod/applications/mod_hello/
Modified:
   freeswitch/branches/outcast/   (props changed)
   freeswitch/branches/outcast/.indent.pro
   freeswitch/branches/outcast/AUTHORS
   freeswitch/branches/outcast/Freeswitch.sln
   freeswitch/branches/outcast/INSTALL
   freeswitch/branches/outcast/Makefile.am
   freeswitch/branches/outcast/Makefile.in
   freeswitch/branches/outcast/README
   freeswitch/branches/outcast/aclocal.m4
   freeswitch/branches/outcast/build/buildlib.sh
   freeswitch/branches/outcast/build/config/compile
   freeswitch/branches/outcast/build/config/config.guess
   freeswitch/branches/outcast/build/config/config.sub
   freeswitch/branches/outcast/build/config/depcomp
   freeswitch/branches/outcast/build/config/install-sh
   freeswitch/branches/outcast/build/config/ltmain.sh
   freeswitch/branches/outcast/build/config/missing
   freeswitch/branches/outcast/conf/freeswitch.xml
   freeswitch/branches/outcast/configure
   freeswitch/branches/outcast/configure.in
   freeswitch/branches/outcast/generic_mod.mk
   freeswitch/branches/outcast/indent_options.sh
   freeswitch/branches/outcast/libs/   (props changed)
   freeswitch/branches/outcast/libs/codec/g726/libg726.vcproj
   freeswitch/branches/outcast/libs/codec/g7xx/INSTALL
   freeswitch/branches/outcast/libs/codec/g7xx/Makefile.am
   freeswitch/branches/outcast/libs/codec/g7xx/Makefile.in
   freeswitch/branches/outcast/libs/codec/g7xx/aclocal.m4
   freeswitch/branches/outcast/libs/codec/g7xx/configure
   freeswitch/branches/outcast/libs/codec/g7xx/configure.in
   freeswitch/branches/outcast/libs/codec/gsm/inc/private.h
   freeswitch/branches/outcast/libs/codec/gsm/libgsm.vcproj
   freeswitch/branches/outcast/libs/codec/gsm/src/add.c
   freeswitch/branches/outcast/libs/codec/gsm/src/gsm_encode.c
   freeswitch/branches/outcast/libs/codec/gsm/src/long_term.c
   freeswitch/branches/outcast/libs/codec/gsm/src/preprocess.c
   freeswitch/branches/outcast/libs/codec/gsm/src/rpe.c
   freeswitch/branches/outcast/libs/codec/gsm/src/short_term.c
   freeswitch/branches/outcast/libs/codec/ilbc/Makefile.am
   freeswitch/branches/outcast/libs/codec/ilbc/Makefile.in
   freeswitch/branches/outcast/libs/codec/ilbc/aclocal.m4
   freeswitch/branches/outcast/libs/codec/ilbc/configure
   freeswitch/branches/outcast/libs/codec/ilbc/configure.in
   freeswitch/branches/outcast/libs/iax/Makefile.in
   freeswitch/branches/outcast/libs/iax/aclocal.m4
   freeswitch/branches/outcast/libs/iax/configure
   freeswitch/branches/outcast/libs/iax/configure.in
   freeswitch/branches/outcast/libs/iax/src/Makefile.am
   freeswitch/branches/outcast/libs/iax/src/Makefile.in
   freeswitch/branches/outcast/libs/iax/src/iax.c
   freeswitch/branches/outcast/libs/iax/src/md5.c
   freeswitch/branches/outcast/libs/libdingaling/Makefile.am
   freeswitch/branches/outcast/libs/libdingaling/Makefile.in
   freeswitch/branches/outcast/libs/libdingaling/aclocal.m4
   freeswitch/branches/outcast/libs/libdingaling/configure
   freeswitch/branches/outcast/libs/libdingaling/configure.in
   freeswitch/branches/outcast/libs/libdingaling/libdingaling.vcproj
   freeswitch/branches/outcast/libs/libdingaling/src/   (props changed)
   freeswitch/branches/outcast/libs/libdingaling/src/ldl_compat.h
   freeswitch/branches/outcast/libs/libdingaling/src/libdingaling.c
   freeswitch/branches/outcast/libs/libdingaling/src/libdingaling.h
   freeswitch/branches/outcast/libs/libresample/aclocal.m4
   freeswitch/branches/outcast/libs/libresample/build/ltmain.sh
   freeswitch/branches/outcast/libs/libresample/configure
   freeswitch/branches/outcast/libs/libresample/configure.in
   freeswitch/branches/outcast/libs/libresample/src/   (props changed)
   freeswitch/branches/outcast/libs/libspeakup/Makefile.in
   freeswitch/branches/outcast/libs/libspeakup/aclocal.m4
   freeswitch/branches/outcast/libs/libspeakup/build/ltmain.sh
   freeswitch/branches/outcast/libs/libspeakup/configure
   freeswitch/branches/outcast/libs/libspeakup/configure.in
   freeswitch/branches/outcast/libs/libteletone/configure
   freeswitch/branches/outcast/libs/libteletone/libteletone.vcproj
   freeswitch/branches/outcast/libs/libteletone/src/libteletone.h
   freeswitch/branches/outcast/libs/libteletone/src/libteletone_detect.c
   freeswitch/branches/outcast/libs/libteletone/src/libteletone_detect.h
   freeswitch/branches/outcast/libs/libteletone/src/libteletone_generate.c
   freeswitch/branches/outcast/libs/libteletone/src/libteletone_generate.h
   freeswitch/branches/outcast/libs/mozilla.build.sh
   freeswitch/branches/outcast/libs/portaudio.build.sh
   freeswitch/branches/outcast/libs/srtp/   (props changed)
   freeswitch/branches/outcast/libs/srtp/Makefile.in
   freeswitch/branches/outcast/libs/srtp/config_in.h
   freeswitch/branches/outcast/libs/srtp/configure
   freeswitch/branches/outcast/libs/srtp/configure.in
   freeswitch/branches/outcast/libs/srtp/crypto/cipher/aes_icm.c
   freeswitch/branches/outcast/libs/srtp/crypto/cipher/cipher.c
   freeswitch/branches/outcast/libs/srtp/crypto/cipher/null_cipher.c
   freeswitch/branches/outcast/libs/srtp/crypto/hash/null_auth.c
   freeswitch/branches/outcast/libs/srtp/crypto/include/   (props changed)
   freeswitch/branches/outcast/libs/srtp/crypto/include/datatypes.h
   freeswitch/branches/outcast/libs/srtp/crypto/kernel/err.c
   freeswitch/branches/outcast/libs/srtp/crypto/math/datatypes.c
   freeswitch/branches/outcast/libs/srtp/crypto/math/stat.c
   freeswitch/branches/outcast/libs/srtp/crypto/replay/rdbx.c
   freeswitch/branches/outcast/libs/srtp/crypto/replay/ut_sim.c
   freeswitch/branches/outcast/libs/srtp/crypto/rng/rand_source.c
   freeswitch/branches/outcast/libs/srtp/include/srtp.h
   freeswitch/branches/outcast/libs/srtp/libsrtp.vcproj
   freeswitch/branches/outcast/libs/srtp/test/   (props changed)
   freeswitch/branches/outcast/libs/win32/Download SOFIA.vcproj
   freeswitch/branches/outcast/libs/win32/js/js.vcproj
   freeswitch/branches/outcast/libs/win32/pthread/   (props changed)
   freeswitch/branches/outcast/libs/win32/pthread/pthread.vcproj
   freeswitch/branches/outcast/libs/win32/sofia/cleancount
   freeswitch/branches/outcast/libs/win32/sofia/libsofia_sip_ua_static.vcproj
   freeswitch/branches/outcast/modules.conf.in
   freeswitch/branches/outcast/scripts/socket/   (props changed)
   freeswitch/branches/outcast/src/   (props changed)
   freeswitch/branches/outcast/src/dotnet/   (props changed)
   freeswitch/branches/outcast/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs
   freeswitch/branches/outcast/src/dotnet/Module.cs
   freeswitch/branches/outcast/src/dotnet/Modules/Api.cs
   freeswitch/branches/outcast/src/include/switch.h
   freeswitch/branches/outcast/src/include/switch_am_config.h.in
   freeswitch/branches/outcast/src/include/switch_apr.h
   freeswitch/branches/outcast/src/include/switch_bitpack.h
   freeswitch/branches/outcast/src/include/switch_buffer.h
   freeswitch/branches/outcast/src/include/switch_caller.h
   freeswitch/branches/outcast/src/include/switch_channel.h
   freeswitch/branches/outcast/src/include/switch_config.h
   freeswitch/branches/outcast/src/include/switch_console.h
   freeswitch/branches/outcast/src/include/switch_core.h
   freeswitch/branches/outcast/src/include/switch_event.h
   freeswitch/branches/outcast/src/include/switch_frame.h
   freeswitch/branches/outcast/src/include/switch_ivr.h
   freeswitch/branches/outcast/src/include/switch_loadable_module.h
   freeswitch/branches/outcast/src/include/switch_log.h
   freeswitch/branches/outcast/src/include/switch_module_interfaces.h
   freeswitch/branches/outcast/src/include/switch_platform.h
   freeswitch/branches/outcast/src/include/switch_resample.h
   freeswitch/branches/outcast/src/include/switch_rtp.h
   freeswitch/branches/outcast/src/include/switch_sqlite.h
   freeswitch/branches/outcast/src/include/switch_stun.h
   freeswitch/branches/outcast/src/include/switch_types.h
   freeswitch/branches/outcast/src/include/switch_utils.h
   freeswitch/branches/outcast/src/include/switch_xml.h
   freeswitch/branches/outcast/src/mod/applications/mod_bridgecall/mod_bridgecall.c
   freeswitch/branches/outcast/src/mod/applications/mod_commands/mod_commands.c
   freeswitch/branches/outcast/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/branches/outcast/src/mod/applications/mod_dptools/mod_dptools.c
   freeswitch/branches/outcast/src/mod/applications/mod_echo/mod_echo.c
   freeswitch/branches/outcast/src/mod/applications/mod_ivrtest/mod_ivrtest.c
   freeswitch/branches/outcast/src/mod/applications/mod_park/mod_park.c
   freeswitch/branches/outcast/src/mod/applications/mod_playback/mod_playback.c
   freeswitch/branches/outcast/src/mod/applications/mod_rss/mod_rss.c
   freeswitch/branches/outcast/src/mod/applications/mod_skel/mod_skel.c
   freeswitch/branches/outcast/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
   freeswitch/branches/outcast/src/mod/codecs/mod_amr/Makefile
   freeswitch/branches/outcast/src/mod/codecs/mod_amr/mod_amr.c
   freeswitch/branches/outcast/src/mod/codecs/mod_g711/Makefile
   freeswitch/branches/outcast/src/mod/codecs/mod_g711/mod_g711.c
   freeswitch/branches/outcast/src/mod/codecs/mod_g722/mod_g722.c
   freeswitch/branches/outcast/src/mod/codecs/mod_g723_1/Makefile
   freeswitch/branches/outcast/src/mod/codecs/mod_g723_1/mod_g723_1.c
   freeswitch/branches/outcast/src/mod/codecs/mod_g726/mod_g726.c
   freeswitch/branches/outcast/src/mod/codecs/mod_g729/Makefile
   freeswitch/branches/outcast/src/mod/codecs/mod_g729/mod_g729.c
   freeswitch/branches/outcast/src/mod/codecs/mod_gsm/mod_gsm.c
   freeswitch/branches/outcast/src/mod/codecs/mod_ilbc/Makefile
   freeswitch/branches/outcast/src/mod/codecs/mod_ilbc/mod_ilbc.c
   freeswitch/branches/outcast/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
   freeswitch/branches/outcast/src/mod/codecs/mod_l16/mod_l16.c
   freeswitch/branches/outcast/src/mod/codecs/mod_lpc10/mod_lpc10.c
   freeswitch/branches/outcast/src/mod/codecs/mod_speex/mod_speex.c
   freeswitch/branches/outcast/src/mod/dialplans/   (props changed)
   freeswitch/branches/outcast/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
   freeswitch/branches/outcast/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
   freeswitch/branches/outcast/src/mod/directories/mod_ldap/mod_ldap.c
   freeswitch/branches/outcast/src/mod/endpoints/   (props changed)
   freeswitch/branches/outcast/src/mod/endpoints/mod_dingaling/mod_dingaling.c
   freeswitch/branches/outcast/src/mod/endpoints/mod_iax/mod_iax.c
   freeswitch/branches/outcast/src/mod/endpoints/mod_portaudio/mod_portaudio.c
   freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/   (props changed)
   freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/Makefile
   freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
   freeswitch/branches/outcast/src/mod/endpoints/mod_wanpipe/Makefile
   freeswitch/branches/outcast/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
   freeswitch/branches/outcast/src/mod/endpoints/mod_woomera/mod_woomera.c
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/Makefile
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/README
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/basecdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/basecdr.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/baseregistry.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/baseregistry.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/cdrcontainer.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/csvcdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/csvcdr.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/mod_cdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/mysqlcdr.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/pddcdr.cpp
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/pddcdr.h
   freeswitch/branches/outcast/src/mod/event_handlers/mod_cdr/schema.sql
   freeswitch/branches/outcast/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
   freeswitch/branches/outcast/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
   freeswitch/branches/outcast/src/mod/event_handlers/mod_event_test/mod_event_test.c
   freeswitch/branches/outcast/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c
   freeswitch/branches/outcast/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c
   freeswitch/branches/outcast/src/mod/formats/mod_native_file/   (props changed)
   freeswitch/branches/outcast/src/mod/formats/mod_native_file/mod_native_file.c
   freeswitch/branches/outcast/src/mod/formats/mod_sndfile/mod_sndfile.c
   freeswitch/branches/outcast/src/mod/languages/   (props changed)
   freeswitch/branches/outcast/src/mod/languages/mod_mono/mod_mono.c
   freeswitch/branches/outcast/src/mod/languages/mod_perl/fs_perl.pm
   freeswitch/branches/outcast/src/mod/languages/mod_perl/mod_perl.c
   freeswitch/branches/outcast/src/mod/languages/mod_perl/switch_swig_wrap.c
   freeswitch/branches/outcast/src/mod/languages/mod_php/freeswitch.php
   freeswitch/branches/outcast/src/mod/languages/mod_php/mod_php.c
   freeswitch/branches/outcast/src/mod/languages/mod_php/php_freeswitch.h
   freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig_wrap.c
   freeswitch/branches/outcast/src/mod/languages/mod_python/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_python/freeswitch.py
   freeswitch/branches/outcast/src/mod/languages/mod_python/mod_python.c
   freeswitch/branches/outcast/src/mod/languages/mod_python/switch_swig_wrap.c
   freeswitch/branches/outcast/src/mod/languages/mod_ruby/mod_ruby.c
   freeswitch/branches/outcast/src/mod/languages/mod_ruby/switch_swig_wrap.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey/Makefile
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
   freeswitch/branches/outcast/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
   freeswitch/branches/outcast/src/mod/loggers/mod_console/mod_console.c
   freeswitch/branches/outcast/src/mod/loggers/mod_syslog/mod_syslog.c
   freeswitch/branches/outcast/src/mod/timers/mod_softtimer/mod_softtimer.c
   freeswitch/branches/outcast/src/mod/xml_int/mod_xml_rpc/Makefile
   freeswitch/branches/outcast/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
   freeswitch/branches/outcast/src/switch.c
   freeswitch/branches/outcast/src/switch_buffer.c
   freeswitch/branches/outcast/src/switch_caller.c
   freeswitch/branches/outcast/src/switch_channel.c
   freeswitch/branches/outcast/src/switch_config.c
   freeswitch/branches/outcast/src/switch_console.c
   freeswitch/branches/outcast/src/switch_core.c
   freeswitch/branches/outcast/src/switch_event.c
   freeswitch/branches/outcast/src/switch_ivr.c
   freeswitch/branches/outcast/src/switch_loadable_module.c
   freeswitch/branches/outcast/src/switch_log.c
   freeswitch/branches/outcast/src/switch_resample.c
   freeswitch/branches/outcast/src/switch_rtp.c
   freeswitch/branches/outcast/src/switch_stun.c
   freeswitch/branches/outcast/src/switch_swig.c
   freeswitch/branches/outcast/src/switch_utils.c
   freeswitch/branches/outcast/src/switch_xml.c
   freeswitch/branches/outcast/support/freeswitch.pub
   freeswitch/branches/outcast/w32/Library/FreeSwitchCore.vcproj
   freeswitch/branches/outcast/w32/Setup/   (props changed)
   freeswitch/branches/outcast/w32/Setup/Setup.vdproj

Log:
update to new revision


Modified: freeswitch/branches/outcast/.indent.pro
==============================================================================
--- freeswitch/branches/outcast/.indent.pro	(original)
+++ freeswitch/branches/outcast/.indent.pro	Mon Dec 18 15:44:37 2006
@@ -1 +1 @@
--brs -npsl -di0 -br -ce -d0 -cli0 -npcs -nfc1 -ut -i4 -ts4 -l120 -cs -T size_t -T pieces -T switch_file_t -T switch_thread_cond_t -T switch_thread -T switch_threadattr_t -T switch_thread_start_t -T switch_socket_t -T switch_sockaddr_t -T switch_memory_pool -T switch_pollfd_t -T switch_pollset_t -T switch_time_t -T switch_time_exp_t -T switch_hash -T switch_hash_index_t -T switch_strmatch_pattern -T switch_uuid_t -T switch_queue_t -T switch_mutex_t -T __int8 -T __int16 -T __int32 -T __int64 -T int8_t -T int16_t -T int32_t -T int64_t -T long -T switch_core_db -T switch_core_session_message -T switch_audio_resampler -T switch_event_header -T switch_event -T switch_event_subclass -T switch_event_node -T switch_loadable_module -T switch_frame -T switch_channel -T switch_endpoint_interface -T switch_timer_interface -T switch_dialplan_interface -T switch_codec_interface -T switch_application_interface -T switch_api_interface -T switch_file_interface -T switch_file_handle -T switch_core_session -T switch_loadable_module_interface -T switch_caller_profile -T switch_caller_step -T switch_caller_extension -T switch_caller_application -T switch_event_handler_table -T switch_timer -T switch_codec -T switch_core_thread_session -T switch_codec_implementation -T switch_io_event_hook_outgoing_channel -T switch_io_event_hook_answer_channel -T switch_io_event_hook_receive_message -T switch_io_event_hook_read_frame -T switch_io_event_hook_write_frame -T switch_io_event_hook_kill_channel -T switch_io_event_hook_waitfor_read -T switch_io_event_hook_waitfor_write -T switch_io_event_hook_send_dtmf -T switch_io_routines -T switch_io_event_hooks -T switch_buffer -T switch_codec_settings -T switch_config  -T switch_lock_flag  -T switch_core_session_message_t  -T switch_stack_t  -T switch_status  -T switch_text_channel  -T switch_channel_state  -T switch_channel_flag  -T switch_signal  -T switch_codec_flag  -T switch_codec_type  -T switch_timer_flag  -T switch_file_flag  -T switch_io_flag  -T switch_event_t 
\ No newline at end of file
+-brs -npsl -di0 -br -ce -d0 -cli0 -npcs -nfc1 -ut -i4 -ts4 -l120 -cs -T size_t -T pieces -T swtich_size_t -T switch_int16_t -T switch_size_t -T switch_file_t -T switch_thread_cond_t -T switch_thread_id_t -T switch_thread_t -T switch_threadattr_t -T switch_thread_start_t -T switch_socket_t -T switch_sockaddr_t -T switch_port_t -T switch_memory_pool_t -T switch_pollfd_t -T switch_pollset_t -T switch_time_t -T switch_interval_time_t -T switch_time_exp_t -T switch_hash_t -T switch_hash_index_t -T switch_strmatch_pattern -T switch_uuid_t -T switch_queue_t -T switch_thread_rwlock_t -T switch_mutex_t -T switch_channel_timetable_t -T __int8 -T __int16 -T __int32 -T __int64 -T int8_t -T int16_t -T int32_t -T int64_t -T long -T switch_core_db_t -T switch_core_db_stmt_t -T switch_byte_t -T switch_directories -T switch_payload_t -T switch_rtp_t -T switch_core_session_message_t -T switch_event_header_t -T switch_event_t -T switch_event_subclass_t -T switch_event_node_t -T switch_loadable_module_t -T switch_frame_t -T switch_channel_t -T switch_file_handle_t -T switch_core_session_t -T switch_caller_profile_t -T switch_caller_extension_t -T switch_caller_application_t -T switch_state_handler_table_t -T switch_timer_t -T switch_codec_t -T switch_core_thread_session_t -T switch_codec_implementation_t -T switch_buffer_t -T switch_codec_settings_t -T switch_config_t -T switch_io_event_hook_outgoing_channel_t -T switch_io_event_hook_answer_channel_t -T switch_io_event_hook_receive_message_t -T switch_io_event_hook_receive_event_t -T switch_io_event_hook_read_frame_t -T switch_io_event_hook_write_frame_t -T switch_io_event_hook_kill_channel_t -T switch_io_event_hook_waitfor_read_t -T switch_io_event_hook_waitfor_write_t -T switch_io_event_hook_send_dtmf_t -T switch_io_routines_t -T switch_io_event_hooks_t -T switch_speech_handle_t -T switch_directory_handle_t -T switch_loadable_module_interface_t -T switch_endpoint_interface_t -T switch_timer_interface_t -T switch_dialplan_interface_t -T switch_codec_interface_t -T switch_application_interface_t -T switch_api_interface_t -T switch_file_interface_t -T switch_speech_interface_t -T switch_directory_interface_t -T switch_core_port_allocator_t -T switch_media_bug_t -T switch_stream_handle_t -T switch_core_time_duration_t  -T switch_log_node_t  -T switch_audio_resampler_t  -T switch_stun_message_t  -T switch_stun_attribute_t  -T switch_stun_error_t  -T switch_stun_type_t  -T switch_stun_packet_header_t  -T switch_stun_packet_attribute_t  -T switch_stun_packet_t  -T switch_stun_ip_t  -T switch_bitpack_mode_t  -T switch_abc_type_t  -T switch_bitpack_t  -T switch_audio_col_t  -T switch_xml_section_t  -T switch_vad_flag_t  -T switch_rtp_flag_t  -T switch_priority_t  -T switch_ivr_option_t  -T switch_core_session_message_types_t  -T switch_stack_t  -T switch_status_t  -T switch_log_level_t  -T switch_text_channel_t  -T switch_core_session_message_flag_t  -T switch_channel_state_t  -T switch_channel_flag_t  -T switch_frame_flag_t  -T switch_signal_t  -T switch_codec_flag_t  -T switch_speech_flag_t  -T switch_directory_flag_t  -T switch_codec_type_t  -T switch_timer_flag_t  -T switch_file_flag_t  -T switch_io_flag_t  -T switch_event_types_t  -T switch_input_type_t  -T switch_call_cause_t  -T switch_session_ctl_t  -T switch_xml_flag_t 
\ No newline at end of file

Modified: freeswitch/branches/outcast/AUTHORS
==============================================================================
--- freeswitch/branches/outcast/AUTHORS	(original)
+++ freeswitch/branches/outcast/AUTHORS	Mon Dec 18 15:44:37 2006
@@ -26,7 +26,12 @@
  Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>  -  implementation of mod_cdr (perldd, mysql, csv)
  Stefan Knoblich - Various patches and support.  Thanks.
  Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! 
- Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org>
+ Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> 
+ Ken Rice of Asteria Solutions Group, INC <ken AT asteriasgi.com> - xmlcdr, sofia improvements, load testing.
+ Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks.
+ Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups.
+ Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements.
+ Matt Klein <mklein at nmedia.net>
 
 A big THANK YOU goes to:
 

Modified: freeswitch/branches/outcast/Freeswitch.sln
==============================================================================
--- freeswitch/branches/outcast/Freeswitch.sln	(original)
+++ freeswitch/branches/outcast/Freeswitch.sln	Mon Dec 18 15:44:37 2006
@@ -3,21 +3,22 @@
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
 	ProjectSection(ProjectDependencies) = postProject
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}
-		{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}
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"
@@ -27,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
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
@@ -72,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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
@@ -103,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
-		{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}
+		{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}
 	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
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}"
@@ -143,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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}"
@@ -169,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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
@@ -199,15 +200,15 @@
 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
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95}
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"
@@ -229,35 +230,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
-		{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}
+		{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}
 	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
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	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
-		{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}
 		{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}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}"
@@ -271,54 +273,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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}"
@@ -343,8 +347,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "libs\win32\pcre\libpcre.vcproj", "{8D04B550-D240-4A44-8A18-35DA3F7038D9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{91695C7C-7AD1-4782-9727-508F82D9C577} = {91695C7C-7AD1-4782-9727-508F82D9C577}
 		{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}"
@@ -361,18 +365,18 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
 		{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
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 		{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}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}"
@@ -386,12 +390,10 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR-Util", "libs\win32\Download APR-Util.vcproj", "{E969F3E0-1043-482A-AD49-787B8356BA92}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
 		{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 LIBRESAMPLE", "libs\win32\Download LIBRESAMPLE.vcproj", "{C3B50FF8-E49B-4589-B07A-4D7866980669}"
-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}"
@@ -426,8 +428,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75}
 		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
+		{5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}"
@@ -453,8 +455,8 @@
 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}
+		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
@@ -468,58 +470,58 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95}
 		{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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{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}
 	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
-		{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}
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}"
@@ -531,21 +533,98 @@
 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}
+	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}
+	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}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
 	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}"
+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}
+	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}
+	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}
+	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}
+	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}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSwitch.NET", "src\dotnet\FreeSwitch.NET.csproj", "{251CAABC-16C3-4593-A491-603B908094E0}"
+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}
+		{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}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -763,10 +842,6 @@
 		{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
-		{C3B50FF8-E49B-4589-B07A-4D7866980669}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C3B50FF8-E49B-4589-B07A-4D7866980669}.Debug|Win32.Build.0 = Debug|Win32
-		{C3B50FF8-E49B-4589-B07A-4D7866980669}.Release|Win32.ActiveCfg = Release|Win32
-		{C3B50FF8-E49B-4589-B07A-4D7866980669}.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
@@ -891,8 +966,8 @@
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.Build.0 = Debug|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.ActiveCfg = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.Build.0 = Release|Win32
-		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug|Win32
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug DLL|Win32
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.ActiveCfg = Release DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.Build.0 = Release DLL|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32
@@ -905,6 +980,46 @@
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32
 		{251CAABC-16C3-4593-A491-603B908094E0}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{251CAABC-16C3-4593-A491-603B908094E0}.Release|Win32.ActiveCfg = Release|Any CPU
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|Win32.Build.0 = Debug|Win32
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|Win32.ActiveCfg = Release|Win32
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|Win32.Build.0 = Release|Win32
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|Win32.Build.0 = Debug|Win32
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.ActiveCfg = Release|Win32
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32
+		{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}.Debug|Win32.Build.0 = Debug|Win32
+		{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}.Release|Win32.ActiveCfg = Release|Win32
+		{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}.Release|Win32.Build.0 = Release|Win32
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
+		{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
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -936,11 +1051,13 @@
 		{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
-		{3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
+		{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}
@@ -975,16 +1092,23 @@
 		{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{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}
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}
+		{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9} = {0C808854-54D1-4230-BFF5-77B5FD905000}
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{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}
-		{C3B50FF8-E49B-4589-B07A-4D7866980669} = {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}
@@ -997,5 +1121,6 @@
 		{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}
 	EndGlobalSection
 EndGlobal

Modified: freeswitch/branches/outcast/INSTALL
==============================================================================
--- freeswitch/branches/outcast/INSTALL	(original)
+++ freeswitch/branches/outcast/INSTALL	Mon Dec 18 15:44:37 2006
@@ -1,41 +1,231 @@
-UNIX:
-	You will need 'wget' installed in your path so the build system
-	can download the dependancies.
+Installation Instructions
+*************************
 
-1) Prepare Automake
-	./configure
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
 
-2) Edit modules.conf and adjust to taste.
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
 
-3) Choose one of the following:
+Basic Installation
+==================
 
-	*) Build The Entire Project (reccommended)
-	   make installall
+These are generic installation instructions.
 
-	*) Do it yourself step by step:
-	   make
-	   make install
-	   make modules
-	   make install_mod
+   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').
 
+   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.)
 
-	*) Rebuild all the dependancies
-	   make megaclean 
+   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.
 
-  *) Build freeswitch without automatically installing the support libraries (you will need to manually build them all):
-     make nodepends
+   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'.
 
-Windows 32:
+The simplest way to compile this package is:
 
-	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
+  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.
 
-2) Choose Release or Debug build
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
 
-3) Build solution or your choice of modules using the ide.
-	
-	
-	
+  2. Type `make' to compile the package.
+
+  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/outcast/Makefile.am
==============================================================================
--- freeswitch/branches/outcast/Makefile.am	(original)
+++ freeswitch/branches/outcast/Makefile.am	Mon Dec 18 15:44:37 2006
@@ -5,40 +5,26 @@
 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)\"
@@ -47,6 +33,7 @@
 AM_CFLAGS	+= -DSWITCH_LOG_DIR=\"$(PREFIX)/log\"
 AM_CFLAGS	+= -DSWITCH_SCRIPT_DIR=\"$(PREFIX)/scripts\"
 AM_CFLAGS	+= -DSWITCH_HTDOCS_DIR=\"$(PREFIX)/htdocs\"
+AM_CFLAGS	+= -DSWITCH_GRAMMAR_DIR=\"$(PREFIX)/grammar\"
 
 
 libfreeswitch_la_SOURCES	= \
@@ -126,7 +113,7 @@
 
 
 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
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
@@ -186,7 +173,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
@@ -213,7 +200,7 @@
 
 install_mod: modules
 	@echo Installing $(NAME)
-	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs
+	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar
 	@if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/freeswitch.xml $(PREFIX)/conf/; fi
 	@if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
 	@echo Installing Modules
@@ -227,7 +214,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
@@ -250,7 +237,7 @@
 	    -e "s, at INSTALL\@,$(INSTALL)," \
 	    -e "s, at 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/outcast/Makefile.in
==============================================================================
--- freeswitch/branches/outcast/Makefile.in	(original)
+++ freeswitch/branches/outcast/Makefile.in	Mon Dec 18 15:44:37 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.
@@ -17,6 +17,8 @@
 
 
 
+SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -39,11 +41,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
- at ISLINUX_TRUE@am__append_1 = -Wl,-E
- at CRASHPROT_TRUE@am__append_2 = -DCRASH_PROT
- at IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
- at IS64BITLINUX_TRUE@am__append_4 = --enable-64bit
- at ISMAC_TRUE@am__append_5 = -DMACOSX
+ at 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 \
@@ -53,10 +51,17 @@
 	ChangeLog INSTALL NEWS build/config/compile \
 	build/config/config.guess build/config/config.sub \
 	build/config/depcomp build/config/install-sh \
-	build/config/ltmain.sh build/config/missing mkinstalldirs
+	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 \
@@ -103,11 +108,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 = $(libfreeswitch_la_SOURCES) \
 	$(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES)
@@ -157,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@
@@ -190,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@
@@ -231,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@
@@ -243,31 +255,25 @@
 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\" \
 	-DSWITCH_LOG_DIR=\"$(PREFIX)/log\" \
 	-DSWITCH_SCRIPT_DIR=\"$(PREFIX)/scripts\" \
-	-DSWITCH_HTDOCS_DIR=\"$(PREFIX)/htdocs\"
-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)
+	-DSWITCH_HTDOCS_DIR=\"$(PREFIX)/htdocs\" \
+	-DSWITCH_GRAMMAR_DIR=\"$(PREFIX)/grammar\"
+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)
- at ISMAC_FALSE@SOLINK = -shared -Xlinker -x
-
-#put elsif win here
- at ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
- at ISMAC_FALSE@DYNAMIC_LIB_EXTEN = so
- at ISMAC_TRUE@DYNAMIC_LIB_EXTEN = dylib
 libfreeswitch_la_SOURCES = \
 src/include/switch_am_config.h\
 src/include/switch.h\
@@ -342,7 +348,7 @@
 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
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
@@ -534,109 +540,109 @@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libfreeswitch_la-switch_rtp.lo: src/switch_rtp.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_rtp.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_rtp.Tpo" -c -o libfreeswitch_la-switch_rtp.lo `test -f 'src/switch_rtp.c' || echo '$(srcdir)/'`src/switch_rtp.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_rtp.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_rtp.Tpo" -c -o libfreeswitch_la-switch_rtp.lo `test -f 'src/switch_rtp.c' || echo '$(srcdir)/'`src/switch_rtp.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_rtp.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_rtp.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_rtp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_rtp.c' object='libfreeswitch_la-switch_rtp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_rtp.lo `test -f 'src/switch_rtp.c' || echo '$(srcdir)/'`src/switch_rtp.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_rtp.lo `test -f 'src/switch_rtp.c' || echo '$(srcdir)/'`src/switch_rtp.c
 
 libfreeswitch_la-switch_buffer.lo: src/switch_buffer.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_buffer.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_buffer.Tpo" -c -o libfreeswitch_la-switch_buffer.lo `test -f 'src/switch_buffer.c' || echo '$(srcdir)/'`src/switch_buffer.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_buffer.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_buffer.Tpo" -c -o libfreeswitch_la-switch_buffer.lo `test -f 'src/switch_buffer.c' || echo '$(srcdir)/'`src/switch_buffer.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_buffer.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_buffer.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_buffer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_buffer.c' object='libfreeswitch_la-switch_buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_buffer.lo `test -f 'src/switch_buffer.c' || echo '$(srcdir)/'`src/switch_buffer.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_buffer.lo `test -f 'src/switch_buffer.c' || echo '$(srcdir)/'`src/switch_buffer.c
 
 libfreeswitch_la-switch_caller.lo: src/switch_caller.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_caller.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_caller.Tpo" -c -o libfreeswitch_la-switch_caller.lo `test -f 'src/switch_caller.c' || echo '$(srcdir)/'`src/switch_caller.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_caller.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_caller.Tpo" -c -o libfreeswitch_la-switch_caller.lo `test -f 'src/switch_caller.c' || echo '$(srcdir)/'`src/switch_caller.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_caller.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_caller.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_caller.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_caller.c' object='libfreeswitch_la-switch_caller.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_caller.lo `test -f 'src/switch_caller.c' || echo '$(srcdir)/'`src/switch_caller.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_caller.lo `test -f 'src/switch_caller.c' || echo '$(srcdir)/'`src/switch_caller.c
 
 libfreeswitch_la-switch_channel.lo: src/switch_channel.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_channel.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_channel.Tpo" -c -o libfreeswitch_la-switch_channel.lo `test -f 'src/switch_channel.c' || echo '$(srcdir)/'`src/switch_channel.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_channel.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_channel.Tpo" -c -o libfreeswitch_la-switch_channel.lo `test -f 'src/switch_channel.c' || echo '$(srcdir)/'`src/switch_channel.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_channel.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_channel.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_channel.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_channel.c' object='libfreeswitch_la-switch_channel.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_channel.lo `test -f 'src/switch_channel.c' || echo '$(srcdir)/'`src/switch_channel.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_channel.lo `test -f 'src/switch_channel.c' || echo '$(srcdir)/'`src/switch_channel.c
 
 libfreeswitch_la-switch_config.lo: src/switch_config.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_config.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_config.Tpo" -c -o libfreeswitch_la-switch_config.lo `test -f 'src/switch_config.c' || echo '$(srcdir)/'`src/switch_config.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_config.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_config.Tpo" -c -o libfreeswitch_la-switch_config.lo `test -f 'src/switch_config.c' || echo '$(srcdir)/'`src/switch_config.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_config.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_config.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_config.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_config.c' object='libfreeswitch_la-switch_config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_config.lo `test -f 'src/switch_config.c' || echo '$(srcdir)/'`src/switch_config.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_config.lo `test -f 'src/switch_config.c' || echo '$(srcdir)/'`src/switch_config.c
 
 libfreeswitch_la-switch_console.lo: src/switch_console.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_console.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_console.Tpo" -c -o libfreeswitch_la-switch_console.lo `test -f 'src/switch_console.c' || echo '$(srcdir)/'`src/switch_console.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_console.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_console.Tpo" -c -o libfreeswitch_la-switch_console.lo `test -f 'src/switch_console.c' || echo '$(srcdir)/'`src/switch_console.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_console.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_console.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_console.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_console.c' object='libfreeswitch_la-switch_console.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_console.lo `test -f 'src/switch_console.c' || echo '$(srcdir)/'`src/switch_console.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_console.lo `test -f 'src/switch_console.c' || echo '$(srcdir)/'`src/switch_console.c
 
 libfreeswitch_la-switch_core.lo: src/switch_core.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_core.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_core.Tpo" -c -o libfreeswitch_la-switch_core.lo `test -f 'src/switch_core.c' || echo '$(srcdir)/'`src/switch_core.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_core.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_core.Tpo" -c -o libfreeswitch_la-switch_core.lo `test -f 'src/switch_core.c' || echo '$(srcdir)/'`src/switch_core.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_core.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_core.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_core.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_core.c' object='libfreeswitch_la-switch_core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_core.lo `test -f 'src/switch_core.c' || echo '$(srcdir)/'`src/switch_core.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_core.lo `test -f 'src/switch_core.c' || echo '$(srcdir)/'`src/switch_core.c
 
 libfreeswitch_la-switch_loadable_module.lo: src/switch_loadable_module.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_loadable_module.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Tpo" -c -o libfreeswitch_la-switch_loadable_module.lo `test -f 'src/switch_loadable_module.c' || echo '$(srcdir)/'`src/switch_loadable_module.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_loadable_module.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Tpo" -c -o libfreeswitch_la-switch_loadable_module.lo `test -f 'src/switch_loadable_module.c' || echo '$(srcdir)/'`src/switch_loadable_module.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_loadable_module.c' object='libfreeswitch_la-switch_loadable_module.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_loadable_module.lo `test -f 'src/switch_loadable_module.c' || echo '$(srcdir)/'`src/switch_loadable_module.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_loadable_module.lo `test -f 'src/switch_loadable_module.c' || echo '$(srcdir)/'`src/switch_loadable_module.c
 
 libfreeswitch_la-switch_utils.lo: src/switch_utils.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_utils.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_utils.Tpo" -c -o libfreeswitch_la-switch_utils.lo `test -f 'src/switch_utils.c' || echo '$(srcdir)/'`src/switch_utils.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_utils.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_utils.Tpo" -c -o libfreeswitch_la-switch_utils.lo `test -f 'src/switch_utils.c' || echo '$(srcdir)/'`src/switch_utils.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_utils.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_utils.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_utils.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_utils.c' object='libfreeswitch_la-switch_utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_utils.lo `test -f 'src/switch_utils.c' || echo '$(srcdir)/'`src/switch_utils.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_utils.lo `test -f 'src/switch_utils.c' || echo '$(srcdir)/'`src/switch_utils.c
 
 libfreeswitch_la-switch_event.lo: src/switch_event.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_event.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_event.Tpo" -c -o libfreeswitch_la-switch_event.lo `test -f 'src/switch_event.c' || echo '$(srcdir)/'`src/switch_event.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_event.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_event.Tpo" -c -o libfreeswitch_la-switch_event.lo `test -f 'src/switch_event.c' || echo '$(srcdir)/'`src/switch_event.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_event.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_event.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_event.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_event.c' object='libfreeswitch_la-switch_event.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_event.lo `test -f 'src/switch_event.c' || echo '$(srcdir)/'`src/switch_event.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_event.lo `test -f 'src/switch_event.c' || echo '$(srcdir)/'`src/switch_event.c
 
 libfreeswitch_la-switch_resample.lo: src/switch_resample.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_resample.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_resample.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_resample.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_resample.c' object='libfreeswitch_la-switch_resample.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c
 
 libfreeswitch_la-switch_ivr.lo: src/switch_ivr.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_ivr.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_ivr.Tpo" -c -o libfreeswitch_la-switch_ivr.lo `test -f 'src/switch_ivr.c' || echo '$(srcdir)/'`src/switch_ivr.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_ivr.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_ivr.Tpo" -c -o libfreeswitch_la-switch_ivr.lo `test -f 'src/switch_ivr.c' || echo '$(srcdir)/'`src/switch_ivr.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_ivr.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_ivr.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_ivr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_ivr.c' object='libfreeswitch_la-switch_ivr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_ivr.lo `test -f 'src/switch_ivr.c' || echo '$(srcdir)/'`src/switch_ivr.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_ivr.lo `test -f 'src/switch_ivr.c' || echo '$(srcdir)/'`src/switch_ivr.c
 
 libfreeswitch_la-switch_stun.lo: src/switch_stun.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_stun.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_stun.Tpo" -c -o libfreeswitch_la-switch_stun.lo `test -f 'src/switch_stun.c' || echo '$(srcdir)/'`src/switch_stun.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_stun.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_stun.Tpo" -c -o libfreeswitch_la-switch_stun.lo `test -f 'src/switch_stun.c' || echo '$(srcdir)/'`src/switch_stun.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_stun.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_stun.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_stun.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_stun.c' object='libfreeswitch_la-switch_stun.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_stun.lo `test -f 'src/switch_stun.c' || echo '$(srcdir)/'`src/switch_stun.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_stun.lo `test -f 'src/switch_stun.c' || echo '$(srcdir)/'`src/switch_stun.c
 
 libfreeswitch_la-switch_log.lo: src/switch_log.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_log.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_log.Tpo" -c -o libfreeswitch_la-switch_log.lo `test -f 'src/switch_log.c' || echo '$(srcdir)/'`src/switch_log.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_log.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_log.Tpo" -c -o libfreeswitch_la-switch_log.lo `test -f 'src/switch_log.c' || echo '$(srcdir)/'`src/switch_log.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_log.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_log.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_log.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_log.c' object='libfreeswitch_la-switch_log.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_log.lo `test -f 'src/switch_log.c' || echo '$(srcdir)/'`src/switch_log.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_log.lo `test -f 'src/switch_log.c' || echo '$(srcdir)/'`src/switch_log.c
 
 libfreeswitch_la-switch_xml.lo: src/switch_xml.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_xml.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo" -c -o libfreeswitch_la-switch_xml.lo `test -f 'src/switch_xml.c' || echo '$(srcdir)/'`src/switch_xml.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_xml.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo" -c -o libfreeswitch_la-switch_xml.lo `test -f 'src/switch_xml.c' || echo '$(srcdir)/'`src/switch_xml.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_xml.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_xml.c' object='libfreeswitch_la-switch_xml.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_xml.lo `test -f 'src/switch_xml.c' || echo '$(srcdir)/'`src/switch_xml.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_xml.lo `test -f 'src/switch_xml.c' || echo '$(srcdir)/'`src/switch_xml.c
 
 freeswitch-switch.o: src/switch.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(freeswitch_CFLAGS) $(CFLAGS) -MT freeswitch-switch.o -MD -MP -MF "$(DEPDIR)/freeswitch-switch.Tpo" -c -o freeswitch-switch.o `test -f 'src/switch.c' || echo '$(srcdir)/'`src/switch.c; \
@@ -686,13 +692,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 \
@@ -704,7 +704,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; \
@@ -712,13 +712,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)' ;; \
@@ -739,7 +733,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 \
@@ -1115,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
@@ -1142,7 +1136,7 @@
 
 install_mod: modules
 	@echo Installing $(NAME)
-	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs
+	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar
 	@if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/freeswitch.xml $(PREFIX)/conf/; fi
 	@if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
 	@echo Installing Modules
@@ -1156,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
@@ -1179,7 +1173,7 @@
 	    -e "s, at INSTALL\@,$(INSTALL)," \
 	    -e "s, at 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/outcast/README
==============================================================================
--- freeswitch/branches/outcast/README	(original)
+++ freeswitch/branches/outcast/README	Mon Dec 18 15:44:37 2006
@@ -1,40 +0,0 @@
-Freeswitch depends on several out of tree libraries.  All of freeswitch depends on APR, and mod_exosip depends on osip, exosip, jtrhead, and jrtplib.  
-Download locations and links for details can be found below.
-
-Apr info available at: http://apr.apache.org
-
-Download Locations:
-apr: http://apache.mirrors.versehost.com/apr/apr-1.2.2.tar.gz
-
-Backup Download Locations:
-apr: http://www.sofaswitch.org/mikej/apr-1.2.2.tar.gz
-
-
-Exosip\Osip info available at: http://www.antisip.com/
-
-Download Locations:
-osip: http://www.antisip.com/download/libosip2-2.2.1.tar.gz
-exosip: http://www.antisip.com/download/libeXosip-0.9.0.tar.gz
-
-Backup Download Locations:
-osip: http://www.sofaswitch.org/mikej/libosip2-2.2.1.tar.gz
-exosip: http://www.sofaswitch.org/mikej/libeXosip-0.9.0.tar.gz
-
-
-Jthread\Jrtplib info available at: http://research.edm.luc.ac.be/jori/page.html
-
-Download Locations:
-jthread: http://research.edm.luc.ac.be/jori/jthread/jthread-1.1.2.tar.gz
-jrtplib: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib-3.3.0.tar.gz
-
-Backup Download Locations:
-jthread: http://www.sofaswitch.org/mikej/jthread-1.1.2.tar.gz
-jrtplib: http://www.sofaswitch.org/mikej/jrtplib-3.3.0.tar.gz
-
-MSVC Notes:
-Freeswitch will compile and run from Microsoft Visual Studio 2005.  
-If using the Visual C++ Express edition, please make sure that the location of the include and lib directories are propperly set in the file
-C:\Program Files\Microsoft Visual Studio 8\VC\vcpackages\VCProjectEngine.Dll.Express.Config.  
-The automated build process for te dependecy libraries will not work without these settings.
-
-

Modified: freeswitch/branches/outcast/aclocal.m4
==============================================================================
--- freeswitch/branches/outcast/aclocal.m4	(original)
+++ freeswitch/branches/outcast/aclocal.m4	Mon Dec 18 15:44:37 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.
@@ -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"
@@ -191,8 +191,6 @@
   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*)
@@ -238,48 +236,6 @@
 ])# _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' >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' >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
@@ -352,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
@@ -529,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*)
@@ -611,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)
@@ -621,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 >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -650,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 > conftest.exp
-       $SED '/^$/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
      else
        $2=yes
      fi
@@ -718,38 +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`
-    ;;
-  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
-    ;;
-  *)
+ *)
     # 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 &&
@@ -854,7 +776,7 @@
 }]
 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 ;;
@@ -1003,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)
@@ -1015,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 > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || 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
@@ -1085,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 &&
@@ -1253,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}'
@@ -1281,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'
@@ -1312,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
     ;;
@@ -1335,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"`
@@ -1370,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*)
@@ -1398,7 +1308,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1425,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
@@ -1522,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
@@ -1587,11 +1514,7 @@
 openbsd*)
   version_type=sunos
   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
@@ -1757,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=""
@@ -1821,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
@@ -1995,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
@@ -2105,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'*)
@@ -2137,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
@@ -2164,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='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
 ])# AC_PROG_LD_RELOAD_FLAG
 
 
@@ -2206,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
@@ -2229,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.*`
       ;;
@@ -2251,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
@@ -2279,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
   ;;
 
@@ -2301,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
   ;;
 
@@ -2425,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
@@ -2450,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
@@ -2494,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
 # --------------
@@ -2581,10 +2493,6 @@
 
 _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.
 #
@@ -2635,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
@@ -2648,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])
@@ -2673,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)=
@@ -2702,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
@@ -2717,10 +2662,6 @@
 # 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
@@ -2742,7 +2683,7 @@
 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
@@ -2849,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`
@@ -2870,9 +2811,6 @@
 	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
@@ -2918,7 +2856,7 @@
 	# Exported symbols can be pulled into shared objects from archives
 	_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.
+	# 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
@@ -2932,7 +2870,6 @@
     esac
     ;;
 
-
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
@@ -2956,76 +2893,65 @@
       _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
@@ -3036,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
@@ -3060,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
@@ -3074,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
@@ -3088,7 +3014,7 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case $host_cpu in
+      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'
@@ -3104,7 +3030,7 @@
         ;;
       esac
     fi
-    case $host_cpu in
+    case "$host_cpu" in
     hppa*64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3125,12 +3051,12 @@
     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
+      aCC)
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
@@ -3151,7 +3077,7 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
+	    case "$host_cpu" in
 	    ia64*|hppa*64*)
 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	      ;;
@@ -3169,9 +3095,9 @@
     ;;
   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
@@ -3182,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
@@ -3195,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
@@ -3220,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'
@@ -3285,7 +3187,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx*)
+      cxx)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -3306,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
@@ -3340,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)=:
@@ -3365,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)=:
@@ -3384,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
@@ -3399,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'
@@ -3428,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)=:
@@ -3452,7 +3338,7 @@
   sco*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     case $cc_basename in
-      CC*)
+      CC)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -3464,12 +3350,12 @@
     ;;
   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
@@ -3482,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
@@ -3516,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'
 
@@ -3559,7 +3448,7 @@
     ;;
   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
@@ -3665,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
@@ -3741,21 +3630,6 @@
 
 $rm -f confest.$objext
 
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-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
@@ -3806,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])
@@ -3825,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
@@ -3834,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])
@@ -3887,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)
@@ -3950,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)
@@ -4095,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
@@ -4106,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=
@@ -4141,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
 
@@ -4223,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?
@@ -4497,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'"
 
@@ -4518,13 +4371,6 @@
   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]]'
   ;;
@@ -4556,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
@@ -4724,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*)
 	;;
       *)
@@ -4749,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'
 	    ;;
@@ -4778,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)="${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)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case $host_cpu in
+	    case "$host_cpu" in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -4808,7 +4641,7 @@
 	;;
       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.
@@ -4819,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.
@@ -4853,7 +4680,7 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx*)
+	  cxx)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 	    ;;
 	  *)
@@ -4864,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
@@ -4887,7 +4714,7 @@
 	;;
       sco*)
 	case $cc_basename in
-	  CC*)
+	  CC)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  *)
@@ -4896,13 +4723,13 @@
 	;;
       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'
 	    ;;
@@ -4912,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'
 	    ;;
@@ -4927,7 +4754,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC*)
+	  NCC)
 	    # NonStop-UX NCC 3.20
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
@@ -4998,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
 	;;
@@ -5024,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
@@ -5045,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
 	;;
@@ -5069,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.
@@ -5102,14 +4912,9 @@
       ;;
 
     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*)
@@ -5131,11 +4936,6 @@
       fi
       ;;
 
-    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'
@@ -5163,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)=
@@ -5196,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'
@@ -5239,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
@@ -5260,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*)
@@ -5331,7 +5109,7 @@
       _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}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -5345,41 +5123,10 @@
 	fi~
 	$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
       ;;
 
-    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'
@@ -5418,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'
@@ -5428,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)
@@ -5496,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`
@@ -5517,9 +5294,6 @@
 	  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
@@ -5564,7 +5338,7 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  _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.
+	  # 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
@@ -5578,7 +5352,7 @@
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    bsdi[[45]]*)
+    bsdi4*)
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -5599,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
       ;;
 
@@ -5683,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
@@ -5708,7 +5482,7 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
+	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'
 	  ;;
@@ -5717,7 +5491,7 @@
 	  ;;
 	esac
       else
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -5727,7 +5501,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case $host_cpu in
+	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'
@@ -5794,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
@@ -5840,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'
@@ -5859,12 +5632,10 @@
     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'
@@ -5873,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
       ;;
@@ -6145,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
@@ -6170,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
@@ -6192,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/../..'.
@@ -6247,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.
@@ -6280,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
@@ -6297,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.
@@ -6436,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],
@@ -6504,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])
 # -----------------------------------------------
@@ -6618,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],
@@ -6653,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.
@@ -6705,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],
@@ -6740,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).
@@ -6803,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],
@@ -6836,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],
@@ -6888,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
@@ -6918,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/outcast/build/buildlib.sh
==============================================================================
--- freeswitch/branches/outcast/build/buildlib.sh	(original)
+++ freeswitch/branches/outcast/build/buildlib.sh	Mon Dec 18 15:44:37 2006
@@ -20,6 +20,11 @@
     fi
 fi
 
+GZCAT=`which gzcat 2>/dev/null`
+if [ -z "$GZCAT" ] ; then
+    GZCAT=zcat
+fi
+
 install=
 base=http://svn.freeswitch.org/downloads/libs
 
@@ -52,9 +57,18 @@
 	fi
     fi
     if [ ! -d $uncompressed ] ; then
-	tar -zxvf $tar
+	$GZCAT $tar | tar xf -
     fi
 fi
+if [ -f $uncompressed/.complete ] ; then 
+if [ ! -n "$(find $uncompressed/.complete -prune -newer $uncompressed)" ]; then
+if [ ! -f $root/.nothanks ] ; then 
+    echo remove stale .complete
+    rm $uncompressed/.complete
+    sh -c "cd $uncompressed && $MAKE clean distclean"
+fi
+fi
+fi
 
 if [ -f $uncompressed/.complete ] ; then
     echo $uncompressed already installed
@@ -82,6 +96,8 @@
 fi
 
 if [ $? = 0 ] ; then
+    touch .complete
+    sleep 1
     touch .complete
 else 
     echo ERROR

Modified: freeswitch/branches/outcast/build/config/compile
==============================================================================
--- freeswitch/branches/outcast/build/config/compile	(original)
+++ freeswitch/branches/outcast/build/config/compile	Mon Dec 18 15:44:37 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 at 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 at 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/outcast/build/config/config.guess
==============================================================================
--- freeswitch/branches/outcast/build/config/config.guess	(original)
+++ freeswitch/branches/outcast/build/config/config.guess	Mon Dec 18 15:44:37 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 at bothner.com>.
 # Please send patches to <config-patches at 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 at 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 at 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 at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green at 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.guess
-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/outcast/build/config/config.sub
==============================================================================
--- freeswitch/branches/outcast/build/config/config.sub	(original)
+++ freeswitch/branches/outcast/build/config/config.sub	Mon Dec 18 15:44:37 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 at 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/outcast/build/config/depcomp
==============================================================================
--- freeswitch/branches/outcast/build/config/depcomp	(original)
+++ freeswitch/branches/outcast/build/config/depcomp	Mon Dec 18 15:44:37 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 at 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/outcast/build/config/install-sh
==============================================================================
--- freeswitch/branches/outcast/build/config/install-sh	(original)
+++ freeswitch/branches/outcast/build/config/install-sh	Mon Dec 18 15:44:37 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/outcast/build/config/ltmain.sh
==============================================================================
--- freeswitch/branches/outcast/build/config/ltmain.sh	(original)
+++ freeswitch/branches/outcast/build/config/ltmain.sh	Mon Dec 18 15:44:37 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 at 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/outcast/build/config/missing
==============================================================================
--- freeswitch/branches/outcast/build/config/missing	(original)
+++ freeswitch/branches/outcast/build/config/missing	Mon Dec 18 15:44:37 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 at 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 at 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/outcast/conf/freeswitch.xml
==============================================================================
--- freeswitch/branches/outcast/conf/freeswitch.xml	(original)
+++ freeswitch/branches/outcast/conf/freeswitch.xml	Mon Dec 18 15:44:37 2006
@@ -5,101 +5,119 @@
     
     <configuration name="switch.conf" description="Modules">
       <settings>
-        <!--Most channels to allow at once -->
-        <param name="max-sessions" value="1000"/>
+	<!--Most channels to allow at once -->
+	<param name="max-sessions" value="1000"/>
       </settings>
+      <!--Any variables defined here will be available in every channel, in the dialplan etc -->
+      <variables>
+	<variable name="uk-ring" value="%(400,200,400,450);%(400,2200,400,450)"/>
+	<variable name="us-ring" value="%(2000, 4000, 440.0, 480.0)"/>
+	<variable name="bong-ring" value="v=4000;>=0;+=2;#(60,0);v=2000;%(940,0,350,440)"/>
+      </variables>
     </configuration>
 
     <configuration name="modules.conf" description="Modules">
       <modules>
-        <!-- Loggers (I'd load these first) -->
-        <load module="mod_console"/>
-        <!-- <load module="mod_syslog"/> -->
+	<!-- Loggers (I'd load these first) -->
+	<load module="mod_console"/>
+	<!-- <load module="mod_syslog"/> -->
 
-        <!-- XML Interfaces -->
-        <!-- <load module="mod_xml_rpc"/> -->
+	<!-- Multi-Faceted -->
+	<!-- mod_enum is a dialplan interface, an application interface and an api command interface -->
+	<load module="mod_enum"/>
 
-        <!-- Event Handlers -->
-        <!-- <load module="mod_cdr"/> -->
-        <!-- <load module="mod_event_multicast"/> -->
-        <!-- <load module="mod_event_socket"/> -->
-        <!-- <load module="mod_xmpp_event"/> -->
-        <!-- <load module="mod_zeroconf"/> -->
+	<!-- XML Interfaces -->
+	<!-- <load module="mod_xml_rpc"/> -->
+	<!-- <load module="mod_xml_curl"/> -->
 
-        <!-- Directory Interfaces -->
-        <!-- <load module="mod_ldap"/> -->
+	<!-- Event Handlers -->
+	<!-- <load module="mod_cdr"/> -->
+	<!-- <load module="mod_event_multicast"/> -->
+	<!-- <load module="mod_event_socket"/> -->
+	<!-- <load module="mod_xmpp_event"/> -->
+	<!-- <load module="mod_zeroconf"/> -->
 
-        <!-- Endpoints -->
-        <!-- <load module="mod_dingaling"/> -->
-        <!--<load module="mod_iax"/>-->
-        <load module="mod_portaudio"/>
-        <load module="mod_sofia"/>
-        <!-- <load module="mod_wanpipe"/> -->
-        <!-- <load module="mod_woomera"/> -->
+	<!-- Directory Interfaces -->
+	<!-- <load module="mod_ldap"/> -->
 
-        <!-- Applications -->
-        <load module="mod_bridgecall"/>
-        <load module="mod_commands"/>
-        <!--<load module="mod_conference"/>-->
-        <load module="mod_dptools"/>
-        <load module="mod_echo"/>
-        <!--<load module="mod_park"/>-->
-        <load module="mod_playback"/>
+	<!-- Endpoints -->
+	<!-- <load module="mod_dingaling"/> -->
+	<!--<load module="mod_iax"/>-->
+	<load module="mod_portaudio"/>
+	<load module="mod_sofia"/>
+	<!-- <load module="mod_wanpipe"/> -->
+	<!-- <load module="mod_woomera"/> -->
 
-        <!-- Dialplan Interfaces -->
-        <!-- <load module="mod_dialplan_directory"/> -->
-        <load module="mod_dialplan_xml"/>
+	<!-- Applications -->
+	<load module="mod_bridgecall"/>
+	<load module="mod_commands"/>
+	<load module="mod_conference"/>
+	<load module="mod_dptools"/>
+	<load module="mod_echo"/>
+	<!--<load module="mod_park"/>-->
+	<load module="mod_playback"/>
 
-        <!-- Codec Interfaces -->
-        <load module="mod_g711"/>
-        <load module="mod_gsm"/>
-        <!-- <load module="mod_ilbc"/> -->
-        <load module="mod_l16"/>
-        <!-- <load module="mod_speex"/> -->
+	<!-- Dialplan Interfaces -->
+	<!-- <load module="mod_dialplan_directory"/> -->
+	<load module="mod_dialplan_xml"/>
 
-        <!-- File Format Interfaces -->
-        <load module="mod_sndfile"/>
-        <load module="mod_native_file"/>
+	<!-- Codec Interfaces -->
+	<load module="mod_g711"/>
+	<load module="mod_gsm"/>
+	<!-- <load module="mod_ilbc"/> -->
+	<load module="mod_l16"/>
+	<!-- <load module="mod_speex"/> -->
 
-        <!-- Timers -->
-        <load module="mod_softtimer"/>
+	<!-- File Format Interfaces -->
+	<load module="mod_sndfile"/>
+	<load module="mod_native_file"/>
 
-        <!-- Languages -->
-        <!-- <load module="mod_spidermonkey"/> -->
-        <!-- <load module="mod_perl"/> -->
+	<!-- Timers -->
+	<load module="mod_softtimer"/>
 
-        <!-- ASR /TTS -->
-        <!-- <load module="mod_cepstral"/> -->
-        <!-- <load module="mod_rss"/> -->
+	<!-- Languages -->
+	<!-- <load module="mod_spidermonkey"/> -->
+	<!-- <load module="mod_perl"/> -->
 
+	<!-- ASR /TTS -->
+	<!-- <load module="mod_cepstral"/> -->
+	<!-- <load module="mod_rss"/> -->
       </modules>
     </configuration>
 
+    <configuration name="spidermonkey.conf" description="Spider Monkey JavaScript Plug-Ins">
+      <modules>
+	<load module="mod_spidermonkey_teletone"/>
+	<load module="mod_spidermonkey_core_db"/>
+	<!--<load module="mod_spidermonkey_odbc"/>-->
+      </modules>
+    </configuration>
+
     <configuration name="event_multicast.conf" description="Multicast Event">
       <settings>
-        <param name="address" value="225.1.1.1"/>
-        <param name="port" value="4242"/>
-        <param name="bindings" value="all"/>
+	<param name="address" value="225.1.1.1"/>
+	<param name="port" value="4242"/>
+	<param name="bindings" value="all"/>
       </settings>
     </configuration>
 
     <configuration name="event_socket.conf" description="Socket Client">
       <settings>
-        <param name="listen-ip" value="127.0.0.1"/>
-        <param name="listen-port" value="8021"/>
-        <param name="password" value="ClueCon"/>
+	<param name="listen-ip" value="127.0.0.1"/>
+	<param name="listen-port" value="8021"/>
+	<param name="password" value="ClueCon"/>
       </settings>
     </configuration>
 
     <configuration name="iax.conf" description="IAX Configuration">
       <settings>
-        <param name="debug" value="0"/>
-        <!-- <param name="ip" value="1.2.3.4"> -->
-        <param name="port" value="4569"/>
-        <param name="dialplan" value="XML"/>
-        <param name="codec-prefs" value="PCMU at 20i,PCMA,speex,L16"/>
-        <param name="codec-master" value="us"/>
-        <param name="codec-rates" value="8"/>
+	<param name="debug" value="0"/>
+	<!-- <param name="ip" value="1.2.3.4"> -->
+	<param name="port" value="4569"/>
+	<param name="dialplan" value="XML"/>
+	<param name="codec-prefs" value="PCMU at 20i,PCMA,speex,L16"/>
+	<param name="codec-master" value="us"/>
+	<param name="codec-rates" value="8"/>
       </settings>
     </configuration>
 
@@ -107,57 +125,57 @@
       <!-- pick a file name, a function name or 'all' -->
       <!-- map as many as you need for specific debugging -->
       <mappings>
-        <!-- <param name="log_event" value="DEBUG"/> -->
-        <param name="all" value="DEBUG"/>
+	<!-- <param name="log_event" value="DEBUG"/> -->
+	<param name="all" value="DEBUG"/>
       </mappings>
     </configuration>
 
     <configuration name="sofia.conf" description="sofia Endpoint">
       <profiles>
-        <profile name="test">
-          <registrations>
-            <registration name="asterlink">
-              <param name="register-scheme" value="Digest"/>
-              <param name="register-realm" value=""/>
-              <param name="register-username" value="1001"/>
-              <param name="register-password" value="nhy65tgb"/>
-              <param name="register-from" value="sip:1001 at 208.64.200.40"/>
-              <param name="register-to" value="sip:1001 at 66.250.68.194"/>
-              <param name="register-proxy" value="sip:66.250.68.194:5060"/>
-              <param name="register-frequency" value="20"/>
-            </registration>
-          </registrations>
-          <settings>
-            <param name="debug" value="1"/>
-            <param name="rfc2833-pt" value="101"/>
-            <param name="sip-port" value="5060"/>
-            <param name="dialplan" value="XML"/>
-            <param name="dtmf-duration" value="100"/>
-            <param name="codec-prefs" value="PCMU at 20i"/>
-            <param name="codec-ms" value="20"/>
-            <param name="use-rtp-timer" value="true"/>
-            <param name="rtp-timer-name" value="soft"/>
-            <param name="rtp-ip" value="192.168.1.20"/>
-            <param name="sip-ip" value="192.168.1.20"/>
+	<profile name="mydomain1.com">
+	  <registrations>
+	    <!-- <registration name="asterlink">
+		 <param name="register-scheme" value="Digest"/>
+		 <param name="register-realm" value=""/>
+		 <param name="register-username" value="1001"/>
+		 <param name="register-password" value="nhy65tgb"/>
+		 <param name="register-from" value="sip:1001 at 208.64.200.40"/>
+		 <param name="register-to" value="sip:1001 at conference.freeswitch.org"/>
+		 <param name="register-proxy" value="sip:conference.freeswitch.org:5060"/>
+		 <param name="register-frequency" value="20"/>
+		 </registration> -->
+	  </registrations>
+	  <settings>
+	    <param name="debug" value="1"/>
+	    <param name="rfc2833-pt" value="101"/>
+	    <param name="sip-port" value="5060"/>
+	    <param name="dialplan" value="XML"/>
+	    <param name="dtmf-duration" value="100"/>
+	    <param name="codec-prefs" value="PCMU at 20i"/>
+	    <param name="codec-ms" value="20"/>
+	    <param name="use-rtp-timer" value="true"/>
+	    <param name="rtp-timer-name" value="soft"/>
+	    <param name="rtp-ip" value="192.168.1.20"/>
+	    <param name="sip-ip" value="mydomain1.com"/>
 
-            <!-- this lets anything register -->
-            <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
-            <param name="accept-blind-reg" value="true"/>
+	    <!-- this lets anything register -->
+	    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
+	    <param name="accept-blind-reg" value="true"/>
 
-            <!--<param name="auth-calls" value="true"/>-->
-            <!-- on authed calls, authenticate *all* the packets not just invite -->
-            <!--<param name="auth-all-packets" value="true"/>-->
+	    <!--<param name="auth-calls" value="true"/>-->
+	    <!-- on authed calls, authenticate *all* the packets not just invite -->
+	    <!--<param name="auth-all-packets" value="true"/>-->
 
-            <!-- optional ; -->
-            <!-- <param name="ext-rtp-ip" value="stun:stun.server.com"/>-->
-            <!-- <param name="ext-rtp-ip" value="100.101.102.103"/> -->
-            <!-- VAD choose one (out is a good choice); -->
-            <!-- <param name="vad" value="in"/> -->
-            <!-- <param name="vad" value="out"/> -->
-            <!-- <param name="vad" value="both"/> -->
-            <!--<param name="alias" value="sip:10.0.1.251:5555"/>-->
-          </settings>
-        </profile>
+	    <!-- optional ; -->
+	    <!-- <param name="ext-rtp-ip" value="stun:stun.server.com"/>-->
+	    <!-- <param name="ext-rtp-ip" value="100.101.102.103"/> -->
+	    <!-- VAD choose one (out is a good choice); -->
+	    <!-- <param name="vad" value="in"/> -->
+	    <!-- <param name="vad" value="out"/> -->
+	    <!-- <param name="vad" value="both"/> -->
+	    <!--<param name="alias" value="sip:10.0.1.251:5555"/>-->
+	  </settings>
+	</profile>
       </profiles>
     </configuration>
 
@@ -172,206 +190,292 @@
       <!-- info    - informational message  -->
       <!-- debug   - debug-level message -->
       <settings>
-        <param name="ident" value="freeswitch"/>
-        <param name="facility" value="user"/>
-        <param name="format" value="${time} - ${message}"/>
-        <param name="level" value="debug,info,warning-alert"/>
+	<param name="ident" value="freeswitch"/>
+	<param name="facility" value="user"/>
+	<param name="format" value="${time} - ${message}"/>
+	<param name="level" value="debug,info,warning-alert"/>
       </settings>
     </configuration>
 
     <configuration name="woomera.conf" description="Woomera Endpoint">
       <settings>
-        <param name="debug" value="0"/>
+	<param name="debug" value="0"/>
       </settings>
       <interface>
-        <param name="host" value="localhost"/>
-        <param name="port" value="42420"/>
-        <param name="audio-ip" value="127.0.0.1"/>
-        <param name="dialplan" value="XML"/>
+	<param name="host" value="localhost"/>
+	<param name="port" value="42420"/>
+	<param name="audio-ip" value="127.0.0.1"/>
+	<param name="dialplan" value="XML"/>
       </interface>
     </configuration>
 
     <configuration name="wanpipe.conf" description="Sangoma Wanpipe Endpoint">
       <settings>
-        <param name="debug" value="1"/>
-        <param name="dialplan" value="XML"/>
-        <param name="mtu" value="320"/>
-        <param name="dtmf-on" value="800"/>
-        <param name="dtmf-off" value="100"/>
-        <param name="supress-dtmf-tone" value="yes"/>
+	<param name="debug" value="1"/>
+	<param name="dialplan" value="XML"/>
+	<param name="mtu" value="320"/>
+	<param name="dtmf-on" value="800"/>
+	<param name="dtmf-off" value="100"/>
+	<param name="supress-dtmf-tone" value="yes"/>
       </settings>
       <span>
-        <param name="span" value="1"/>
-        <param name="node" value="cpe"/>
-        <!-- <param name="switch" value="ni2"/> -->
-        <param name="switch" value="dms100"/>
-        <!-- <param name="switch" value="lucent5e"/> -->
-        <!-- <param name="switch" value="att4ess"/> -->
-        <!-- <param name="switch" value="euroisdn"/> -->
-        <!-- <param name="switch" value="gr303eoc"/> -->
-        <!-- <param name="switch" value="gr303tmc"/> -->
-        <param name="dp" value="national"/>
-        <!-- <param name="dp" value="international"/> -->
-        <!-- <param name="dp" value="local"/> -->
-        <!-- <param name="dp" value="private"/> -->
-        <!-- <param name="dp" value="unknown"/> -->
-        <param name="l1" value="ulaw"/>
-        <!-- <param name="l1" value="alaw"/> -->
-        <param name="bchan" value="1-23"/>
-        <param name="dchan" value="24"/>
-        <param name="dialplan" value="XML"/>
+	<param name="span" value="1"/>
+	<param name="node" value="cpe"/>
+	<!-- <param name="switch" value="ni2"/> -->
+	<param name="switch" value="dms100"/>
+	<!-- <param name="switch" value="lucent5e"/> -->
+	<!-- <param name="switch" value="att4ess"/> -->
+	<!-- <param name="switch" value="euroisdn"/> -->
+	<!-- <param name="switch" value="gr303eoc"/> -->
+	<!-- <param name="switch" value="gr303tmc"/> -->
+	<param name="dp" value="national"/>
+	<!-- <param name="dp" value="international"/> -->
+	<!-- <param name="dp" value="local"/> -->
+	<!-- <param name="dp" value="private"/> -->
+	<!-- <param name="dp" value="unknown"/> -->
+	<param name="l1" value="ulaw"/>
+	<!-- <param name="l1" value="alaw"/> -->
+	<param name="bchan" value="1-23"/>
+	<param name="dchan" value="24"/>
+	<param name="dialplan" value="XML"/>
       </span>
     </configuration>
 
     <configuration name="portaudio.conf" description="Soundcard Endpoint">
       <settings>
-        <param name="debug" value="2"/>
-        <param name="dialplan" value="XML"/>
+	<param name="debug" value="2"/>
+	<param name="dialplan" value="XML"/>
 
-        <!-- partial string match on something in the name or the device # -->
-        <param name="indev" value="USB"/>
-        <param name="outdev" value="USB"/>
+	<!-- partial string match on something in the name or the device # -->
+	<param name="indev" value="USB"/>
+	<param name="outdev" value="USB"/>
 
-        <param name="cid-name" value="FreeSwitch"/>
-        <param name="cid-num" value="5555551212"/>
+	<param name="cid-name" value="FreeSwitch"/>
+	<param name="cid-num" value="5555551212"/>
       </settings>
     </configuration>
 
     <configuration name="zeroconf.conf" description="Zeroconf Event Handler">
       <settings>
-        <param name="publish" value="yes"/>
-        <param name="browse" value="_sip._udp"/>
+	<param name="publish" value="yes"/>
+	<param name="browse" value="_sip._udp"/>
       </settings>
     </configuration>
 
     <configuration name="xmpp_event.conf" description="XMPP Event Handler">
       <settings>
-        <param name="#debug" value="1"/>
-        <param name="jid" value="freeswitch at my.jabber.com/me"/>
-        <param name="passwd" value="mypass"/>
-        <param name="target-jid" value="freeswitch at reader.org/him"/>
+	<param name="#debug" value="1"/>
+	<param name="jid" value="freeswitch at my.jabber.com/me"/>
+	<param name="passwd" value="mypass"/>
+	<param name="target-jid" value="freeswitch at reader.org/him"/>
       </settings>
     </configuration>
 
     <configuration name="dialplan_directory.conf" description="Dialplan Directory">
       <settings>
-        <param name="directory-name" value="ldap"/>
-        <param name="host" value="ldap.freeswitch.org"/>
-        <param name="dn" value="cn=Manager,dc=freeswitch,dc=org"/>
-        <param name="pass" value="test"/>
-        <param name="base" value="dc=freeswitch,dc=org"/>
+	<param name="directory-name" value="ldap"/>
+	<param name="host" value="ldap.freeswitch.org"/>
+	<param name="dn" value="cn=Manager,dc=freeswitch,dc=org"/>
+	<param name="pass" value="test"/>
+	<param name="base" value="dc=freeswitch,dc=org"/>
       </settings>
     </configuration>
 
     <configuration name="dingaling.conf" description="XMPP Jingle Endpoint">
       <settings>
-        <param name="debug" value="0"/>
-        <param name="codec-prefs" value="PCMU"/>
+	<param name="debug" value="0"/>
+	<param name="codec-prefs" value="PCMU"/>
       </settings>
-      <!-- *NOTE* your resource (after the /) MUST contain the string "talk" (upper or lower case is ok) -->
-      <!-- *NOTE* as of May 2 2006 you must set"auto-login" to"true" if you want to be able to auto-login on startup"/> -->
-      <interface>
-        <param name="name" value="jingle"/>
-        <param name="login" value="myjid at myserver.com/talk"/>
-        <param name="password" value="mypass"/>
-        <param name="dialplan" value="XML"/>
-        <param name="message" value="Jingle all the way"/>
-        <param name="rtp-ip" value="10.0.0.1"/>
-        <param name="auto-login" value="true"/>
-        <!-- SASL "plain" or "md5" -->
-        <param name="sasl" value="plain"/>
-        <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
-        <!--<param name="server" value="alternate.server.com"/>-->
-        <!-- Enable TLS or not -->
-        <param name="tls" value="true"/>
-        <!-- disable to trade async for more calls -->
-        <param name="use-rtp-timer" value="true"/>
-        <!-- or -->
-        <!-- <param name="rtp-ip" value="my_lan_ip"/> -->
-        <!-- <param name="ext-rtp-ip" value="stun:stun.server.com"/> -->
-        <!-- default extension (if one cannot be determined) -->
-        <param name="exten" value="888"/>
-        <!-- VAD choose one -->
-        <!-- <param name="vad" value="in"/> -->
-        <!-- <param name="vad" value="out"/> -->
-        <param name="vad" value="both"/>
-      </interface>
+
+      <!-- *NOTE* change <x-profile></x-profile> to <profile></profile> to enable -->
+
+      <!-- Client Profile (Original mode) -->
+      <x-profile type="client">
+	<param name="name" value="mydomain.com"/>
+	<param name="login" value="myjid at myserver.com/talk"/>
+	<param name="password" value="mypass"/>
+	<param name="dialplan" value="XML"/>
+	<param name="message" value="Jingle all the way"/>
+	<param name="rtp-ip" value="10.0.0.1"/>
+	<param name="auto-login" value="true"/>
+	<param name="auto-reply" value="Press *Call* to call FreeSWITCH and be sure to come to ClueCon! http://www.cluecon.com"/>
+	<!-- SASL "plain" or "md5" -->
+	<param name="sasl" value="plain"/>
+	<!-- if the server where the jabber is hosted is not the same as the one in the jid -->
+	<!--<param name="server" value="alternate.server.com"/>-->
+	<!-- Enable TLS or not -->
+	<param name="tls" value="true"/>
+	<!-- disable to trade async for more calls -->
+	<param name="use-rtp-timer" value="true"/>
+	<!-- or -->
+	<!-- <param name="rtp-ip" value="my_lan_ip"/> -->
+	<!-- <param name="ext-rtp-ip" value="stun:stun.server.com"/> -->
+	<!-- default extension (if one cannot be determined) -->
+	<param name="exten" value="888"/>
+	<!-- VAD choose one -->
+	<!-- <param name="vad" value="in"/> -->
+	<!-- <param name="vad" value="out"/> -->
+	<param name="vad" value="both"/>
+      </x-profile>
+
+      <!-- Component (Server to Server Login) -->
+      <x-profile type="component">
+	<!-- All traffic for *@sub.mydomain.com will come to you -->
+	<param name="name" value="sub.mydomain.com"/>
+	<param name="password" value="secret"/>
+	<param name="dialplan" value="XML"/>
+	<param name="rtp-ip" value="208.64.200.42"/>
+	<param name="server" value="jabber.server.org:5347"/>
+	<!-- disable to trade async for more calls -->
+	<param name="use-rtp-timer" value="true"/>
+	<!-- "_auto_" means the extension will be automaticly set to the called jid -->
+	<param name="exten" value="_auto_"/>
+	<!--<param name="vad" value="both"/>-->
+      </x-profile>
+
     </configuration>
 
+    <configuration name="xml_curl.conf" description="cURL XML Gateway">
+      <settings>
+	<!-- The url to a gateway cgi that can generate xml similar to
+	     what's in this file only on-the-fly (leave it commented if you dont
+	     need it) -->
+	<!-- one or more |-delim of configuration|directory|dialplan -->
+	<!--<param name="gateway-url" value="http://www.mydomain.com/test.cgi" bindings="dialplan"/>-->
+	<!-- set this to provide authentication credentials to the server -->
+	<!--<param name="gateway-credentials" value="muser:mypass"/>-->
+      </settings>
+    </configuration>
+
     <configuration name="xml_rpc.conf" description="XML RPC">
       <settings>
-        <!-- The port where you want to run the http service (default 8080) -->
-        <param name="http-port" value="8080"/>
-        <!-- if all 3 of the following params exist all http traffic will require auth -->
-        <param name="auth-realm" value="freeswitch"/>
-        <param name="auth-user" value="freeswitch"/>
-        <param name="auth-pass" value="works"/>
-        <!-- The url to a gateway cgi that can generate xml similar to what's in -->
-        <!-- this file only on-the-fly (leave it commented if you dont need it)-->
-        <!-- one or more |-delim of configuration|directory|dialplan -->
-        <!-- <param name="gateway-url" value="http://www.server.com/gateway.cgi" bindings="configuration"/> -->
+	<!-- The port where you want to run the http service (default 8080) -->
+	<param name="http-port" value="8080"/>
+	<!-- if all 3 of the following params exist all http traffic will require auth -->
+	<param name="auth-realm" value="freeswitch"/>
+	<param name="auth-user" value="freeswitch"/>
+	<param name="auth-pass" value="works"/>
       </settings>
     </configuration>
 
     <configuration name="rss.conf" description="RSS Parser">
       <feeds>
-        <!-- Just download the files to wherever and refer to them here -->
-        <!-- <feed name="Slash Dot">/home/rss/rss.rss</feed> -->
-        <!-- <feed name="News Forge">/home/rss/newsforge.rss</feed> -->
+	<!-- Just download the files to wherever and refer to them here -->
+	<!-- <feed name="Slash Dot">/home/rss/rss.rss</feed> -->
+	<!-- <feed name="News Forge">/home/rss/newsforge.rss</feed> -->
       </feeds>
     </configuration>
 
     <!-- None of these paths are real if you want any of these options you need to really set them up -->
     <configuration name="conference.conf" description="Audio Conference">
-      <!-- Profiles are collections of settings you can reference by name. -->
+      <!-- Advertise certian presence on startup . -->
+      <advertise>
+	<room name="888 at sub.mydomain.com" status="FreeSWITCH"/>
+      </advertise>
 
+      <!-- Profiles are collections of settings you can reference by name. -->
       <profiles>
-        <profile name="default">
-          <!-- Sample Rate-->
-          <param name="rate" value="8000"/>
-          <!-- Number of milliseconds per frame -->
-          <param name="interval" value="20"/>
-          <!-- Energy level required for audio to be sent to the other users -->
-          <param name="energy-level" value="300"/>
-          <!-- TTS Engine to use -->
-          <!--<param name="tts-engine" value="cepstral"/>-->
-          <!-- TTS Voice to use -->
-          <!--<param name="tts-voice" value="david"/>-->
+	<profile name="default">
+	  <!-- Domain (for presence) -->
+	  <param name="domain" value="sub.mydomain.com"/>
+	  <!-- Sample Rate-->
+	  <param name="rate" value="8000"/>
+	  <!-- Number of milliseconds per frame -->
+	  <param name="interval" value="20"/>
+	  <!-- Energy level required for audio to be sent to the other users -->
+	  <param name="energy-level" value="300"/>
+	  <!-- TTS Engine to use -->
+	  <!--<param name="tts-engine" value="cepstral"/>-->
+	  <!-- TTS Voice to use -->
+	  <!--<param name="tts-voice" value="david"/>-->
 
-          <!-- If TTS is enabled all audio-file params not beginning with -->
-          <!-- '/' or with drive: (i.e. c:) will be considered text to say with TTS -->
+	  <!-- If TTS is enabled all audio-file params not beginning with -->
+	  <!-- '/' or with drive: (i.e. c:) will be considered text to say with TTS -->
 
-          <!-- File to play to acknowledge succees -->
-          <!--<param name="ack-sound" value="/soundfiles/beep.wav"/>-->
-          <!-- File to play to acknowledge failure -->
-          <!--<param name="nack-sound" value="/soundfiles/beeperr.wav"/>-->
-          <!-- File to play to acknowledge muted -->
-          <!--<param name="muted-sound" value="/soundfiles/muted.wav"/>-->
-          <!-- File to play to acknowledge unmuted -->
-          <!--<param name="unmuted-sound" value="/soundfiles/unmuted.wav"/>-->
-          <!-- File to play if you are alone in the conference -->
-          <!--<param name="alone-sound" value="/soundfiles/yactopitc.wav"/>-->
-          <!-- File to play when you join the conference -->
-          <!--<param name="enter-sound" value="/soundfiles/welcome.wav"/>-->
-          <!-- File to play when you leave the conference -->
-          <!--<param name="exit-sound" value="/soundfiles/exit.wav"/>-->
-          <!-- File to play when you ae ejected from the conference -->
-          <!--<param name="kicked-sound" value="/soundfiles/kicked.wav"/>-->
-          <!-- File to play when the conference is locked -->
-          <!--<param name="locked-sound" value="/soundfiles/locked.wav"/>-->
-          <!-- File to play to prompt for a pin -->
-          <!--<param name="pin-sound" value="/soundfiles/pin.wav"/>-->
-          <!-- File to play to when the pin is invalid -->
-          <!--<param name="bad-pin-sound" value="/soundfiles/invalid-pin.wav"/>-->
-          <!-- Conference pin -->
-          <!--<param name="pin" value="12345"/>-->
-          <!-- Default Caller ID Name for outbound calls -->
-          <param name="caller-id-name" value="FreeSWITCH"/>
-          <!-- Default Caller ID Number for outbound calls -->
-          <param name="caller-id-number" value="8777423583"/>
-        </profile>
+	  <!-- File to play to acknowledge succees -->
+	  <!--<param name="ack-sound" value="/soundfiles/beep.wav"/>-->
+	  <!-- File to play to acknowledge failure -->
+	  <!--<param name="nack-sound" value="/soundfiles/beeperr.wav"/>-->
+	  <!-- File to play to acknowledge muted -->
+	  <!--<param name="muted-sound" value="/soundfiles/muted.wav"/>-->
+	  <!-- File to play to acknowledge unmuted -->
+	  <!--<param name="unmuted-sound" value="/soundfiles/unmuted.wav"/>-->
+	  <!-- File to play if you are alone in the conference -->
+	  <!--<param name="alone-sound" value="/soundfiles/yactopitc.wav"/>-->
+	  <!-- File to play when you join the conference -->
+	  <!--<param name="enter-sound" value="/soundfiles/welcome.wav"/>-->
+	  <!-- File to play when you leave the conference -->
+	  <!--<param name="exit-sound" value="/soundfiles/exit.wav"/>-->
+	  <!-- File to play when you ae ejected from the conference -->
+	  <!--<param name="kicked-sound" value="/soundfiles/kicked.wav"/>-->
+	  <!-- File to play when the conference is locked -->
+	  <!--<param name="locked-sound" value="/soundfiles/locked.wav"/>-->
+	  <!-- File to play to prompt for a pin -->
+	  <!--<param name="pin-sound" value="/soundfiles/pin.wav"/>-->
+	  <!-- File to play to when the pin is invalid -->
+	  <!--<param name="bad-pin-sound" value="/soundfiles/invalid-pin.wav"/>-->
+	  <!-- Conference pin -->
+	  <!--<param name="pin" value="12345"/>-->
+	  <!-- Default Caller ID Name for outbound calls -->
+	  <param name="caller-id-name" value="FreeSWITCH"/>
+	  <!-- Default Caller ID Number for outbound calls -->
+	  <param name="caller-id-number" value="8777423583"/>
+	</profile>
       </profiles>
     </configuration>
+
+    <configuration name="enum.conf" description="ENUM Module">
+      <settings>
+	<param name="default-root" value="e164.org"/>
+      </settings>
+
+      <routes>
+	<route service="E2U+SIP" regex="sip:(.*)" replace="sofia/test/$1"/>
+	<route service="E2U+IAX2" regex="iax2:(.*)" replace="iax/$1"/>
+	<route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/jingle/$1"/>
+      </routes>
+    </configuration>
+
+    <configuration name="ivr.conf" description="IVR menus">
+      <menus>
+	<menu name="main"
+	      greet-long="/soundfiles/greet-long.wav" 
+	      greet-short="/soundfiles/greet-short.wav"
+	      invalid-sound="/soundfiles/invalid.wav"
+	      exit-sound="/soundfiles/exit.wav" timeout ="15" max-failures="3">
+	  <entry action="menu-exit" digits="*"/>
+	  <entry action="menu-sub" digits="2" param="menu2"/>
+	  <entry action="menu-exec-api" digits="3" param="api arg"/>
+	  <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/>
+	  <entry action="menu-back" digits="5"/>
+	  <entry action="menu-call-transfer" digits="7" param="888"/>
+	  <entry action="menu-sub" digits="8" param="menu8"/>>
+	</menu>
+	<menu name="menu8"
+	      greet-long="/soundfiles/greet-long.wav"
+	      greet-short="/soundfiles/greet-short.wav"
+	      invalid-sound="/soundfiles/invalid.wav"
+	      exit-sound="/soundfiles/exit.wav"
+	      timeout ="15"
+	      max-failures="3">
+	  <entry action="menu-back" digits="#"/>
+	  <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/>
+	  <entry action="menu-top" digits="*"/>
+	</menu>
+	<menu name="menu2"
+	      greet-long="/soundfiles/greet-long.wav"
+	      greet-short="/soundfiles/greet-short.wav"
+	      invalid-sound="/soundfiles/invalid.wav"
+	      exit-sound="/soundfiles/exit.wav"
+	      timeout ="15"
+	      max-failures="3">
+	  <entry action="menu-back" digits="#"/>
+	  <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/>
+	  <entry action="menu-top" digits="*"/>
+	</menu>
+      </menus>
+    </configuration> 
+
   </section>
   
   <section name="dialplan" description="Regex/XML Dialplan">
@@ -382,43 +486,47 @@
     <!-- *NOTE* The special context name 'any' will match any context -->
     <context name="default">
       <extension name="tollfree">
-        <condition field="destination_number" expression="^(18(0{2}|8{2}|7{2}|6{2})\d{7})$">
-          <action application="bridge" data="sofia/test/$1-freeswitch at voip.trxtel.com"/>
-        </condition>
+	<condition field="destination_number" expression="^(18(0{2}|8{2}|7{2}|6{2})\d{7})$">
+	  <action application="enum" data="$1"/>
+	  <action application="bridge" data="${enum_auto_route}"/>
+	</condition>
       </extension>
 
       <!-- Call the FreeSWITCH conference via SIP -->
-        <!--<extension name="FreeSWITCH Conference SIP">-->
-          <!--<condition field="destination_number" expression="^888$">-->
-            <!--<action application="bridge" data="sofia/test/888 at 66.250.68.194"/>-->
-          <!--</condition>-->
-        <!--</extension> -->
+      <!--<extension name="FreeSWITCH Conference SIP">-->
+      <!--<condition field="destination_number" expression="^888$">-->
+      <!--<action application="bridge" data="sofia/test/888 at conference.freeswitch.org"/>-->
+      <!--</condition>-->
+      <!--</extension> -->
 
       <!-- Call the FreeSWITCH conference via IAX -->
-        <!--<extension name="FreeSWITCH Conference IAX">-->
-          <!--<condition field="destination_number" expression="^8888$">-->
-            <!--<action application="bridge" data="iax/guest at 66.250.68.194/888"/>-->
-          <!--</condition>-->
-        <!--</extension>-->
+      <!--<extension name="FreeSWITCH Conference IAX">-->
+      <!--<condition field="destination_number" expression="^8888$">-->
+      <!--<action application="bridge" data="iax/guest at conference.freeswitch.org/888"/>-->
+      <!--</condition>-->
+      <!--</extension>-->
 
       <extension name="testmusic">
-        <condition field="destination_number" expression="^1234$">
-          <action application="bridge" data="sofia/test/1234 at 66.250.68.194"/>
-        </condition>
+	<condition field="destination_number" expression="^1234$">
+	  <!-- Request a certain tone/file to be played while you wait for the call to be answered-->
+	  <action application="set" data="ringback=${us-ring}"/>
+	  <!--<action application="set" data="ringback=/home/ring.wav"/>-->
+	  <action application="bridge" data="sofia/test/1234 at conference.freeswitch.org"/>
+	</condition>
       </extension>
 
       <!-- Enter an existing conference -->
       <extension name="1000">
-        <condition field="destination_number" expression="^1000$">
-          <action application="conference" data="freeswitch"/>
-        </condition>
+	<condition field="destination_number" expression="^1000$">
+	  <action application="conference" data="freeswitch"/>
+	</condition>
       </extension>
 
       <!-- Start a dynamic conference and call someone at the same time -->
       <extension name="2000">
-        <condition field="destination_number" expression="^2000$">
-          <action application="conference" data="bridge:mydynaconf:sofia/test/1234 at 66.250.68.194"/>
-        </condition>
+	<condition field="destination_number" expression="^2000$">
+	  <action application="conference" data="bridge:mydynaconf:sofia/test/1234 at conference.freeswitch.org"/>
+	</condition>
       </extension>
 
       <!-- extensions starting with 4, all the numbers after 4 form a numeric filename -->
@@ -431,33 +539,33 @@
       <!-- the desired file.  This is for demo purposes both actions -->
       <!-- could have been under the same <extension> tag as well. -->
       <extension name="playsound1" continue="true">
-        <condition field="source" expression="mod_sofia"/>
-        <condition field="destination_number" expression="^4(\d+)">
-          <action application="playback" data="/var/sounds/beep.gsm"/>
-        </condition>
+	<condition field="source" expression="mod_sofia"/>
+	<condition field="destination_number" expression="^4(\d+)">
+	  <action application="playback" data="/var/sounds/beep.gsm"/>
+	</condition>
       </extension>
 
       <extension name="playsound2">
-        <condition field="source" expression="mod_sofia"/>
-        <condition field="destination_number" expression="^4(\d+)">
-          <action application="playback" data="/root/$1.raw"/>
-        </condition>
+	<condition field="source" expression="mod_sofia"/>
+	<condition field="destination_number" expression="^4(\d+)">
+	  <action application="playback" data="/root/$1.raw"/>
+	</condition>
       </extension>
 
       <!-- send everything with a certian RDNIS to Wanpipe ISDN -->
       <extension name="To PRI">
-        <condition field="rdnis" expression="8881231234"/>
-        <condition field="destination_number" expression="(.*)">
-          <action application="bridge" data="wanpipe/a/a/$1"/>
-        </condition>
+	<condition field="rdnis" expression="8881231234"/>
+	<condition field="destination_number" expression="(.*)">
+	  <action application="bridge" data="wanpipe/a/a/$1"/>
+	</condition>
       </extension>
 
       <!-- Call *MUST* originate from mod_iax and also be dialing ext 9999-->
       <extension name="9999">
-        <condition field="source" expression="mod_iax"/>
-        <condition field="destination_number" expression="9999">
-          <action application="playback" data="/var/sounds/beep.gsm"/>
-        </condition>
+	<condition field="source" expression="mod_iax"/>
+	<condition field="destination_number" expression="9999">
+	  <action application="playback" data="/var/sounds/beep.gsm"/>
+	</condition>
       </extension>
 
     </context>
@@ -465,17 +573,65 @@
 
   <section name="directory" description="User Directory">
     <!--the domain or ip (the right hand side of the @ in the addr-->
-    <domain name="mydomain.com">
+    <domain name="jabber.org">
       <!--the user id (the left hand side of the @ in the addr-->
-      <user id="1000">
-        <!-- omit password for authless registration -->
-        <param name="password" value="mypass"/>
-        <!--various endpoints and application will look for user specific settings here -->
-        <param name="mypref" value="myval"/>
+      <user id="stpeter">
+	<params>
+	  <!-- omit password for authless registration -->
+	  <param name="password" value="mypass"/>
+	</params>
+	
+	<vcard xmlns='vcard-temp'>
+	  <FN>Peter Saint-Andre</FN>
+	  <N>
+	    <FAMILY>Saint-Andre</FAMILY>
+	    <GIVEN>Peter</GIVEN>
+	    <MIDDLE/>
+	  </N>
+	  <NICKNAME>stpeter</NICKNAME>
+	  <URL>http://www.jabber.org/people/stpeter.php</URL>
+	  <BDAY>1966-08-06</BDAY>
+	  <ORG>
+	    <ORGNAME>Jabber Software Foundation</ORGNAME>
+	    <ORGUNIT>Jabber Software Foundation</ORGUNIT>
+	  </ORG>
+	  <TITLE>Executive Director</TITLE>
+	  <ROLE>Patron Saint</ROLE>
+	  <TEL><WORK/><VOICE/><NUMBER>303-308-3282</NUMBER></TEL>
+	  <TEL><WORK/><FAX/><NUMBER/></TEL>
+	  <TEL><WORK/><MSG/><NUMBER/></TEL>
+	  <ADR>
+	    <WORK/>
+	    <EXTADD>Suite 600</EXTADD>
+	    <STREET>1899 Wynkoop Street</STREET>
+	    <LOCALITY>Denver</LOCALITY>
+	    <REGION>CO</REGION>
+	    <PCODE>80202</PCODE>
+	    <CTRY>USA</CTRY>
+	  </ADR>
+	  <TEL><HOME/><VOICE/><NUMBER>303-555-1212</NUMBER></TEL>
+	  <TEL><HOME/><FAX/><NUMBER/></TEL>
+	  <TEL><HOME/><MSG/><NUMBER/></TEL>
+	  <ADR>
+	    <HOME/>
+	    <EXTADD/>
+	    <STREET/>
+	    <LOCALITY>Denver</LOCALITY>
+	    <REGION>CO</REGION>
+	    <PCODE>80209</PCODE>
+	    <CTRY>USA</CTRY>
+	  </ADR>
+	  <EMAIL><INTERNET/><PREF/><USERID>stpeter at jabber.org</USERID></EMAIL>
+	  <JABBERID>stpeter at jabber.org</JABBERID>
+	  <DESC>
+	    More information about me is located on my 
+	    personal website: http://www.saint-andre.com/
+	  </DESC>
+	</vcard>
+
       </user>
     </domain>
   </section>
-
 </document>
 
 

Modified: freeswitch/branches/outcast/configure
==============================================================================
--- freeswitch/branches/outcast/configure	(original)
+++ freeswitch/branches/outcast/configure	Mon Dec 18 15:44:37 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
@@ -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
@@ -1154,7 +1162,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -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'
@@ -2523,7 +2538,8 @@
   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'
+	 { 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=$?
@@ -2581,7 +2597,8 @@
   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'
+	 { 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=$?
@@ -2697,7 +2714,8 @@
   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'
+	 { 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=$?
@@ -2751,7 +2769,8 @@
   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'
+	 { 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=$?
@@ -2796,7 +2815,8 @@
   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'
+	 { 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=$?
@@ -2840,7 +2860,8 @@
   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'
+	 { 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=$?
@@ -3352,7 +3373,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
@@ -3377,10 +3398,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
 
@@ -3457,7 +3478,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'*)
@@ -3491,7 +3512,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
@@ -3521,15 +3542,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='$CC -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
@@ -3616,7 +3628,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
@@ -3639,13 +3651,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.*`
       ;;
@@ -3661,7 +3673,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
@@ -3689,6 +3701,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
   ;;
 
@@ -3711,10 +3732,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
   ;;
 
@@ -3807,7 +3830,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3810 "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=$?
@@ -3850,7 +3873,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*)
@@ -3927,7 +3950,8 @@
   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'
+	 { 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=$?
@@ -4236,7 +4260,8 @@
   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'
+	 { 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=$?
@@ -4406,7 +4431,8 @@
   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'
+	 { 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=$?
@@ -4473,7 +4499,8 @@
   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'
+	 { 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=$?
@@ -4733,7 +4760,8 @@
   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'
+	 { 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=$?
@@ -4791,7 +4819,8 @@
   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'
+	 { 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=$?
@@ -4862,7 +4891,8 @@
   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'
+	 { 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=$?
@@ -4906,7 +4936,8 @@
   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'
+	 { 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=$?
@@ -5048,12 +5079,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'
@@ -5283,9 +5309,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'
@@ -5378,7 +5402,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5381:" \
+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
@@ -5424,7 +5448,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5473,7 +5498,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5566,38 +5592,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`
-    ;;
-  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
-    ;;
-  *)
+ *)
     # 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 &&
@@ -5643,6 +5642,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'"
 
@@ -5664,13 +5666,6 @@
   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]'
   ;;
@@ -5702,11 +5697,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
@@ -5868,7 +5860,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.
@@ -5888,7 +5880,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"
@@ -6173,17 +6165,6 @@
   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*)
@@ -6209,7 +6190,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
@@ -6271,7 +6252,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
@@ -6370,20 +6351,6 @@
 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' >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' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
 #
 # Check for any special shared library compilation flags.
 #
@@ -6420,16 +6387,11 @@
    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 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>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-       $SED '/^$/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
@@ -6471,20 +6433,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:6477: $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:6481: \$? = $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 other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -6561,7 +6521,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
 	;;
@@ -6587,16 +6547,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
@@ -6608,7 +6558,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
 	;;
@@ -6632,19 +6582,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.
@@ -6665,14 +6608,9 @@
       ;;
 
     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*)
@@ -6694,11 +6632,6 @@
       fi
       ;;
 
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
     uts4*)
       lt_prog_compiler_pic='-pic'
       lt_prog_compiler_static='-Bstatic'
@@ -6733,20 +6666,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:6739: $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:6743: \$? = $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 other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -6767,7 +6698,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=
@@ -6795,25 +6726,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:6801: $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:6805: \$? = $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
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || 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
@@ -6889,16 +6818,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*)
@@ -6919,27 +6838,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*)
@@ -6990,7 +6888,7 @@
       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}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -7008,37 +6906,6 @@
       fi
       ;;
 
-    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'
@@ -7077,6 +6944,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'
@@ -7087,11 +6979,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)
@@ -7155,7 +7052,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,9 +7073,6 @@
 	  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
@@ -7226,7 +7120,8 @@
   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'
+	 { 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=$?
@@ -7286,7 +7181,8 @@
   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'
+	 { 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=$?
@@ -7323,7 +7219,7 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec=' '
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
+	  # 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
@@ -7337,7 +7233,7 @@
       ld_shlibs=no
       ;;
 
-    bsdi[45]*)
+    bsdi4*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -7363,52 +7259,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
       ;;
 
@@ -7442,7 +7338,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
@@ -7467,7 +7363,7 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -7476,7 +7372,7 @@
 	  ;;
 	esac
       else
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -7486,7 +7382,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*)
 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld='+b $libdir'
@@ -7553,7 +7449,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
@@ -7599,7 +7494,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'
@@ -7618,12 +7513,10 @@
     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'
@@ -7632,18 +7525,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
       ;;
@@ -7917,7 +7800,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}'
@@ -7945,8 +7828,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'
@@ -7976,7 +7858,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
     ;;
@@ -7999,7 +7881,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"`
@@ -8034,17 +7916,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*)
@@ -8062,7 +7935,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.01* | freebsdelf3.01*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -8089,7 +7962,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
@@ -8186,10 +8059,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 8066 "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
@@ -8251,11 +8145,7 @@
 openbsd*)
   version_type=sunos
   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
@@ -8377,8 +8267,8 @@
 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 &&
@@ -8504,7 +8394,8 @@
   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'
+	 { 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=$?
@@ -8607,7 +8498,8 @@
   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'
+	 { 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=$?
@@ -8672,7 +8564,8 @@
   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'
+	 { 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=$?
@@ -8765,7 +8658,8 @@
   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'
+	 { 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=$?
@@ -8830,7 +8724,8 @@
   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'
+	 { 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=$?
@@ -8896,7 +8791,8 @@
   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'
+	 { 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=$?
@@ -8962,7 +8858,8 @@
   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'
+	 { 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=$?
@@ -9037,7 +8934,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9040 "configure"
+#line 8937 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9103,7 +9000,7 @@
   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 ;;
@@ -9135,7 +9032,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9138 "configure"
+#line 9035 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9201,7 +9098,7 @@
   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 ;;
@@ -9251,7 +9148,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
@@ -9264,6 +9161,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
@@ -9393,7 +9327,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
@@ -9404,11 +9338,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=
@@ -9438,13 +9372,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,7 +9448,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?
@@ -9815,9 +9743,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'
@@ -9854,7 +9780,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
@@ -9875,20 +9801,6 @@
 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' >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' >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
@@ -9910,17 +9822,8 @@
 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
@@ -9990,7 +9893,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'*)
@@ -10024,7 +9927,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
@@ -10133,7 +10036,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`
@@ -10154,9 +10057,6 @@
 	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
@@ -10204,7 +10104,8 @@
   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'
+	 { 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=$?
@@ -10265,7 +10166,8 @@
   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'
+	 { 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=$?
@@ -10302,7 +10204,7 @@
 	# Exported symbols can be pulled into shared objects from archives
 	whole_archive_flag_spec_CXX=' '
 	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
+	# 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
@@ -10316,7 +10218,6 @@
     esac
     ;;
 
-
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
     # as there is no search path for DLLs.
@@ -10340,76 +10241,65 @@
       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
@@ -10420,14 +10310,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
@@ -10444,11 +10334,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
@@ -10458,7 +10348,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
@@ -10472,7 +10362,7 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case $host_cpu in
+      case "$host_cpu" in
       hppa*64*)
 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
@@ -10488,7 +10378,7 @@
         ;;
       esac
     fi
-    case $host_cpu in
+    case "$host_cpu" in
     hppa*64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
@@ -10509,12 +10399,12 @@
     esac
 
     case $cc_basename in
-      CC*)
+      CC)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      aCC*)
-	case $host_cpu in
+      aCC)
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
@@ -10535,7 +10425,7 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
+	    case "$host_cpu" in
 	    ia64*|hppa*64*)
 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	      ;;
@@ -10553,9 +10443,9 @@
     ;;
   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
@@ -10566,7 +10456,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
@@ -10579,7 +10469,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
@@ -10604,41 +10494,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'
@@ -10669,7 +10535,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx*)
+      cxx)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -10690,25 +10556,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
@@ -10724,14 +10574,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=:
@@ -10749,7 +10599,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=:
@@ -10768,7 +10618,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
@@ -10783,17 +10633,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'
@@ -10812,7 +10662,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=:
@@ -10836,7 +10686,7 @@
   sco*)
     archive_cmds_need_lc_CXX=no
     case $cc_basename in
-      CC*)
+      CC)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -10848,12 +10698,12 @@
     ;;
   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
@@ -10866,33 +10716,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
@@ -10900,7 +10753,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'
 
@@ -10943,7 +10796,7 @@
     ;;
   tandem*)
     case $cc_basename in
-      NCC*)
+      NCC)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -10996,7 +10849,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
@@ -11072,20 +10925,6 @@
 
 $rm -f confest.$objext
 
-# PORTME: override above test on systems where it is broken
-case $host_os in
-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
@@ -11141,7 +10980,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*)
 	;;
       *)
@@ -11166,28 +11005,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'
 	    ;;
@@ -11195,22 +11024,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="${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="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case $host_cpu in
+	    case "$host_cpu" in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -11225,7 +11054,7 @@
 	;;
       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.
@@ -11236,24 +11065,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.
@@ -11270,7 +11093,7 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx*)
+	  cxx)
 	    lt_prog_compiler_pic_CXX='-W c,exportall'
 	    ;;
 	  *)
@@ -11281,14 +11104,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
@@ -11304,7 +11127,7 @@
 	;;
       sco*)
 	case $cc_basename in
-	  CC*)
+	  CC)
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
 	  *)
@@ -11313,13 +11136,13 @@
 	;;
       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'
 	    ;;
@@ -11329,12 +11152,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'
 	    ;;
@@ -11344,7 +11167,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC*)
+	  NCC)
 	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
@@ -11385,20 +11208,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:11391: $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:11395: \$? = $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 other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -11419,7 +11240,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=
@@ -11447,25 +11268,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:11453: $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:11457: \$? = $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
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || 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
@@ -11520,7 +11339,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'
@@ -11700,7 +11519,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}'
@@ -11728,8 +11547,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'
@@ -11759,7 +11577,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
     ;;
@@ -11782,7 +11600,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"`
@@ -11817,17 +11635,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*)
@@ -11845,7 +11654,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.01* | freebsdelf3.01*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -11872,7 +11681,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
@@ -11969,10 +11778,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 11785 "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
@@ -12034,11 +11864,7 @@
 openbsd*)
   version_type=sunos
   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
@@ -12160,8 +11986,8 @@
 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 &&
@@ -12287,7 +12113,8 @@
   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'
+	 { 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=$?
@@ -12390,7 +12217,8 @@
   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'
+	 { 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=$?
@@ -12455,7 +12283,8 @@
   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'
+	 { 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=$?
@@ -12548,7 +12377,8 @@
   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'
+	 { 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=$?
@@ -12613,7 +12443,8 @@
   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'
+	 { 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=$?
@@ -12679,7 +12510,8 @@
   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'
+	 { 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=$?
@@ -12745,7 +12577,8 @@
   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'
+	 { 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=$?
@@ -12820,7 +12653,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12823 "configure"
+#line 12656 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12886,7 +12719,7 @@
   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 ;;
@@ -12918,7 +12751,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12921 "configure"
+#line 12754 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12984,7 +12817,7 @@
   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 ;;
@@ -13136,13 +12969,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
 
@@ -13218,7 +13045,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?
@@ -13499,36 +13326,13 @@
 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' >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' >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
@@ -13540,7 +13344,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
@@ -13549,9 +13353,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
@@ -13628,7 +13430,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
 	;;
@@ -13654,16 +13456,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
@@ -13675,7 +13467,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
 	;;
@@ -13699,19 +13491,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.
@@ -13732,14 +13517,9 @@
       ;;
 
     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*)
@@ -13761,11 +13541,6 @@
       fi
       ;;
 
-    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'
@@ -13800,20 +13575,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:13806: $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:13810: \$? = $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 other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -13834,7 +13607,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=
@@ -13862,25 +13635,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:13868: $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:13872: \$? = $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
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || 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
@@ -13956,16 +13727,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*)
@@ -13986,27 +13747,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*)
@@ -14057,7 +13797,7 @@
       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}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -14071,41 +13811,10 @@
 	fi~
 	$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
       ;;
 
-    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'
@@ -14144,6 +13853,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'
@@ -14154,11 +13888,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)
@@ -14222,7 +13961,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`
@@ -14243,9 +13982,6 @@
 	  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
@@ -14283,7 +14019,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14333,7 +14070,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14370,7 +14108,7 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec_F77=' '
 	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
+	  # 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
@@ -14384,7 +14122,7 @@
       ld_shlibs_F77=no
       ;;
 
-    bsdi[45]*)
+    bsdi4*)
       export_dynamic_flag_spec_F77=-rdynamic
       ;;
 
@@ -14405,57 +14143,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
       ;;
 
@@ -14489,7 +14227,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
@@ -14514,7 +14252,7 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -14523,7 +14261,7 @@
 	  ;;
 	esac
       else
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -14533,7 +14271,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*)
 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
@@ -14600,7 +14338,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
@@ -14646,7 +14383,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'
@@ -14665,12 +14402,10 @@
     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'
@@ -14679,18 +14414,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
       ;;
@@ -14964,7 +14689,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}'
@@ -14992,8 +14717,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'
@@ -15023,7 +14747,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
     ;;
@@ -15046,7 +14770,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"`
@@ -15081,17 +14805,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*)
@@ -15109,7 +14824,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.01* | freebsdelf3.01*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -15136,7 +14851,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
@@ -15233,10 +14948,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 14955 "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
@@ -15298,11 +15034,7 @@
 openbsd*)
   version_type=sunos
   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
@@ -15424,8 +15156,8 @@
 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 &&
@@ -15602,13 +15334,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
 
@@ -15684,7 +15410,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?
@@ -15922,7 +15648,7 @@
 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.
 
@@ -15933,42 +15659,16 @@
 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' >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' >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
@@ -15990,20 +15690,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:15996: $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:16000: \$? = $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 other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -16080,7 +15778,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
 	;;
@@ -16106,16 +15804,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
@@ -16127,7 +15815,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
 	;;
@@ -16151,19 +15839,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.
@@ -16184,14 +15865,9 @@
       ;;
 
     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*)
@@ -16213,11 +15889,6 @@
       fi
       ;;
 
-    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'
@@ -16252,20 +15923,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:16258: $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:16262: \$? = $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 other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || 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
@@ -16286,7 +15955,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=
@@ -16314,25 +15983,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:16320: $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:16324: \$? = $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
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || 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
@@ -16408,16 +16075,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*)
@@ -16438,27 +16095,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*)
@@ -16509,7 +16145,7 @@
       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}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -16523,41 +16159,10 @@
 	fi~
 	$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
       ;;
 
-    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'
@@ -16596,6 +16201,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'
@@ -16606,11 +16236,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)
@@ -16674,7 +16309,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`
@@ -16695,9 +16330,6 @@
 	  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
@@ -16745,7 +16377,8 @@
   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'
+	 { 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=$?
@@ -16805,7 +16438,8 @@
   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'
+	 { 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=$?
@@ -16842,7 +16476,7 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec_GCJ=' '
 	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
+	  # 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
@@ -16856,7 +16490,7 @@
       ld_shlibs_GCJ=no
       ;;
 
-    bsdi[45]*)
+    bsdi4*)
       export_dynamic_flag_spec_GCJ=-rdynamic
       ;;
 
@@ -16877,57 +16511,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
       ;;
 
@@ -16961,7 +16595,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
@@ -16986,7 +16620,7 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -16995,7 +16629,7 @@
 	  ;;
 	esac
       else
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*|ia64*)
 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -17005,7 +16639,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case $host_cpu in
+	case "$host_cpu" in
 	hppa*64*)
 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
@@ -17072,7 +16706,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
@@ -17118,7 +16751,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'
@@ -17137,12 +16770,10 @@
     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'
@@ -17151,18 +16782,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
       ;;
@@ -17436,7 +17057,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}'
@@ -17464,8 +17085,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'
@@ -17495,7 +17115,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
     ;;
@@ -17518,7 +17138,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"`
@@ -17553,17 +17173,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*)
@@ -17581,7 +17192,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.01* | freebsdelf3.01*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -17608,7 +17219,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
@@ -17705,10 +17316,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 17323 "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
@@ -17770,11 +17402,7 @@
 openbsd*)
   version_type=sunos
   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
@@ -17896,8 +17524,8 @@
 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 &&
@@ -18023,7 +17651,8 @@
   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'
+	 { 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=$?
@@ -18126,7 +17755,8 @@
   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'
+	 { 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=$?
@@ -18191,7 +17821,8 @@
   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'
+	 { 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=$?
@@ -18284,7 +17915,8 @@
   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'
+	 { 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=$?
@@ -18349,7 +17981,8 @@
   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'
+	 { 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=$?
@@ -18415,7 +18048,8 @@
   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'
+	 { 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=$?
@@ -18481,7 +18115,8 @@
   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'
+	 { 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=$?
@@ -18556,7 +18191,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18559 "configure"
+#line 18194 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18622,7 +18257,7 @@
   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 ;;
@@ -18654,7 +18289,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18657 "configure"
+#line 18292 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18720,7 +18355,7 @@
   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 ;;
@@ -18872,13 +18507,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
 
@@ -18954,7 +18583,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?
@@ -19202,35 +18831,11 @@
 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' >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' >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
@@ -19347,13 +18952,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
 
@@ -19429,7 +19028,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?
@@ -19705,6 +19304,1395 @@
 
 
 
+#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"
+                                FUNC_DEF=__func__
+                                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=""
+                                FUNC_DEF=__FUNCTION__
+                                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
+                        FUNC_DEF=__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=__FUNCTION__
+                        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"
+                                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=__FUNCTION__
+                        fi
+                        IN_LINE=inline
+                        DYNAMIC_LIB_EXTEN="so"
+                ;;
+esac
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define __AUTO_FUNCTION__ $FUNC_DEF
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define inline $IN_LINE
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define __inline__ $IN_LINE
+_ACEOF
+
+
+
 # Checks for header files.
 
 
@@ -19746,7 +20734,8 @@
   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'
+	 { 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=$?
@@ -19818,7 +20807,8 @@
   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'
+	 { 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=$?
@@ -19872,7 +20862,8 @@
   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'
+	 { 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=$?
@@ -19943,7 +20934,8 @@
   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'
+	 { 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=$?
@@ -19997,7 +20989,8 @@
   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'
+	 { 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=$?
@@ -20064,7 +21057,8 @@
   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'
+	 { 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=$?
@@ -20230,7 +21224,8 @@
   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'
+	 { 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=$?
@@ -20422,7 +21417,8 @@
   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'
+	 { 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=$?
@@ -20482,7 +21478,8 @@
   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'
+	 { 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=$?
@@ -20555,7 +21552,8 @@
   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'
+	 { 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=$?
@@ -20621,7 +21619,8 @@
   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'
+	 { 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=$?
@@ -20683,7 +21682,8 @@
   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'
+	 { 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=$?
@@ -20800,7 +21800,8 @@
   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'
+	 { 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=$?
@@ -21035,7 +22036,8 @@
   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'
+	 { 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=$?
@@ -21133,7 +22135,8 @@
   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'
+	 { 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=$?
@@ -21202,7 +22205,8 @@
   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'
+	 { 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=$?
@@ -21312,7 +22316,8 @@
   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'
+	 { 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=$?
@@ -21380,7 +22385,8 @@
   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'
+	 { 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=$?
@@ -21422,7 +22428,8 @@
   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'
+	 { 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=$?
@@ -21479,7 +22486,8 @@
   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'
+	 { 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=$?
@@ -21559,13 +22567,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
  ;;
   *)
@@ -21577,16 +22585,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"
@@ -21639,10 +22637,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
@@ -21757,6 +22751,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
@@ -22383,6 +23384,13 @@
 s, at FFLAGS@,$FFLAGS,;t t
 s, at ac_ct_F77@,$ac_ct_F77,;t t
 s, at LIBTOOL@,$LIBTOOL,;t t
+s, at PRTDIAG@,$PRTDIAG,;t t
+s, at WANT_DEBUG_TRUE@,$WANT_DEBUG_TRUE,;t t
+s, at WANT_DEBUG_FALSE@,$WANT_DEBUG_FALSE,;t t
+s, at new_AM_CFLAGS@,$new_AM_CFLAGS,;t t
+s, at new_AM_LDFLAGS@,$new_AM_LDFLAGS,;t t
+s, at SOLINK@,$SOLINK,;t t
+s, at DYNAMIC_LIB_EXTEN@,$DYNAMIC_LIB_EXTEN,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at CRASHPROT_TRUE@,$CRASHPROT_TRUE,;t t
 s, at CRASHPROT_FALSE@,$CRASHPROT_FALSE,;t t
@@ -22559,6 +23567,11 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -22597,12 +23610,6 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub

Modified: freeswitch/branches/outcast/configure.in
==============================================================================
--- freeswitch/branches/outcast/configure.in	(original)
+++ freeswitch/branches/outcast/configure.in	Mon Dec 18 15:44:37 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,95 @@
 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"
+                                FUNC_DEF=__func__
+                                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=""
+                                FUNC_DEF=__FUNCTION__
+                                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
+                        FUNC_DEF=__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=__FUNCTION__
+                        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"
+                                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=__FUNCTION__
+                        fi
+                        IN_LINE=inline
+                        DYNAMIC_LIB_EXTEN="so"
+                ;;
+esac
+AC_SUBST(new_AM_CFLAGS)
+AC_SUBST(new_AM_LDFLAGS)
+AC_SUBST(SOLINK)
+AC_SUBST(DYNAMIC_LIB_EXTEN)
+AC_DEFINE_UNQUOTED([__AUTO_FUNCTION__],[$FUNC_DEF],[define it the right way ;)])
+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 +127,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 +139,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/outcast/generic_mod.mk
==============================================================================
--- freeswitch/branches/outcast/generic_mod.mk	(original)
+++ freeswitch/branches/outcast/generic_mod.mk	Mon Dec 18 15:44:37 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/outcast/indent_options.sh
==============================================================================
--- freeswitch/branches/outcast/indent_options.sh	(original)
+++ freeswitch/branches/outcast/indent_options.sh	Mon Dec 18 15:44:37 2006
@@ -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 "\*\|{" | perl -ne '@l = split; $l[2] =~ s/;//g ; print "-T $l[2] "' >> .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/branches/outcast/libs/codec/g726/libg726.vcproj
==============================================================================
--- freeswitch/branches/outcast/libs/codec/g726/libg726.vcproj	(original)
+++ freeswitch/branches/outcast/libs/codec/g726/libg726.vcproj	Mon Dec 18 15:44:37 2006
@@ -46,6 +46,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
+				WarnAsError="true"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
@@ -106,6 +107,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
+				WarnAsError="true"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>

Modified: freeswitch/branches/outcast/libs/codec/g7xx/INSTALL
==============================================================================
--- freeswitch/branches/outcast/libs/codec/g7xx/INSTALL	(original)
+++ freeswitch/branches/outcast/libs/codec/g7xx/INSTALL	Mon Dec 18 15:44:37 2006
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   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').
+
+   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.
+
+   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'.
+
+The simplest way to compile this package is:
+
+  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.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  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' 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'.
+
+   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.
+
+   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 option `--target=TYPE' 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
+
+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'.
+
+`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/outcast/libs/codec/g7xx/Makefile.am
==============================================================================
--- freeswitch/branches/outcast/libs/codec/g7xx/Makefile.am	(original)
+++ freeswitch/branches/outcast/libs/codec/g7xx/Makefile.am	Mon Dec 18 15:44:37 2006
@@ -1,6 +1,10 @@
-AM_CFLAGS	= -I./src/include -fPIC -O3 -Dsingle -funroll-loops -fomit-frame-pointer
 AUTOMAKE_OPTS	= gnu
 NAME		= libg7xx
+
+AM_CFLAGS   = $(new_AM_CFLAGS) -I./src/include
+AM_CPPFLAGS = $(AM_CFLAGS)
+AM_LDFLAGS  = $(new_AM_LDFLAGS) -lm
+
 lib_LTLIBRARIES		= libg7xx.la
 libg7xx_la_SOURCES	= src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c
 

Modified: freeswitch/branches/outcast/libs/codec/g7xx/Makefile.in
==============================================================================
--- freeswitch/branches/outcast/libs/codec/g7xx/Makefile.in	(original)
+++ freeswitch/branches/outcast/libs/codec/g7xx/Makefile.in	Mon Dec 18 15:44:37 2006
@@ -40,11 +40,18 @@
 DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+	build/compile build/config.guess build/config.sub \
+	build/depcomp build/install-sh build/ltmain.sh build/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 \
@@ -66,7 +73,7 @@
 	libg7xx_la-g722_encode.lo libg7xx_la-g726.lo
 libg7xx_la_OBJECTS = $(am_libg7xx_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -114,6 +121,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@
@@ -141,11 +149,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@
@@ -182,6 +194,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@
@@ -189,9 +203,11 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -I./src/include -fPIC -O3 -Dsingle -funroll-loops -fomit-frame-pointer
 AUTOMAKE_OPTS = gnu
 NAME = libg7xx
+AM_CFLAGS = $(new_AM_CFLAGS) -I./src/include
+AM_CPPFLAGS = $(AM_CFLAGS)
+AM_LDFLAGS = $(new_AM_LDFLAGS) -lm
 lib_LTLIBRARIES = libg7xx.la
 libg7xx_la_SOURCES = src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c
 libg7xx_la_CFLAGS = $(AM_CFLAGS)
@@ -403,7 +419,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/src/include/g7xx
+	$(mkdir_p) $(distdir)/build $(distdir)/build/config $(distdir)/src/include/g7xx
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \

Modified: freeswitch/branches/outcast/libs/codec/g7xx/aclocal.m4
==============================================================================
--- freeswitch/branches/outcast/libs/codec/g7xx/aclocal.m4	(original)
+++ freeswitch/branches/outcast/libs/codec/g7xx/aclocal.m4	Mon Dec 18 15:44:37 2006
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -163,6 +163,7 @@
 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"
@@ -182,10 +183,10 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -233,6 +234,9 @@
 # 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
@@ -261,7 +265,7 @@
 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' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 ])# _LT_COMPILER_BOILERPLATE
@@ -274,7 +278,7 @@
 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' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 ])# _LT_LINKER_BOILERPLATE
@@ -580,6 +584,22 @@
     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)
@@ -622,9 +642,9 @@
    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 >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+     $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
        $2=yes
      fi
    fi
@@ -655,8 +675,8 @@
      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 > conftest.exp
-       $SED '/^$/d' conftest.err >conftest.er2
+       $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
@@ -731,6 +751,12 @@
     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
@@ -744,6 +770,17 @@
       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
@@ -775,7 +812,7 @@
 
 
 # _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)dnl
 ])# _LT_AC_CHECK_DLFCN
@@ -783,7 +820,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 :
@@ -849,6 +886,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }]
@@ -859,7 +898,7 @@
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
       x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
+      x$lt_dlunknown|x*) $3 ;;
     esac
   else :
     # compilation failed
@@ -871,7 +910,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
@@ -942,7 +981,7 @@
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -955,7 +994,7 @@
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
     	  lt_cv_dlopen_self_static, [dnl
 	  _LT_AC_TRY_DLOPEN_SELF(
@@ -1015,9 +1054,9 @@
    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 > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     $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
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
@@ -1402,10 +1441,15 @@
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -1465,6 +1509,18 @@
   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 ;;
@@ -1586,6 +1642,7 @@
 
 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
@@ -1629,13 +1686,6 @@
   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
@@ -1661,7 +1711,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   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'
@@ -1694,6 +1744,29 @@
   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}'
@@ -1707,6 +1780,11 @@
 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
 
 
@@ -1731,6 +1809,9 @@
       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.
@@ -1859,7 +1940,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)
@@ -2167,7 +2248,7 @@
 case $host_os in
   darwin*)
     if test "$GCC" = yes; then
-      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -2267,6 +2348,11 @@
   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;;
@@ -2312,15 +2398,11 @@
   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.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   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]]'
@@ -2341,10 +2423,13 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -2364,36 +2449,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  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"
+  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"
 	  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
+	  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
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
@@ -2499,7 +2591,7 @@
 ])# _LT_AC_LANG_CXX
 
 # _LT_AC_PROG_CXXCPP
-# ---------------
+# ------------------
 AC_DEFUN([_LT_AC_PROG_CXXCPP],
 [
 AC_REQUIRE([AC_PROG_CXX])
@@ -2548,7 +2640,7 @@
 
 
 # AC_LIBTOOL_RC
-# --------------
+# -------------
 # enable support for Windows resource files
 AC_DEFUN([AC_LIBTOOL_RC],
 [AC_REQUIRE([LT_AC_PROG_RC])
@@ -2585,37 +2677,6 @@
 _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)
@@ -2624,9 +2685,9 @@
 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_DLOPEN_SELF
 
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
@@ -2685,6 +2746,7 @@
 _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)=
@@ -2712,7 +2774,7 @@
 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
@@ -2731,12 +2793,12 @@
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_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
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
@@ -2831,6 +2893,7 @@
 	    ;;
 	  esac
 	done
+	;;
       esac
 
       exp_sym_flag='-bexport'
@@ -2868,6 +2931,7 @@
 	  _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
@@ -2899,12 +2963,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 $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"
+      _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"
      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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	_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"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	_LT_AC_SYS_LIBPATH_AIX
@@ -2913,16 +2977,26 @@
 	# -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)=' '
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	_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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	_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'
       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 at 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
       *)
@@ -2932,7 +3006,6 @@
     esac
     ;;
 
-
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
@@ -2942,7 +3015,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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      _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'
       # 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
@@ -2951,7 +3024,7 @@
 	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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $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'
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
@@ -3088,34 +3161,23 @@
     ;;
   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*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      hppa*64*|ia64*)
 	_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*)
+    hppa*64*|ia64*)
       _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,
@@ -3131,9 +3193,12 @@
 	;;
       aCC*)
 	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
+	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'
 	  ;;
@@ -3152,9 +3217,12 @@
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
 	    case $host_cpu in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    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'
 	      ;;
+	    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'
 	      ;;
@@ -3167,6 +3235,20 @@
 	;;
     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*)
@@ -3449,19 +3531,6 @@
     # 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*)
@@ -3554,9 +3623,60 @@
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
     _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*)
@@ -3592,8 +3712,6 @@
 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)
 
@@ -3611,7 +3729,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
@@ -3744,6 +3862,14 @@
 # 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*)
@@ -3753,6 +3879,7 @@
     _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
     ;;
   esac
+  ;;
 esac
 ])
 
@@ -3762,7 +3889,7 @@
 ])# 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'.
@@ -3846,8 +3973,6 @@
 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"
 
@@ -3857,9 +3982,7 @@
 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
@@ -3915,8 +4038,6 @@
 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)
 
@@ -3926,7 +4047,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'.
@@ -3989,7 +4110,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 NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -4158,6 +4279,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
@@ -4531,9 +4655,18 @@
 osf*)
   symcode='[[BCDEGQRST]]'
   ;;
-solaris* | sysv5*)
+solaris*)
   symcode='[[BDRT]]'
   ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
 sysv4)
   symcode='[[DFNSTU]]'
   ;;
@@ -4716,6 +4849,10 @@
       # 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
@@ -4785,14 +4922,14 @@
 	case $cc_basename in
 	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -4806,6 +4943,10 @@
 	    ;;
 	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*)
@@ -4885,15 +5026,6 @@
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
 	  CC*)
@@ -4935,7 +5067,14 @@
 	    ;;
 	esac
 	;;
-      unixware*)
+      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
 	;;
       vxworks*)
 	;;
@@ -4982,6 +5121,11 @@
       _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.
@@ -5096,11 +5240,6 @@
       _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_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5118,7 +5257,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       _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'
@@ -5131,6 +5270,12 @@
       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
@@ -5172,6 +5317,16 @@
     _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)=])
 ])
 
 
@@ -5250,6 +5405,10 @@
       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
     ;;
@@ -5334,7 +5493,7 @@
       _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'
 
       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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        _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'
 	# 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
@@ -5343,12 +5502,27 @@
 	  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}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=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=
@@ -5390,7 +5564,7 @@
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<EOF 1>&2
@@ -5411,6 +5585,33 @@
       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=
@@ -5444,7 +5645,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 "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5478,6 +5679,7 @@
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -5515,6 +5717,7 @@
   	  _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
@@ -5527,11 +5730,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
 
@@ -5545,12 +5748,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 $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"
+	_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"
        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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  _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"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 _LT_AC_SYS_LIBPATH_AIX
@@ -5559,13 +5762,11 @@
 	  # -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)=' '
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  _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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  _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'
 	fi
       fi
       ;;
@@ -5706,47 +5907,62 @@
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       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*|ia64*)
+	hppa*64*)
 	  _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*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_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)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_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*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	hppa*64*|ia64*)
 	  _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'
 
@@ -5848,14 +6064,6 @@
       _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
@@ -5941,36 +6149,45 @@
       fi
       ;;
 
-    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
+    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
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      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 ${wl}$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'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_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'
       fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $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)=
+    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
       _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*)
@@ -5988,11 +6205,6 @@
 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?
 #
@@ -6020,6 +6232,7 @@
         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=

Modified: freeswitch/branches/outcast/libs/codec/g7xx/configure
==============================================================================
--- freeswitch/branches/outcast/libs/codec/g7xx/configure	(original)
+++ freeswitch/branches/outcast/libs/codec/g7xx/configure	Mon Dec 18 15:44:37 2006
@@ -464,7 +464,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 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 LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1035,6 +1035,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
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1044,6 +1050,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
@@ -1508,9 +1516,8 @@
 
 
 
-am__api_version="1.9"
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in build $srcdir/build; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1526,14 +1533,15 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build $srcdir/build" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in build $srcdir/build" >&2;}
    { (exit 1); exit 1; }; }
 fi
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
+am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1946,6 +1954,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'
@@ -3374,7 +3389,7 @@
 case $host_os in
   darwin*)
     if test "$GCC" = yes; then
-      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -3390,36 +3405,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  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"
+  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"
 	  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
+	  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
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -3527,6 +3549,11 @@
   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;;
@@ -3572,15 +3599,11 @@
   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.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   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]'
@@ -3601,10 +3624,13 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -3622,6 +3648,9 @@
 # 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
 
@@ -3657,7 +3686,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3660 "configure"' > conftest.$ac_ext
+  echo '#line 3689 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3813,7 +3842,27 @@
     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"
@@ -5236,7 +5285,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5239:" \
+echo "$as_me:5288:" \
      "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
@@ -5439,6 +5488,12 @@
     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
@@ -5452,6 +5507,17 @@
       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
@@ -5537,9 +5603,18 @@
 osf*)
   symcode='[BCDEGQRST]'
   ;;
-solaris* | sysv5*)
+solaris*)
   symcode='[BDRT]'
   ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
 sysv4)
   symcode='[DFNSTU]'
   ;;
@@ -6005,6 +6080,7 @@
 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"
@@ -6024,10 +6100,10 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -6226,6 +6302,9 @@
 # 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
 
@@ -6233,83 +6312,18 @@
 # 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' >conftest.err
+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' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_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
 
-
-#
-# 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 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 > conftest.exp
-       $SED '/^$/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
-
-
-
-
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
@@ -6334,17 +6348,17 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6337: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6351: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6341: \$? = $ac_status" >&5
+   echo "$as_me:6355: \$? = $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 >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+     $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
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -6405,6 +6419,11 @@
       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.
@@ -6519,11 +6538,6 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -6541,7 +6555,7 @@
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -6554,6 +6568,12 @@
       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
@@ -6596,17 +6616,17 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6599: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6619: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6603: \$? = $ac_status" >&5
+   echo "$as_me:6623: \$? = $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 >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+     $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
        lt_prog_compiler_pic_works=yes
      fi
    fi
@@ -6637,6 +6657,48 @@
     ;;
 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
@@ -6658,18 +6720,18 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-