diff --git a/Makefile.am b/Makefile.am
index 8a830d2134..a250c47297 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,7 +152,7 @@ depends:
 	./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)
 	./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
 	./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
-	./build/buildlib.sh . install srtp.tgz --prefix=$(PREFIX)
+	./build/buildlib.sh . install srtp --prefix=$(PREFIX)
 	rm build/freeswitch.env
 
 
diff --git a/Makefile.in b/Makefile.in
index e488493dea..d1884e3f22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1043,7 +1043,7 @@ depends:
 	./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)
 	./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
 	./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
-	./build/buildlib.sh . install srtp.tgz --prefix=$(PREFIX)
+	./build/buildlib.sh . install srtp --prefix=$(PREFIX)
 	rm build/freeswitch.env
 
 modules: $(NAME)
diff --git a/aclocal.m4 b/aclocal.m4
index 42ac573159..e5da51da21 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -143,7 +143,7 @@ rm="rm -f"
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -359,8 +359,8 @@ 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 +529,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # 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 +611,7 @@ AC_CACHE_CHECK([$1], [$2],
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -650,7 +650,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
    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 compiler can only warn and ignore the option if not recognized
+     # 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.
@@ -725,7 +725,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     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 *BSD
+      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`
@@ -737,7 +737,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     # 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 ;;
@@ -854,7 +854,7 @@ int main ()
 }]
 EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
@@ -1003,7 +1003,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -1021,7 +1021,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -1281,7 +1281,8 @@ cygwin* | mingw* | pw32*)
       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'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -1334,7 +1335,7 @@ darwin* | rhapsody*)
   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"`
@@ -1372,7 +1373,14 @@ kfreebsd*-gnu)
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -1417,7 +1425,7 @@ hpux9* | hpux10* | hpux11*)
   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
@@ -1813,7 +1821,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
 
 # AC_LIBTOOL_WIN32_DLL
 # --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
 AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 ])# AC_LIBTOOL_WIN32_DLL
@@ -1987,7 +1995,7 @@ dnl not every word.  This closes a longstanding sh security hole.
       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
@@ -2097,7 +2105,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
     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 GNU ld's only accept -v.
+      # but apparently some variants of GNU ld 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'*)
@@ -2129,7 +2137,7 @@ AC_PROG_LD_GNU
 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 ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -2243,7 +2251,7 @@ gnu*)
 
 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
@@ -2417,13 +2425,13 @@ esac
 # -----------------------------------
 # 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 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.
+# --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.
 AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case $enable_ltdl_convenience in
@@ -2442,13 +2450,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 # -----------------------------------
 # 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 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.
+# --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.
 # 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
@@ -2627,7 +2635,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # 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
@@ -2694,7 +2702,7 @@ _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -2910,7 +2918,7 @@ case $host_os in
 	# 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 it's shared libraries.
+	# 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'
       fi
     fi
@@ -2949,7 +2957,7 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case "$host_os" in
+        case $host_os in
         rhapsody* | darwin1.[[012]])
          _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
          ;;
@@ -2987,7 +2995,7 @@ case $host_os in
           _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 ld's
+        # 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
@@ -3000,7 +3008,7 @@ case $host_os in
          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 ld's
+          # 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}'
           ;;
@@ -3080,7 +3088,7 @@ case $host_os in
     ;;
   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'
@@ -3096,7 +3104,7 @@ case $host_os in
         ;;
       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
@@ -3122,7 +3130,7 @@ case $host_os in
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
       aCC*)
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
@@ -3143,7 +3151,7 @@ case $host_os in
       *)
 	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'
 	      ;;
@@ -3244,7 +3252,7 @@ case $host_os in
 
 	_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'
+	_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*)
 	# Compaq C++
@@ -3476,10 +3484,11 @@ case $host_os in
     case $cc_basename in
       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} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_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_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} -nolib ${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}  ${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
@@ -3499,15 +3508,7 @@ case $host_os in
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-	# 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'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -3664,7 +3665,7 @@ if AC_TRY_EVAL(ac_compile); then
   # 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
@@ -3740,6 +3741,21 @@ fi
 
 $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
@@ -3809,7 +3825,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # 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
@@ -4708,7 +4724,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     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*)
 	;;
       *)
@@ -4777,7 +4793,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	  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
 	      ;;
@@ -4818,7 +4834,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    # 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)='-static'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
 	  cxx*)
 	    # Compaq C++
@@ -4982,7 +4998,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     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
 	;;
@@ -5029,7 +5045,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _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
 	;;
@@ -5059,12 +5075,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
-      pgcc* | pgf77* | pgf90*)
+      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)='-static'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
         ;;
       ccc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5147,7 +5163,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
     [_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)=
@@ -5243,7 +5259,7 @@ ifelse([$1],[CXX],[
   if test "$with_gnu_ld" = yes; then
     # 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.
@@ -5264,7 +5280,7 @@ ifelse([$1],[CXX],[
       *\ 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*)
@@ -5338,11 +5354,11 @@ EOF
 	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'
+	  _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* )			# 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'
+	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' ;;
@@ -5548,7 +5564,7 @@ EOF
 	  # 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 it's shared libraries.
+	  # 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'
 	fi
       fi
@@ -5588,7 +5604,7 @@ EOF
       ;;
 
     darwin* | rhapsody*)
-      case "$host_os" in
+      case $host_os in
         rhapsody* | darwin1.[[012]])
          _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
          ;;
@@ -5617,7 +5633,7 @@ EOF
     	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
+      # 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
@@ -5626,7 +5642,7 @@ EOF
          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 ld's
+          # 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}'
           ;;
@@ -5692,7 +5708,7 @@ EOF
 
     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'
 	  ;;
@@ -5701,7 +5717,7 @@ EOF
 	  ;;
 	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'
 	  ;;
@@ -5711,7 +5727,7 @@ EOF
 	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'
diff --git a/configure b/configure
index 50edfd312c..bf9493dc54 100755
--- a/configure
+++ b/configure
@@ -287,8 +287,8 @@ 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
@@ -3462,7 +3462,7 @@ else
     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 GNU ld's only accept -v.
+      # but apparently some variants of GNU ld 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'*)
@@ -3496,7 +3496,7 @@ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 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 ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3666,7 +3666,7 @@ gnu*)
 
 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
@@ -3855,7 +3855,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   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*)
@@ -5588,7 +5588,7 @@ else
     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 *BSD
+      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`
@@ -5903,7 +5903,7 @@ rm="rm -f"
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -6224,7 +6224,7 @@ else
       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
@@ -6286,7 +6286,7 @@ else
       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
@@ -6435,7 +6435,7 @@ else
    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 compiler can only warn and ignore the option if not recognized
+     # 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.
@@ -6486,7 +6486,7 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:6492: $lt_compile\"" >&5)
@@ -6576,7 +6576,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     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
 	;;
@@ -6623,7 +6623,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       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
 	;;
@@ -6653,12 +6653,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
-      pgcc* | pgf77* | pgf90*)
+      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='-static'
+	lt_prog_compiler_static='-Bstatic'
         ;;
       ccc*)
         lt_prog_compiler_wl='-Wl,'
@@ -6748,7 +6748,7 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:6754: $lt_compile\"" >&5)
@@ -6782,7 +6782,7 @@ else
 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=
@@ -6810,7 +6810,7 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:6816: $lt_compile\"" >&5)
@@ -6828,7 +6828,7 @@ else
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -7028,11 +7028,11 @@ EOF
 	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'
+	  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* )			# 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'
+	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' ;;
@@ -7340,7 +7340,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # 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 it's shared libraries.
+	  # This is similar to how AIX traditionally builds its 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
@@ -7380,7 +7380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-      case "$host_os" in
+      case $host_os in
         rhapsody* | darwin1.[012])
          allow_undefined_flag='${wl}-undefined ${wl}suppress'
          ;;
@@ -7409,7 +7409,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     	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
+      # 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
@@ -7418,7 +7418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          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 ld's
+          # 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}'
           ;;
@@ -7484,7 +7484,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     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'
 	  ;;
@@ -7493,7 +7493,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  ;;
 	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'
 	  ;;
@@ -7503,7 +7503,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	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'
@@ -7962,7 +7962,8 @@ cygwin* | mingw* | pw32*)
       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'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -8015,7 +8016,7 @@ darwin* | rhapsody*)
   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"`
@@ -8053,7 +8054,14 @@ kfreebsd*-gnu)
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -8098,7 +8106,7 @@ hpux9* | hpux10* | hpux11*)
   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
@@ -9053,7 +9061,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9056 "configure"
+#line 9064 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9119,7 +9127,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -9151,7 +9159,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9154 "configure"
+#line 9162 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9217,7 +9225,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -9267,7 +9275,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # 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
@@ -9870,7 +9878,7 @@ postdeps_CXX=
 compiler_lib_search_path_CXX=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -10006,7 +10014,7 @@ else
     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 GNU ld's only accept -v.
+      # but apparently some variants of GNU ld 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'*)
@@ -10040,7 +10048,7 @@ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 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 ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -10320,7 +10328,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# 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 it's shared libraries.
+	# This is similar to how AIX traditionally builds its 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
@@ -10359,7 +10367,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     fi
   ;;
       darwin* | rhapsody*)
-        case "$host_os" in
+        case $host_os in
         rhapsody* | darwin1.[012])
          allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
          ;;
@@ -10397,7 +10405,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           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 ld's
+        # 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
@@ -10410,7 +10418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          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 ld's
+          # 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}'
           ;;
@@ -10490,7 +10498,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   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'
@@ -10506,7 +10514,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         ;;
       esac
     fi
-    case "$host_cpu" in
+    case $host_cpu in
     hppa*64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
@@ -10532,7 +10540,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	ld_shlibs_CXX=no
 	;;
       aCC*)
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
@@ -10553,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *)
 	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'
 	      ;;
@@ -10654,7 +10662,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	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'
+	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*)
 	# Compaq C++
@@ -10886,10 +10894,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     case $cc_basename in
       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} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -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} -nolib ${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}  ${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
@@ -10909,15 +10918,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	esac
 	link_all_deplibs_CXX=yes
 
-	# 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'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -11021,7 +11022,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   # 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
@@ -11097,6 +11098,20 @@ fi
 
 $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
@@ -11152,7 +11167,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     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*)
 	;;
       *)
@@ -11221,7 +11236,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	  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
 	      ;;
@@ -11262,7 +11277,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-static'
+	    lt_prog_compiler_static_CXX='-Bstatic'
 	    ;;
 	  cxx*)
 	    # Compaq C++
@@ -11396,14 +11411,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:11402: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11417: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11406: \$? = $ac_status" >&5
+   echo "$as_me:11421: \$? = $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.
@@ -11430,7 +11445,7 @@ else
 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=
@@ -11458,14 +11473,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:11464: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11479: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11468: \$? = $ac_status" >&5
+   echo "$as_me:11483: \$? = $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
@@ -11476,7 +11491,7 @@ else
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -11739,7 +11754,8 @@ cygwin* | mingw* | pw32*)
       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'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -11792,7 +11808,7 @@ darwin* | rhapsody*)
   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"`
@@ -11830,7 +11846,14 @@ kfreebsd*-gnu)
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -11875,7 +11898,7 @@ hpux9* | hpux10* | hpux11*)
   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
@@ -12830,7 +12853,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12833 "configure"
+#line 12856 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12896,7 +12919,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -12928,7 +12951,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12931 "configure"
+#line 12954 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12994,7 +13017,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -13550,7 +13573,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # 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
@@ -13638,7 +13661,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     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
 	;;
@@ -13685,7 +13708,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       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
 	;;
@@ -13715,12 +13738,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	lt_prog_compiler_pic_F77='-KPIC'
 	lt_prog_compiler_static_F77='-static'
         ;;
-      pgcc* | pgf77* | pgf90*)
+      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='-static'
+	lt_prog_compiler_static_F77='-Bstatic'
         ;;
       ccc*)
         lt_prog_compiler_wl_F77='-Wl,'
@@ -13810,14 +13833,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:13816: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13839: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13820: \$? = $ac_status" >&5
+   echo "$as_me:13843: \$? = $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.
@@ -13844,7 +13867,7 @@ else
 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=
@@ -13872,14 +13895,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:13878: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13901: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13882: \$? = $ac_status" >&5
+   echo "$as_me:13905: \$? = $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
@@ -13890,7 +13913,7 @@ else
        lt_cv_prog_compiler_c_o_F77=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -14090,11 +14113,11 @@ EOF
 	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'
+	  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* )			# 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'
+	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' ;;
@@ -14382,7 +14405,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # 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 it's shared libraries.
+	  # This is similar to how AIX traditionally builds its 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
@@ -14422,7 +14445,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-      case "$host_os" in
+      case $host_os in
         rhapsody* | darwin1.[012])
          allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
          ;;
@@ -14451,7 +14474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     	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 ld's
+      # 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
@@ -14460,7 +14483,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          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 ld's
+          # 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}'
           ;;
@@ -14526,7 +14549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     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'
 	  ;;
@@ -14535,7 +14558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  ;;
 	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'
 	  ;;
@@ -14545,7 +14568,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	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'
@@ -15004,7 +15027,8 @@ cygwin* | mingw* | pw32*)
       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'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -15057,7 +15081,7 @@ darwin* | rhapsody*)
   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"`
@@ -15095,7 +15119,14 @@ kfreebsd*-gnu)
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -15140,7 +15171,7 @@ hpux9* | hpux10* | hpux11*)
   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
@@ -15994,14 +16025,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:16000: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16031: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16004: \$? = $ac_status" >&5
+   echo "$as_me:16035: \$? = $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.
@@ -16084,7 +16115,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     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
 	;;
@@ -16131,7 +16162,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       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
 	;;
@@ -16161,12 +16192,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	lt_prog_compiler_pic_GCJ='-KPIC'
 	lt_prog_compiler_static_GCJ='-static'
         ;;
-      pgcc* | pgf77* | pgf90*)
+      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='-static'
+	lt_prog_compiler_static_GCJ='-Bstatic'
         ;;
       ccc*)
         lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16256,14 +16287,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:16262: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16293: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16266: \$? = $ac_status" >&5
+   echo "$as_me:16297: \$? = $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.
@@ -16290,7 +16321,7 @@ else
 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=
@@ -16318,14 +16349,14 @@ else
    # 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}? :&$lt_compiler_flag :; t' \
+   -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:16324: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16355: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16328: \$? = $ac_status" >&5
+   echo "$as_me:16359: \$? = $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
@@ -16336,7 +16367,7 @@ else
        lt_cv_prog_compiler_c_o_GCJ=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -16536,11 +16567,11 @@ EOF
 	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'
+	  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* )			# 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'
+	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' ;;
@@ -16848,7 +16879,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # 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 it's shared libraries.
+	  # This is similar to how AIX traditionally builds its 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
@@ -16888,7 +16919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-      case "$host_os" in
+      case $host_os in
         rhapsody* | darwin1.[012])
          allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
          ;;
@@ -16917,7 +16948,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     	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 ld's
+      # 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
@@ -16926,7 +16957,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          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 ld's
+          # 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}'
           ;;
@@ -16992,7 +17023,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     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'
 	  ;;
@@ -17001,7 +17032,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  ;;
 	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'
 	  ;;
@@ -17011,7 +17042,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	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'
@@ -17470,7 +17501,8 @@ cygwin* | mingw* | pw32*)
       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'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -17523,7 +17555,7 @@ darwin* | rhapsody*)
   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"`
@@ -17561,7 +17593,14 @@ kfreebsd*-gnu)
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -17606,7 +17645,7 @@ hpux9* | hpux10* | hpux11*)
   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
@@ -18561,7 +18600,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18564 "configure"
+#line 18603 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18627,7 +18666,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -18659,7 +18698,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18662 "configure"
+#line 18701 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18725,7 +18764,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
diff --git a/libs/srtp/Makefile b/libs/srtp/Makefile
index 1bc052ecbd..5248d1f72b 100644
--- a/libs/srtp/Makefile
+++ b/libs/srtp/Makefile
@@ -34,7 +34,7 @@ CC	= gcc
 INCDIR	= -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include
 DEFS	= -DHAVE_CONFIG_H
 CPPFLAGS= 
-CFLAGS	= -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops
+CFLAGS	= -Wall -O4 -fexpensive-optimizations -funroll-loops
 LIBS	= 
 LDFLAGS	=  -L.
 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
diff --git a/libs/srtp/config.log b/libs/srtp/config.log
index e98db7982b..468f78547e 100644
--- a/libs/srtp/config.log
+++ b/libs/srtp/config.log
@@ -4,22 +4,22 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
-  $ ./configure --prefix=/usr/local/freeswitch --enable-pic
+  $ ./configure --prefix=/usr/local/freeswitch
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = drone1
-uname -m = x86_64
-uname -r = 2.6.13.4
+hostname = agentbox3
+uname -m = i686
+uname -r = 2.6.9-r1
 uname -s = Linux
-uname -v = #2 SMP Mon Oct 31 12:11:19 UTC 2005
+uname -v = #4 SMP Tue Mar 21 23:08:10 UTC 2006
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
 
-/bin/arch              = x86_64
+/bin/arch              = i686
 /usr/bin/arch -k       = unknown
 /usr/convex/getsysinfo = unknown
 hostinfo               = unknown
@@ -49,17 +49,17 @@ configure:1450: found /usr/bin/gcc
 configure:1460: result: gcc
 configure:1704: checking for C compiler version
 configure:1707: gcc --version </dev/null >&5
-gcc (GCC) 3.4.4 (CRUX)
-Copyright (C) 2004 Free Software Foundation, Inc.
+gcc (GCC) 3.3.4 (AsterLinux)
+Copyright (C) 2003 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 configure:1710: $? = 0
 configure:1712: gcc -v </dev/null >&5
-Reading specs from /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/specs
-Configured with: ../gcc-3.4.4/configure --prefix=/usr --libexecdir=/usr/lib64 --libdir=/usr/lib64 --with-slibdir=/lib64 --enable-languages=c,c++,objc --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu --enable-shared --enable-multilib --disable-nls
+Reading specs from /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/specs
+Configured with: ../gcc-3.3.4/configure --prefix=/usr --enable-languages=c,c++,objc --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu --enable-shared --disable-nls
 Thread model: posix
-gcc version 3.4.4 (CRUX)
+gcc version 3.3.4 (AsterLinux)
 configure:1715: $? = 0
 configure:1717: gcc -V </dev/null >&5
 gcc: `-V' option must have argument
@@ -118,18 +118,18 @@ configure: failed program was:
 | #endif
 configure:2356: checking for a BSD-compatible install
 configure:2411: result: /usr/bin/install -c
-configure:2437: checking whether to build for Linux kernel context
-configure:2451: result: no
-configure:2455: checking for /dev/urandom
-configure:2470: result: yes
-configure:2500: checking which random device to use
-configure:2514: result: /dev/urandom
-configure:2530: checking how to run the C preprocessor
-configure:2565: gcc -E  conftest.c
-configure:2571: $? = 0
-configure:2603: gcc -E  conftest.c
+configure:2436: checking whether to build for Linux kernel context
+configure:2450: result: no
+configure:2454: checking for /dev/urandom
+configure:2469: result: yes
+configure:2499: checking which random device to use
+configure:2513: result: /dev/urandom
+configure:2529: checking how to run the C preprocessor
+configure:2564: gcc -E  conftest.c
+configure:2570: $? = 0
+configure:2602: gcc -E  conftest.c
 conftest.c:10:28: ac_nonexistent.h: No such file or directory
-configure:2609: $? = 1
+configure:2608: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -141,12 +141,12 @@ configure: failed program was:
 | #define DEV_URANDOM "/dev/urandom"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:2648: result: gcc -E
-configure:2672: gcc -E  conftest.c
-configure:2678: $? = 0
-configure:2710: gcc -E  conftest.c
+configure:2647: result: gcc -E
+configure:2671: gcc -E  conftest.c
+configure:2677: $? = 0
+configure:2709: gcc -E  conftest.c
 conftest.c:10:28: ac_nonexistent.h: No such file or directory
-configure:2716: $? = 1
+configure:2715: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -158,148 +158,148 @@ configure: failed program was:
 | #define DEV_URANDOM "/dev/urandom"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:2760: checking for egrep
-configure:2770: result: grep -E
-configure:2775: checking for ANSI C header files
-configure:2800: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2806: $? = 0
-configure:2810: test -z 
+configure:2759: checking for egrep
+configure:2769: result: grep -E
+configure:2774: checking for ANSI C header files
+configure:2799: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2805: $? = 0
+configure:2809: test -z 
 			 || test ! -s conftest.err
-configure:2813: $? = 0
-configure:2816: test -s conftest.o
-configure:2819: $? = 0
-configure:2908: gcc -o conftest -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
+configure:2812: $? = 0
+configure:2815: test -s conftest.o
+configure:2818: $? = 0
+configure:2904: gcc -o conftest -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
 conftest.c: In function `main':
 conftest.c:27: warning: implicit declaration of function `exit'
-configure:2911: $? = 0
-configure:2913: ./conftest
-configure:2916: $? = 0
-configure:2931: result: yes
-configure:2955: checking for sys/types.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2907: $? = 0
+configure:2909: ./conftest
+configure:2912: $? = 0
+configure:2927: result: yes
+configure:2951: checking for sys/types.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for sys/stat.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for sys/stat.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for stdlib.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for stdlib.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for string.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for string.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for memory.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for memory.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for strings.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for strings.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for inttypes.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for inttypes.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for stdint.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for stdint.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:2955: checking for unistd.h
-configure:2971: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:2977: $? = 0
-configure:2981: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:2951: checking for unistd.h
+configure:2967: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:2973: $? = 0
+configure:2977: test -z 
 			 || test ! -s conftest.err
-configure:2984: $? = 0
-configure:2987: test -s conftest.o
-configure:2990: $? = 0
-configure:3001: result: yes
-configure:3018: checking for stdlib.h
-configure:3023: result: yes
-configure:3168: checking for unistd.h
-configure:3173: result: yes
-configure:3327: checking byteswap.h usability
-configure:3339: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:3345: $? = 0
-configure:3349: test -z 
+configure:2980: $? = 0
+configure:2983: test -s conftest.o
+configure:2986: $? = 0
+configure:2997: result: yes
+configure:3014: checking for stdlib.h
+configure:3019: result: yes
+configure:3164: checking for unistd.h
+configure:3169: result: yes
+configure:3323: checking byteswap.h usability
+configure:3335: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:3341: $? = 0
+configure:3345: test -z 
 			 || test ! -s conftest.err
-configure:3352: $? = 0
-configure:3355: test -s conftest.o
-configure:3358: $? = 0
-configure:3368: result: yes
-configure:3372: checking byteswap.h presence
-configure:3382: gcc -E  conftest.c
-configure:3388: $? = 0
-configure:3408: result: yes
-configure:3443: checking for byteswap.h
-configure:3450: result: yes
-configure:3468: checking for stdint.h
-configure:3473: result: yes
-configure:3627: checking sys/uio.h usability
-configure:3639: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:3645: $? = 0
-configure:3649: test -z 
+configure:3348: $? = 0
+configure:3351: test -s conftest.o
+configure:3354: $? = 0
+configure:3364: result: yes
+configure:3368: checking byteswap.h presence
+configure:3378: gcc -E  conftest.c
+configure:3384: $? = 0
+configure:3404: result: yes
+configure:3439: checking for byteswap.h
+configure:3446: result: yes
+configure:3464: checking for stdint.h
+configure:3469: result: yes
+configure:3623: checking sys/uio.h usability
+configure:3635: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:3641: $? = 0
+configure:3645: test -z 
 			 || test ! -s conftest.err
-configure:3652: $? = 0
-configure:3655: test -s conftest.o
-configure:3658: $? = 0
-configure:3668: result: yes
-configure:3672: checking sys/uio.h presence
-configure:3682: gcc -E  conftest.c
-configure:3688: $? = 0
-configure:3708: result: yes
-configure:3743: checking for sys/uio.h
-configure:3750: result: yes
-configure:3768: checking for inttypes.h
-configure:3773: result: yes
-configure:3918: checking for sys/types.h
-configure:3923: result: yes
-configure:4077: checking machine/types.h usability
-configure:4089: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:3648: $? = 0
+configure:3651: test -s conftest.o
+configure:3654: $? = 0
+configure:3664: result: yes
+configure:3668: checking sys/uio.h presence
+configure:3678: gcc -E  conftest.c
+configure:3684: $? = 0
+configure:3704: result: yes
+configure:3739: checking for sys/uio.h
+configure:3746: result: yes
+configure:3764: checking for inttypes.h
+configure:3769: result: yes
+configure:3914: checking for sys/types.h
+configure:3919: result: yes
+configure:4073: checking machine/types.h usability
+configure:4085: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
 conftest.c:61:27: machine/types.h: No such file or directory
-configure:4095: $? = 1
+configure:4091: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -362,11 +362,11 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <machine/types.h>
-configure:4118: result: no
-configure:4122: checking machine/types.h presence
-configure:4132: gcc -E  conftest.c
+configure:4114: result: no
+configure:4118: checking machine/types.h presence
+configure:4128: gcc -E  conftest.c
 conftest.c:27:27: machine/types.h: No such file or directory
-configure:4138: $? = 1
+configure:4134: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -395,13 +395,13 @@ configure: failed program was:
 | #define HAVE_SYS_TYPES_H 1
 | /* end confdefs.h.  */
 | #include <machine/types.h>
-configure:4158: result: no
-configure:4193: checking for machine/types.h
-configure:4200: result: no
-configure:4227: checking sys/int_types.h usability
-configure:4239: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4154: result: no
+configure:4189: checking for machine/types.h
+configure:4196: result: no
+configure:4223: checking sys/int_types.h usability
+configure:4235: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
 conftest.c:61:27: sys/int_types.h: No such file or directory
-configure:4245: $? = 1
+configure:4241: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -464,11 +464,11 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <sys/int_types.h>
-configure:4268: result: no
-configure:4272: checking sys/int_types.h presence
-configure:4282: gcc -E  conftest.c
+configure:4264: result: no
+configure:4268: checking sys/int_types.h presence
+configure:4278: gcc -E  conftest.c
 conftest.c:27:27: sys/int_types.h: No such file or directory
-configure:4288: $? = 1
+configure:4284: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -497,58 +497,58 @@ configure: failed program was:
 | #define HAVE_SYS_TYPES_H 1
 | /* end confdefs.h.  */
 | #include <sys/int_types.h>
-configure:4308: result: no
-configure:4343: checking for sys/int_types.h
-configure:4350: result: no
-configure:4380: checking sys/socket.h usability
-configure:4392: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:4398: $? = 0
-configure:4402: test -z 
+configure:4304: result: no
+configure:4339: checking for sys/int_types.h
+configure:4346: result: no
+configure:4376: checking sys/socket.h usability
+configure:4388: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4394: $? = 0
+configure:4398: test -z 
 			 || test ! -s conftest.err
-configure:4405: $? = 0
-configure:4408: test -s conftest.o
-configure:4411: $? = 0
-configure:4421: result: yes
-configure:4425: checking sys/socket.h presence
-configure:4435: gcc -E  conftest.c
-configure:4441: $? = 0
-configure:4461: result: yes
-configure:4496: checking for sys/socket.h
-configure:4503: result: yes
-configure:4380: checking netinet/in.h usability
-configure:4392: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:4398: $? = 0
-configure:4402: test -z 
+configure:4401: $? = 0
+configure:4404: test -s conftest.o
+configure:4407: $? = 0
+configure:4417: result: yes
+configure:4421: checking sys/socket.h presence
+configure:4431: gcc -E  conftest.c
+configure:4437: $? = 0
+configure:4457: result: yes
+configure:4492: checking for sys/socket.h
+configure:4499: result: yes
+configure:4376: checking netinet/in.h usability
+configure:4388: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4394: $? = 0
+configure:4398: test -z 
 			 || test ! -s conftest.err
-configure:4405: $? = 0
-configure:4408: test -s conftest.o
-configure:4411: $? = 0
-configure:4421: result: yes
-configure:4425: checking netinet/in.h presence
-configure:4435: gcc -E  conftest.c
-configure:4441: $? = 0
-configure:4461: result: yes
-configure:4496: checking for netinet/in.h
-configure:4503: result: yes
-configure:4380: checking arpa/inet.h usability
-configure:4392: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:4398: $? = 0
-configure:4402: test -z 
+configure:4401: $? = 0
+configure:4404: test -s conftest.o
+configure:4407: $? = 0
+configure:4417: result: yes
+configure:4421: checking netinet/in.h presence
+configure:4431: gcc -E  conftest.c
+configure:4437: $? = 0
+configure:4457: result: yes
+configure:4492: checking for netinet/in.h
+configure:4499: result: yes
+configure:4376: checking arpa/inet.h usability
+configure:4388: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4394: $? = 0
+configure:4398: test -z 
 			 || test ! -s conftest.err
-configure:4405: $? = 0
-configure:4408: test -s conftest.o
-configure:4411: $? = 0
-configure:4421: result: yes
-configure:4425: checking arpa/inet.h presence
-configure:4435: gcc -E  conftest.c
-configure:4441: $? = 0
-configure:4461: result: yes
-configure:4496: checking for arpa/inet.h
-configure:4503: result: yes
-configure:4530: checking windows.h usability
-configure:4542: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4401: $? = 0
+configure:4404: test -s conftest.o
+configure:4407: $? = 0
+configure:4417: result: yes
+configure:4421: checking arpa/inet.h presence
+configure:4431: gcc -E  conftest.c
+configure:4437: $? = 0
+configure:4457: result: yes
+configure:4492: checking for arpa/inet.h
+configure:4499: result: yes
+configure:4526: checking windows.h usability
+configure:4538: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
 conftest.c:64:21: windows.h: No such file or directory
-configure:4548: $? = 1
+configure:4544: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -614,11 +614,11 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <windows.h>
-configure:4571: result: no
-configure:4575: checking windows.h presence
-configure:4585: gcc -E  conftest.c
+configure:4567: result: no
+configure:4571: checking windows.h presence
+configure:4581: gcc -E  conftest.c
 conftest.c:30:21: windows.h: No such file or directory
-configure:4591: $? = 1
+configure:4587: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -650,193 +650,193 @@ configure: failed program was:
 | #define HAVE_ARPA_INET_H 1
 | /* end confdefs.h.  */
 | #include <windows.h>
-configure:4611: result: no
-configure:4646: checking for windows.h
-configure:4653: result: no
-configure:4830: checking syslog.h usability
-configure:4842: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:4848: $? = 0
-configure:4852: test -z 
+configure:4607: result: no
+configure:4642: checking for windows.h
+configure:4649: result: no
+configure:4826: checking syslog.h usability
+configure:4838: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4844: $? = 0
+configure:4848: test -z 
 			 || test ! -s conftest.err
-configure:4855: $? = 0
-configure:4858: test -s conftest.o
-configure:4861: $? = 0
-configure:4871: result: yes
-configure:4875: checking syslog.h presence
-configure:4885: gcc -E  conftest.c
-configure:4891: $? = 0
-configure:4911: result: yes
-configure:4946: checking for syslog.h
-configure:4953: result: yes
-configure:4967: checking for int8_t
-configure:4991: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:4997: $? = 0
-configure:5001: test -z 
+configure:4851: $? = 0
+configure:4854: test -s conftest.o
+configure:4857: $? = 0
+configure:4867: result: yes
+configure:4871: checking syslog.h presence
+configure:4881: gcc -E  conftest.c
+configure:4887: $? = 0
+configure:4907: result: yes
+configure:4942: checking for syslog.h
+configure:4949: result: yes
+configure:4963: checking for int8_t
+configure:4987: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:4993: $? = 0
+configure:4997: test -z 
 			 || test ! -s conftest.err
-configure:5004: $? = 0
-configure:5007: test -s conftest.o
-configure:5010: $? = 0
-configure:5021: result: yes
-configure:5031: checking for uint8_t
-configure:5055: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5061: $? = 0
-configure:5065: test -z 
+configure:5000: $? = 0
+configure:5003: test -s conftest.o
+configure:5006: $? = 0
+configure:5017: result: yes
+configure:5027: checking for uint8_t
+configure:5051: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5057: $? = 0
+configure:5061: test -z 
 			 || test ! -s conftest.err
-configure:5068: $? = 0
-configure:5071: test -s conftest.o
-configure:5074: $? = 0
-configure:5085: result: yes
-configure:5095: checking for int16_t
-configure:5119: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5125: $? = 0
-configure:5129: test -z 
+configure:5064: $? = 0
+configure:5067: test -s conftest.o
+configure:5070: $? = 0
+configure:5081: result: yes
+configure:5091: checking for int16_t
+configure:5115: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5121: $? = 0
+configure:5125: test -z 
 			 || test ! -s conftest.err
-configure:5132: $? = 0
-configure:5135: test -s conftest.o
-configure:5138: $? = 0
-configure:5149: result: yes
-configure:5159: checking for uint16_t
-configure:5183: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5189: $? = 0
-configure:5193: test -z 
+configure:5128: $? = 0
+configure:5131: test -s conftest.o
+configure:5134: $? = 0
+configure:5145: result: yes
+configure:5155: checking for uint16_t
+configure:5179: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5185: $? = 0
+configure:5189: test -z 
 			 || test ! -s conftest.err
-configure:5196: $? = 0
-configure:5199: test -s conftest.o
-configure:5202: $? = 0
-configure:5213: result: yes
-configure:5223: checking for int32_t
-configure:5247: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5253: $? = 0
-configure:5257: test -z 
+configure:5192: $? = 0
+configure:5195: test -s conftest.o
+configure:5198: $? = 0
+configure:5209: result: yes
+configure:5219: checking for int32_t
+configure:5243: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5249: $? = 0
+configure:5253: test -z 
 			 || test ! -s conftest.err
-configure:5260: $? = 0
-configure:5263: test -s conftest.o
-configure:5266: $? = 0
-configure:5277: result: yes
-configure:5287: checking for uint32_t
-configure:5311: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5317: $? = 0
-configure:5321: test -z 
+configure:5256: $? = 0
+configure:5259: test -s conftest.o
+configure:5262: $? = 0
+configure:5273: result: yes
+configure:5283: checking for uint32_t
+configure:5307: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5313: $? = 0
+configure:5317: test -z 
 			 || test ! -s conftest.err
-configure:5324: $? = 0
-configure:5327: test -s conftest.o
-configure:5330: $? = 0
-configure:5341: result: yes
-configure:5351: checking for uint64_t
-configure:5375: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5381: $? = 0
-configure:5385: test -z 
+configure:5320: $? = 0
+configure:5323: test -s conftest.o
+configure:5326: $? = 0
+configure:5337: result: yes
+configure:5347: checking for uint64_t
+configure:5371: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5377: $? = 0
+configure:5381: test -z 
 			 || test ! -s conftest.err
-configure:5388: $? = 0
-configure:5391: test -s conftest.o
-configure:5394: $? = 0
-configure:5405: result: yes
-configure:5416: checking for unsigned long
-configure:5440: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5446: $? = 0
-configure:5450: test -z 
+configure:5384: $? = 0
+configure:5387: test -s conftest.o
+configure:5390: $? = 0
+configure:5401: result: yes
+configure:5412: checking for unsigned long
+configure:5436: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5442: $? = 0
+configure:5446: test -z 
 			 || test ! -s conftest.err
-configure:5453: $? = 0
-configure:5456: test -s conftest.o
-configure:5459: $? = 0
-configure:5470: result: yes
-configure:5473: checking size of unsigned long
-configure:5792: gcc -o conftest -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
-configure:5795: $? = 0
-configure:5797: ./conftest
-configure:5800: $? = 0
-configure:5823: result: 8
-configure:5830: checking for unsigned long long
-configure:5854: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:5860: $? = 0
-configure:5864: test -z 
+configure:5449: $? = 0
+configure:5452: test -s conftest.o
+configure:5455: $? = 0
+configure:5466: result: yes
+configure:5469: checking size of unsigned long
+configure:5788: gcc -o conftest -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
+configure:5791: $? = 0
+configure:5793: ./conftest
+configure:5796: $? = 0
+configure:5819: result: 4
+configure:5826: checking for unsigned long long
+configure:5850: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5856: $? = 0
+configure:5860: test -z 
 			 || test ! -s conftest.err
-configure:5867: $? = 0
-configure:5870: test -s conftest.o
-configure:5873: $? = 0
-configure:5884: result: yes
-configure:5887: checking size of unsigned long long
-configure:6206: gcc -o conftest -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
-configure:6209: $? = 0
-configure:6211: ./conftest
-configure:6214: $? = 0
-configure:6237: result: 8
-configure:6245: checking for an ANSI C-conforming const
-configure:6312: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:5863: $? = 0
+configure:5866: test -s conftest.o
+configure:5869: $? = 0
+configure:5880: result: yes
+configure:5883: checking size of unsigned long long
+configure:6202: gcc -o conftest -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
+configure:6205: $? = 0
+configure:6207: ./conftest
+configure:6210: $? = 0
+configure:6233: result: 8
+configure:6241: checking for an ANSI C-conforming const
+configure:6308: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
 conftest.c: In function `main':
 conftest.c:67: warning: unused variable `s'
 conftest.c:87: warning: unused variable `foo'
 conftest.c:48: warning: unused variable `x'
 conftest.c:54: warning: unused variable `zero'
-conftest.c:84: warning: 'b' might be used uninitialized in this function
-conftest.c:66: warning: 't' might be used uninitialized in this function
-configure:6318: $? = 0
-configure:6322: test -z 
+conftest.c:66: warning: `t' might be used uninitialized in this function
+conftest.c:84: warning: `b' might be used uninitialized in this function
+configure:6314: $? = 0
+configure:6318: test -z 
 			 || test ! -s conftest.err
-configure:6325: $? = 0
-configure:6328: test -s conftest.o
-configure:6331: $? = 0
-configure:6342: result: yes
-configure:6352: checking for inline
-configure:6373: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:6379: $? = 0
-configure:6383: test -z 
+configure:6321: $? = 0
+configure:6324: test -s conftest.o
+configure:6327: $? = 0
+configure:6338: result: yes
+configure:6348: checking for inline
+configure:6369: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:6375: $? = 0
+configure:6379: test -z 
 			 || test ! -s conftest.err
-configure:6386: $? = 0
-configure:6389: test -s conftest.o
-configure:6392: $? = 0
-configure:6404: result: inline
-configure:6423: checking for size_t
-configure:6447: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:6453: $? = 0
-configure:6457: test -z 
+configure:6382: $? = 0
+configure:6385: test -s conftest.o
+configure:6388: $? = 0
+configure:6400: result: inline
+configure:6419: checking for size_t
+configure:6443: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:6449: $? = 0
+configure:6453: test -z 
 			 || test ! -s conftest.err
-configure:6460: $? = 0
-configure:6463: test -s conftest.o
-configure:6466: $? = 0
-configure:6477: result: yes
-configure:6496: checking for socket
-configure:6553: gcc -o conftest -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
-configure:6559: $? = 0
-configure:6563: test -z 
+configure:6456: $? = 0
+configure:6459: test -s conftest.o
+configure:6462: $? = 0
+configure:6473: result: yes
+configure:6492: checking for socket
+configure:6549: gcc -o conftest -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
+configure:6555: $? = 0
+configure:6559: test -z 
 			 || test ! -s conftest.err
-configure:6566: $? = 0
-configure:6569: test -s conftest
-configure:6572: $? = 0
-configure:6584: result: yes
-configure:6496: checking for inet_aton
-configure:6553: gcc -o conftest -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
-configure:6559: $? = 0
-configure:6563: test -z 
+configure:6562: $? = 0
+configure:6565: test -s conftest
+configure:6568: $? = 0
+configure:6580: result: yes
+configure:6492: checking for inet_aton
+configure:6549: gcc -o conftest -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
+configure:6555: $? = 0
+configure:6559: test -z 
 			 || test ! -s conftest.err
-configure:6566: $? = 0
-configure:6569: test -s conftest
-configure:6572: $? = 0
-configure:6584: result: yes
-configure:6496: checking for usleep
-configure:6553: gcc -o conftest -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
-configure:6559: $? = 0
-configure:6563: test -z 
+configure:6562: $? = 0
+configure:6565: test -s conftest
+configure:6568: $? = 0
+configure:6580: result: yes
+configure:6492: checking for usleep
+configure:6549: gcc -o conftest -Wall -O4 -fexpensive-optimizations -funroll-loops   conftest.c  >&5
+configure:6555: $? = 0
+configure:6559: test -z 
 			 || test ! -s conftest.err
-configure:6566: $? = 0
-configure:6569: test -s conftest
-configure:6572: $? = 0
-configure:6584: result: yes
-configure:6730: checking whether byte ordering is bigendian
-configure:6757: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
-configure:6763: $? = 0
-configure:6767: test -z 
+configure:6562: $? = 0
+configure:6565: test -s conftest
+configure:6568: $? = 0
+configure:6580: result: yes
+configure:6726: checking whether byte ordering is bigendian
+configure:6753: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:6759: $? = 0
+configure:6763: test -z 
 			 || test ! -s conftest.err
-configure:6770: $? = 0
-configure:6773: test -s conftest.o
-configure:6776: $? = 0
-configure:6800: gcc -c -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
+configure:6766: $? = 0
+configure:6769: test -s conftest.o
+configure:6772: $? = 0
+configure:6796: gcc -c -Wall -O4 -fexpensive-optimizations -funroll-loops  conftest.c >&5
 conftest.c: In function `main':
 conftest.c:50: error: `not' undeclared (first use in this function)
 conftest.c:50: error: (Each undeclared identifier is reported only once
 conftest.c:50: error: for each function it appears in.)
 conftest.c:50: error: parse error before "big"
-configure:6806: $? = 1
+configure:6802: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | 
@@ -874,7 +874,7 @@ configure: failed program was:
 | #define HAVE_INT32_T 1
 | #define HAVE_UINT32_T 1
 | #define HAVE_UINT64_T 1
-| #define SIZEOF_UNSIGNED_LONG 8
+| #define SIZEOF_UNSIGNED_LONG 4
 | #define SIZEOF_UNSIGNED_LONG_LONG 8
 | #define HAVE_SOCKET 1
 | #define HAVE_INET_ATON 1
@@ -893,24 +893,24 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:6941: result: no
-configure:6967: checking build system type
-configure:6985: result: x86_64-unknown-linux-gnu
-configure:6993: checking host system type
-configure:7007: result: x86_64-unknown-linux-gnu
-configure:7053: checking whether to compile in debugging
-configure:7069: result: yes
-configure:7072: checking whether to use ISMAcryp code
-configure:7088: result: no
-configure:7091: checking whether to use syslog for error reporting
-configure:7107: result: no
-configure:7110: checking whether to use stdout for error reporting
-configure:7126: result: yes
-configure:7129: checking whether to use /dev/console for error reporting
-configure:7150: result: no
-configure:7153: checking whether to use GDOI key management
-configure:7171: result: no
-configure:7273: creating ./config.status
+configure:6937: result: no
+configure:6963: checking build system type
+configure:6981: result: i686-pc-linux-gnu
+configure:6989: checking host system type
+configure:7003: result: i686-pc-linux-gnu
+configure:7049: checking whether to compile in debugging
+configure:7065: result: yes
+configure:7068: checking whether to use ISMAcryp code
+configure:7084: result: no
+configure:7087: checking whether to use syslog for error reporting
+configure:7103: result: no
+configure:7106: checking whether to use stdout for error reporting
+configure:7122: result: yes
+configure:7125: checking whether to use /dev/console for error reporting
+configure:7146: result: no
+configure:7149: checking whether to use GDOI key management
+configure:7167: result: no
+configure:7269: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -925,20 +925,19 @@ generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on drone1
+on agentbox3
 
 config.status:664: creating Makefile
 config.status:664: creating crypto/Makefile
 config.status:664: creating doc/Makefile
 config.status:768: creating crypto/include/config.h
-config.status:942: crypto/include/config.h is unchanged
 
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
 
-ac_cv_build=x86_64-unknown-linux-gnu
-ac_cv_build_alias=x86_64-unknown-linux-gnu
+ac_cv_build=i686-pc-linux-gnu
+ac_cv_build_alias=i686-pc-linux-gnu
 ac_cv_c_bigendian=no
 ac_cv_c_compiler_gnu=yes
 ac_cv_c_const=yes
@@ -983,8 +982,8 @@ ac_cv_header_sys_uio_h=yes
 ac_cv_header_syslog_h=yes
 ac_cv_header_unistd_h=yes
 ac_cv_header_windows_h=no
-ac_cv_host=x86_64-unknown-linux-gnu
-ac_cv_host_alias=x86_64-unknown-linux-gnu
+ac_cv_host=i686-pc-linux-gnu
+ac_cv_host_alias=i686-pc-linux-gnu
 ac_cv_objext=o
 ac_cv_path_install='/usr/bin/install -c'
 ac_cv_prog_CPP='gcc -E'
@@ -993,7 +992,7 @@ ac_cv_prog_ac_ct_RANLIB=ranlib
 ac_cv_prog_cc_g=yes
 ac_cv_prog_cc_stdc=
 ac_cv_prog_egrep='grep -E'
-ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long=4
 ac_cv_sizeof_unsigned_long_long=8
 ac_cv_type_int16_t=yes
 ac_cv_type_int32_t=yes
@@ -1011,7 +1010,7 @@ ac_cv_type_unsigned_long_long=yes
 ## ----------------- ##
 
 CC='gcc'
-CFLAGS='-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops'
+CFLAGS='-Wall -O4 -fexpensive-optimizations -funroll-loops'
 CPP='gcc -E'
 CPPFLAGS=''
 DEFS='-DHAVE_CONFIG_H'
@@ -1042,18 +1041,18 @@ SHELL='/bin/sh'
 ac_ct_CC='gcc'
 ac_ct_RANLIB='ranlib'
 bindir='${exec_prefix}/bin'
-build='x86_64-unknown-linux-gnu'
+build='i686-pc-linux-gnu'
 build_alias=''
-build_cpu='x86_64'
+build_cpu='i686'
 build_os='linux-gnu'
-build_vendor='unknown'
+build_vendor='pc'
 datadir='${prefix}/share'
 exec_prefix='${prefix}'
-host='x86_64-unknown-linux-gnu'
+host='i686-pc-linux-gnu'
 host_alias=''
-host_cpu='x86_64'
+host_cpu='i686'
 host_os='linux-gnu'
-host_vendor='unknown'
+host_vendor='pc'
 includedir='${prefix}/include'
 infodir='${prefix}/info'
 libdir='${exec_prefix}/lib'
@@ -1106,12 +1105,13 @@ target_alias=''
 #define HAVE_UNISTD_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_USLEEP 1
+#define HAVE_X86 1
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME ""
 #define PACKAGE_STRING ""
 #define PACKAGE_TARNAME ""
 #define PACKAGE_VERSION ""
-#define SIZEOF_UNSIGNED_LONG 8
+#define SIZEOF_UNSIGNED_LONG 4
 #define SIZEOF_UNSIGNED_LONG_LONG 8
 #define STDC_HEADERS 1
 
diff --git a/libs/srtp/config.status b/libs/srtp/config.status
index 8fa9c0b7de..364f53b90e 100755
--- a/libs/srtp/config.status
+++ b/libs/srtp/config.status
@@ -300,7 +300,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"'--prefix=/usr/local/freeswitch' '--enable-pic'\"
+  with options \"'--prefix=/usr/local/freeswitch'\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -379,8 +379,8 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  echo "running /bin/sh ./configure " '--prefix=/usr/local/freeswitch' '--enable-pic' $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh ./configure '--prefix=/usr/local/freeswitch' '--enable-pic' $ac_configure_extra_args --no-create --no-recursion
+  echo "running /bin/sh ./configure " '--prefix=/usr/local/freeswitch' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec /bin/sh ./configure '--prefix=/usr/local/freeswitch' $ac_configure_extra_args --no-create --no-recursion
 fi
 
 for ac_config_target in $ac_config_targets
@@ -475,7 +475,7 @@ s,@LIBS@,,;t t
 s,@RANLIB@,ranlib,;t t
 s,@ac_ct_RANLIB@,ranlib,;t t
 s,@CC@,gcc,;t t
-s,@CFLAGS@,-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops,;t t
+s,@CFLAGS@,-Wall -O4 -fexpensive-optimizations -funroll-loops,;t t
 s,@LDFLAGS@,,;t t
 s,@CPPFLAGS@,,;t t
 s,@ac_ct_CC@,gcc,;t t
@@ -487,13 +487,13 @@ s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
 s,@RNG_OBJS@,rand_source.o,;t t
 s,@CPP@,gcc -E,;t t
 s,@EGREP@,grep -E,;t t
-s,@build@,x86_64-unknown-linux-gnu,;t t
-s,@build_cpu@,x86_64,;t t
-s,@build_vendor@,unknown,;t t
+s,@build@,i686-pc-linux-gnu,;t t
+s,@build_cpu@,i686,;t t
+s,@build_vendor@,pc,;t t
 s,@build_os@,linux-gnu,;t t
-s,@host@,x86_64-unknown-linux-gnu,;t t
-s,@host_cpu@,x86_64,;t t
-s,@host_vendor@,unknown,;t t
+s,@host@,i686-pc-linux-gnu,;t t
+s,@host_cpu@,i686,;t t
+s,@host_vendor@,pc,;t t
 s,@host_os@,linux-gnu,;t t
 s,@EXE@,,;t t
 s,@GDOI_OBJS@,,;t t
@@ -841,7 +841,7 @@ ${ac_dA}HAVE_UINT16_T${ac_dB}HAVE_UINT16_T${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_INT32_T${ac_dB}HAVE_INT32_T${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_UINT32_T${ac_dB}HAVE_UINT32_T${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_UINT64_T${ac_dB}HAVE_UINT64_T${ac_dC}1${ac_dD}
-${ac_dA}SIZEOF_UNSIGNED_LONG${ac_dB}SIZEOF_UNSIGNED_LONG${ac_dC}8${ac_dD}
+${ac_dA}SIZEOF_UNSIGNED_LONG${ac_dB}SIZEOF_UNSIGNED_LONG${ac_dC}4${ac_dD}
 ${ac_dA}SIZEOF_UNSIGNED_LONG_LONG${ac_dB}SIZEOF_UNSIGNED_LONG_LONG${ac_dC}8${ac_dD}
 ${ac_dA}HAVE_SOCKET${ac_dB}HAVE_SOCKET${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_INET_ATON${ac_dB}HAVE_INET_ATON${ac_dC}1${ac_dD}
@@ -856,6 +856,7 @@ t clr
 : clr
 ${ac_dA}HAVE_USLEEP${ac_dB}HAVE_USLEEP${ac_dC}1${ac_dD}
 ${ac_dA}CPU_CISC${ac_dB}CPU_CISC${ac_dC}1${ac_dD}
+${ac_dA}HAVE_X86${ac_dB}HAVE_X86${ac_dC}1${ac_dD}
 ${ac_dA}ENABLE_DEBUGGING${ac_dB}ENABLE_DEBUGGING${ac_dC}1${ac_dD}
 ${ac_dA}ERR_REPORTING_STDOUT${ac_dB}ERR_REPORTING_STDOUT${ac_dC}1${ac_dD}
 CEOF
@@ -904,7 +905,7 @@ ${ac_uA}HAVE_UINT16_T${ac_uB}HAVE_UINT16_T${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_INT32_T${ac_uB}HAVE_INT32_T${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_UINT32_T${ac_uB}HAVE_UINT32_T${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_UINT64_T${ac_uB}HAVE_UINT64_T${ac_uC}1${ac_uD}
-${ac_uA}SIZEOF_UNSIGNED_LONG${ac_uB}SIZEOF_UNSIGNED_LONG${ac_uC}8${ac_uD}
+${ac_uA}SIZEOF_UNSIGNED_LONG${ac_uB}SIZEOF_UNSIGNED_LONG${ac_uC}4${ac_uD}
 ${ac_uA}SIZEOF_UNSIGNED_LONG_LONG${ac_uB}SIZEOF_UNSIGNED_LONG_LONG${ac_uC}8${ac_uD}
 ${ac_uA}HAVE_SOCKET${ac_uB}HAVE_SOCKET${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_INET_ATON${ac_uB}HAVE_INET_ATON${ac_uC}1${ac_uD}
@@ -919,6 +920,7 @@ t clr
 : clr
 ${ac_uA}HAVE_USLEEP${ac_uB}HAVE_USLEEP${ac_uC}1${ac_uD}
 ${ac_uA}CPU_CISC${ac_uB}CPU_CISC${ac_uC}1${ac_uD}
+${ac_uA}HAVE_X86${ac_uB}HAVE_X86${ac_uC}1${ac_uD}
 ${ac_uA}ENABLE_DEBUGGING${ac_uB}ENABLE_DEBUGGING${ac_uC}1${ac_uD}
 ${ac_uA}ERR_REPORTING_STDOUT${ac_uB}ERR_REPORTING_STDOUT${ac_uC}1${ac_uD}
 s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
diff --git a/libs/srtp/crypto/Makefile b/libs/srtp/crypto/Makefile
index fe5ae96f33..d7ac61fb14 100644
--- a/libs/srtp/crypto/Makefile
+++ b/libs/srtp/crypto/Makefile
@@ -12,7 +12,7 @@ CC	= gcc
 INCDIR	= -Iinclude -I$(srcdir)/include
 DEFS	= -DHAVE_CONFIG_H
 CPPFLAGS= 
-CFLAGS	= -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops
+CFLAGS	= -Wall -O4 -fexpensive-optimizations -funroll-loops
 LIBS	= 
 LDFLAGS	=  -L.
 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
diff --git a/libs/srtp/crypto/include/config.h b/libs/srtp/crypto/include/config.h
index 5163cf9b9c..bf039d9121 100644
--- a/libs/srtp/crypto/include/config.h
+++ b/libs/srtp/crypto/include/config.h
@@ -113,7 +113,7 @@
 /* #undef HAVE_WINSOCK2_H */
 
 /* Define to use X86 inlined assembly code */
-/* #undef HAVE_X86 */
+#define HAVE_X86 1
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""
@@ -131,7 +131,7 @@
 #define PACKAGE_VERSION ""
 
 /* The size of a `unsigned long', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG 8
+#define SIZEOF_UNSIGNED_LONG 4
 
 /* The size of a `unsigned long long', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_LONG_LONG 8