diff --git a/configure b/configure
index e87be015f..dc94d17d8 100755
--- a/configure
+++ b/configure
@@ -1,83 +1,60 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67.
-#
+# Generated by GNU Autoconf 2.61.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
 fi
 
 
@@ -86,18 +63,20 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -108,270 +87,32 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+done
 
+# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -385,17 +126,13 @@ else
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
+# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -410,19 +147,294 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
 
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -439,7 +451,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -449,40 +462,49 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -490,7 +512,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -507,12 +529,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
-	case $1 in #(
-	-*)set "./$1";;
+	case $1 in
+        -*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -526,11 +548,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -545,6 +567,7 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME=
@@ -552,7 +575,6 @@ PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
-PACKAGE_URL=
 
 ac_unique_file="src/Audacity.h"
 ac_default_prefix=/usr/local
@@ -593,151 +615,122 @@ ac_includes_default="\
 #endif"
 
 ac_header_list=
-enable_option_checking=no
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-JACK_LIBS
-JACK_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-HAVE_GTK
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-PORTAUDIO_LIBS
-PORTAUDIO_CFLAGS
-PORTSMF_LIBS
-PORTSMF_CFLAGS
-AVUTIL_LIBS
-AVUTIL_CFLAGS
-AVFORMAT_LIBS
-AVFORMAT_CFLAGS
-AVCODEC_LIBS
-AVCODEC_CFLAGS
-LIBTWOLAME_LIBS
-LIBTWOLAME_CFLAGS
-VAMP_LIBS
-VAMP_CFLAGS
-SOUNDTOUCH_LIBS
-SOUNDTOUCH_CFLAGS
-SBSMS_LIBS
-SBSMS_CFLAGS
-LIBMAD_LIBS
-LIBMAD_CFLAGS
-SAMPLERATE_LIBS
-SAMPLERATE_CFLAGS
-SNDFILE_LIBS
-SNDFILE_CFLAGS
-WIDGETEXTRA_LIBS
-WIDGETEXTRA_CFLAGS
-PKG_CONFIG
-subdirs
-WX_CONFIG
-HAVE_VISIBILITY
-CFLAG_VISIBILITY
-EGREP
-GREP
-SED
-AUDACITY_NAME
-LIBSRC_BUILD
-BUILD_LDFLAGS
-CONFIGHEADER
-INSTALL_PREFIX
-AFTERBUILD
-PRECOMP_CFLAGS
-CDEPEND
-OPTOBJS
-EXTRAUNINSTALLTARGETS
-EXTRAINSTALLTARGETS
-EXTRATARGETS
-EXTRAOBJS
-LOCAL_LIBS
-HAVE_PKG_CONFIG
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-CXXCPP
-ac_ct_CXX
-CXXFLAGS
-CXX
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
+ac_subst_vars='SHELL
 PATH_SEPARATOR
-SHELL'
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXCPP
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+HAVE_PKG_CONFIG
+LOCAL_LIBS
+EXTRAOBJS
+EXTRATARGETS
+EXTRAINSTALLTARGETS
+EXTRAUNINSTALLTARGETS
+OPTOBJS
+CDEPEND
+PRECOMP_CFLAGS
+AFTERBUILD
+INSTALL_PREFIX
+CONFIGHEADER
+BUILD_LDFLAGS
+LIBSRC_BUILD
+AUDACITY_NAME
+SED
+GREP
+EGREP
+CFLAG_VISIBILITY
+HAVE_VISIBILITY
+WX_CONFIG
+subdirs
+PKG_CONFIG
+WIDGETEXTRA_CFLAGS
+WIDGETEXTRA_LIBS
+SNDFILE_CFLAGS
+SNDFILE_LIBS
+SAMPLERATE_CFLAGS
+SAMPLERATE_LIBS
+LIBMAD_CFLAGS
+LIBMAD_LIBS
+SBSMS_CFLAGS
+SBSMS_LIBS
+SOUNDTOUCH_CFLAGS
+SOUNDTOUCH_LIBS
+VAMP_CFLAGS
+VAMP_LIBS
+LIBTWOLAME_CFLAGS
+LIBTWOLAME_LIBS
+AVCODEC_CFLAGS
+AVCODEC_LIBS
+AVFORMAT_CFLAGS
+AVFORMAT_LIBS
+AVUTIL_CFLAGS
+AVUTIL_LIBS
+PORTSMF_CFLAGS
+PORTSMF_LIBS
+PORTAUDIO_CFLAGS
+PORTAUDIO_LIBS
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+HAVE_GTK
+GTK_CFLAGS
+GTK_LIBS
+JACK_CFLAGS
+JACK_LIBS
+LIBOBJS
+LTLIBOBJS'
 ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_static
-enable_unicode
-enable_debug
-with_lib_preference
-with_libsndfile
-with_expat
-with_libsamplerate
-with_libresample
-with_libvorbis
-with_libmad
-with_libflac
-with_libid3tag
-with_sbsms
-with_soundtouch
-enable_nyquist
-with_libvamp
-with_libtwolame
-with_ffmpeg
-with_midi
-with_portaudio
-enable_audiounits
-enable_ladspa
-enable_quicktime
-with_portmixer
-'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -788,8 +781,6 @@ lib-src/portmixer'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -845,9 +836,8 @@ do
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -889,20 +879,13 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -915,20 +898,13 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1119,36 +1095,22 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1168,25 +1130,25 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1195,36 +1157,23 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
+# Be sure to have absolute directory names.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1238,8 +1187,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1254,21 +1203,23 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+  ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1295,11 +1246,13 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1339,7 +1292,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1347,9 +1300,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1359,25 +1312,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1398,12 +1351,12 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-static         link wx statically [default=no]
   --enable-unicode        enable unicode support [default=yes]
   --enable-debug          enable debug support [default=no]
+  --enable-sse            enable SSE optimizations
   --enable-nyquist        enable Nyquist plug-in support [default=yes]
   --enable-audiounits     enable audio unit plug-in support (Mac OS X only)
                           [default=auto]
@@ -1442,7 +1395,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -1503,7 +1456,6 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1511,17 +1463,15 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1557,7 +1507,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1567,464 +1517,21 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.61
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
-# ---------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_cxx_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_type
-
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_run
-
-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_cxx_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_header_compile
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_header_mongrel
-
-# ac_fn_cxx_check_func LINENO FUNC VAR
-# ------------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_cxx_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -2060,8 +1567,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 } >&5
@@ -2095,12 +1602,12 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -2116,13 +1623,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      as_fn_append ac_configure_args " '$ac_arg'"
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
 done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -2134,9 +1641,11 @@ trap 'exit_status=$?
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2145,13 +1654,12 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -2170,140 +1678,132 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
-
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
+# Prefer explicitly selected file to automatically selected ones.
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  set x "$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+shift
+for ac_site_file
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+    . "$ac_site_file"
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-as_fn_append ac_header_list " alloca.h"
+ac_header_list="$ac_header_list alloca.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2314,56 +1814,60 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2386,10 +1890,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2399,25 +1903,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2426,10 +1930,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2439,25 +1943,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2465,8 +1969,12 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2479,10 +1987,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2492,25 +2000,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2519,10 +2027,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2533,18 +2041,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2563,11 +2071,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2578,10 +2086,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2591,25 +2099,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2622,10 +2130,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2635,25 +2143,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2665,8 +2173,12 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2676,37 +2188,51 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -2718,38 +2244,42 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
-if { { ac_try="$ac_link_default"
+if { (ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2759,14 +2289,14 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2785,41 +2315,78 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+
 ac_exeext=$ac_cv_exeext
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2827,90 +2394,37 @@ $as_echo "$ac_try_echo"; } >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest$ac_cv_exeext
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -2922,46 +2436,51 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -2975,34 +2494,54 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3013,11 +2552,34 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3028,12 +2590,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_c_werror_flag=$ac_save_c_werror_flag
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3044,18 +2629,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3071,14 +2680,18 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3135,9 +2748,31 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -3148,20 +2783,756 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+{ echo "$as_me:$LINENO: checking for C compiler vendor" >&5
+echo $ECHO_N "checking for C compiler vendor... $ECHO_C" >&6; }
+if test "${ax_cv_c_compiler_vendor+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ax_cv_c_compiler_vendor=unknown
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#if !($vencpp)
+      thisisanerror;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+
+fi
+{ echo "$as_me:$LINENO: result: $ax_cv_c_compiler_vendor" >&5
+echo "${ECHO_T}$ax_cv_c_compiler_vendor" >&6; }
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3188,10 +3559,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -3201,25 +3572,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3232,10 +3603,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -3245,25 +3616,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3275,8 +3646,12 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -3286,36 +3661,49 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3329,34 +3717,54 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3367,11 +3775,34 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3382,12 +3813,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3398,18 +3852,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -3436,11 +3914,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -3454,7 +3932,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3463,34 +3945,76 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
   break
 fi
 
@@ -3502,8 +4026,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -3513,7 +4037,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3522,40 +4050,83 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=cpp
@@ -3585,7 +4156,9 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3610,23 +4183,22 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -3644,29 +4216,17 @@ case $as_dir/ in #((
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
 	  fi
 	fi
       done
     done
     ;;
 esac
-
-  done
+done
 IFS=$as_save_IFS
 
-rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3679,8 +4239,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3692,10 +4252,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_HAVE_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$HAVE_PKG_CONFIG"; then
   ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
@@ -3705,14 +4265,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_PKG_CONFIG="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_HAVE_PKG_CONFIG" && ac_cv_prog_HAVE_PKG_CONFIG="no"
@@ -3720,16 +4280,18 @@ fi
 fi
 HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
 if test -n "$HAVE_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5
-$as_echo "$HAVE_PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $HAVE_PKG_CONFIG" >&5
+echo "${ECHO_T}$HAVE_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 if test x$HAVE_PKG_CONFIG = xno ; then
-   as_fn_error $? "pkg-config is required to compile audacity!" "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: pkg-config is required to compile audacity!" >&5
+echo "$as_me: error: pkg-config is required to compile audacity!" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -3752,10 +4314,13 @@ test "$program_prefix" != NONE &&
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
+# Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
 
 
 
@@ -3764,7 +4329,9 @@ AUDACITY_NAME=`echo audacity | sed $program_transform_name`
 
 if [ "$AUDACITY_NAME" = "audacity" ] ; then
 
-$as_echo "#define AUDACITY_NAME \"audacity\"" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define AUDACITY_NAME "audacity"
+_ACEOF
 
 else
     cat >>confdefs.h <<_ACEOF
@@ -3787,51 +4354,58 @@ _ACEOF
 ### Configuration of Audacity module support ###
 ################################################
 
-$as_echo "#define BUILDING_AUDACITY 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define BUILDING_AUDACITY 1
+_ACEOF
 
 # Add -rdynamic to linker flags so the right symbols are exported for
 # plug-ins. This might not work on all architectures / compilers, so we need
 # to check if it does or not.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
+     echo "$ac_script" | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     # Extract the first word of "sed gsed" to use in msg output
+if test -z "$SED"; then
+set dummy sed gsed; ac_prog_name=$2
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
   ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
+  for ac_prog in sed gsed; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+    # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -3843,21 +4417,31 @@ case `"$ac_path_SED" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_SED_found && break 3
-    done
-  done
+
+    $ac_path_SED_found && break 3
   done
+done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
+
+
+fi
+
+SED="$ac_cv_path_SED"
+if test -z "$SED"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -3869,10 +4453,10 @@ $as_echo "$ac_cv_path_SED" >&6; }
 
   flag=`echo "-rdynamic" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts the -rdynamic flag" >&5
-$as_echo_n "checking whether the linker accepts the -rdynamic flag... " >&6; }
-if eval "test \"\${ax_cv_ld_check_flag_$flag+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+  { echo "$as_me:$LINENO: checking whether the linker accepts the -rdynamic flag" >&5
+echo $ECHO_N "checking whether the linker accepts the -rdynamic flag... $ECHO_C" >&6; }
+if { as_var=ax_cv_ld_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -3880,9 +4464,13 @@ else
 
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS -rdynamic"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    cat >conftest.$ac_ext <<_ACEOF
 
+      /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 int
 main ()
@@ -3893,17 +4481,38 @@ main ()
 }
 
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
       eval "ax_cv_ld_check_flag_$flag=yes"
 
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 
       eval "ax_cv_ld_check_flag_$flag=no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 
     LDFLAGS="$save_LDFLAGS"
 
@@ -3911,11 +4520,11 @@ rm -f core conftest.err conftest.$ac_objext \
 
 
 fi
-eval ac_res=\$ax_cv_ld_check_flag_$flag
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'ax_cv_ld_check_flag_$flag'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
-  if eval "test \"`echo '$ax_cv_ld_check_flag_'$flag`\" = yes"; then :
+  if eval "test \"`echo '$ax_cv_ld_check_flag_'$flag`\" = yes"; then
 
     :
     have_dynamic_link=yes
@@ -3927,20 +4536,21 @@ else
 
 fi
 
+
 if test "x$have_dynamic_link" = "xyes" ; then
    BUILD_LDFLAGS="${BUILD_LDFLAGS} -rdynamic "
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Linker does not support -rdynamic. Could not enable exporting all symbols\"" >&5
-$as_echo "$as_me: WARNING: \"Linker does not support -rdynamic. Could not enable exporting all symbols\"" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Audacity module support will probably not work\"" >&5
-$as_echo "$as_me: WARNING: \"Audacity module support will probably not work\"" >&2;}
+   { echo "$as_me:$LINENO: WARNING: \"Linker does not support -rdynamic. Could not enable exporting all symbols\"" >&5
+echo "$as_me: WARNING: \"Linker does not support -rdynamic. Could not enable exporting all symbols\"" >&2;}
+   { echo "$as_me:$LINENO: WARNING: \"Audacity module support will probably not work\"" >&5
+echo "$as_me: WARNING: \"Audacity module support will probably not work\"" >&2;}
 fi
 
 ### Build Options ###
 #####################
 
 # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
+if test "${enable_static+set}" = set; then
   enableval=$enable_static; static_preference="--static=$enableval"
 else
   static_preference=""
@@ -3948,7 +4558,7 @@ fi
 
 
 # Check whether --enable-unicode was given.
-if test "${enable_unicode+set}" = set; then :
+if test "${enable_unicode+set}" = set; then
   enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
 else
   unicode_preference="--unicode=yes"
@@ -3956,7 +4566,7 @@ fi
 
 
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
+if test "${enable_debug+set}" = set; then
   enableval=$enable_debug; debug_preference="$enableval"
 else
   debug_preference="no"
@@ -3965,28 +4575,159 @@ fi
 
 
 # Check whether --with-lib-preference was given.
-if test "${with_lib_preference+set}" = set; then :
+if test "${with_lib_preference+set}" = set; then
   withval=$with_lib_preference; lib_preference=$withval
 else
   lib_preference="system local"
 fi
 
 
+# Check whether --enable-sse was given.
+if test "${enable_sse+set}" = set; then
+  enableval=$enable_sse; enable_sse=$enableval
+else
+  enable_sse=yes
+fi
 
 
+
+
+if test x$enable_sse = xyes; then
+
+   if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
+       { echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse" >&5
+echo $ECHO_N "checking whether C++ compiler accepts -msse... $ECHO_C" >&6; }
+if test "${ax_cv_cxx_flags__msse+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+      ax_save_FLAGS=$CXXFLAGS
+      CXXFLAGS="-msse"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_flags__msse=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ax_cv_cxx_flags__msse=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CXXFLAGS=$ax_save_FLAGS
+fi
+
+eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse
+{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+	SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"
+else
+	{ { echo "$as_me:$LINENO: error: Need a version of gcc with -msse" >&5
+echo "$as_me: error: Need a version of gcc with -msse" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+   fi
+
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <xmmintrin.h>
+int
+main ()
+{
+__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  sse_ok=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	sse_ok=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+   if test x$sse_ok = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_SSE 1
+_ACEOF
+
+   fi
+fi
+
 if test x"$debug_preference" = "xyes" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
-$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
+      { echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
+echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
    CFLAGS="${CFLAGS} -g "
    CXXFLAGS="${CXXFLAGS} -g "
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+if test "${ac_cv_c_const+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4046,56 +4787,83 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  ac_cv_c_const=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_const=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-$as_echo "#define const /**/" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define const
+_ACEOF
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -z "$GREP"; then
   ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
+  for ac_prog in grep ggrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -4107,61 +4875,77 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_GREP_found && break 3
-    done
-  done
+
+    $ac_path_GREP_found && break 3
   done
+done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 else
   ac_cv_path_GREP=$GREP
 fi
 
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     if test -z "$EGREP"; then
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
   ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
+  for ac_prog in egrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4173,31 +4957,46 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_EGREP_found && break 3
-    done
-  done
+
+    $ac_path_EGREP_found && break 3
   done
+done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
+
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4212,53 +5011,85 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -4285,35 +5116,113 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  ac_cv_header_stdc=no
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4321,9 +5230,61 @@ fi
 done
 
 
-ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+{ echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef size_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_size_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_type_size_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+if test $ac_cv_type_size_t = yes; then
+  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -4336,14 +5297,140 @@ fi
 
 
 
-  for ac_header in $ac_header_list
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+
+for ac_header in $ac_header_list
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4356,10 +5443,14 @@ done
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for strict prototypes" >&5
-$as_echo_n "checking CFLAGS for strict prototypes... " >&6; }
-if test "${ac_cv_cflags_strict_prototypes+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+
+
+
+
+{ echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
+echo $ECHO_N "checking CFLAGS for strict prototypes... $ECHO_C" >&6; }
+if test "${ac_cv_cflags_strict_prototypes+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_cflags_strict_prototypes="no, unknown"
 
@@ -4372,7 +5463,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_save_CFLAGS="$CFLAGS"
 for ac_arg in "-pedantic % -fstrict-prototypes -Wstrict-prototypes"    "-pedantic % -Wstrict-prototypes"    "-pedantic % -Wmissing-prototypes"    "-pedantic % -Werror-implicit-function-declaration"    "-pedantic % -Wimplicit-function-declaration"    #
 do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4383,16 +5478,42 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_cflags_strict_prototypes=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case ".$ac_cv_cflags_strict_prototypes" in
    .|.no|.no,*) ;;
    *) # sanity check with signal() from sys/signal.h
     cp config.log config.tmp
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <signal.h>
 int
@@ -4405,13 +5526,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
       if test `diff config.log config.tmp | grep -i warning | wc -l` != 0
 then if test `diff config.log config.tmp | grep -i warning | wc -l` != 1
 then ac_cv_cflags_strict_prototypes="no, suppressed, signal.h," ; fi ; fi
 else
-  ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     rm config.tmp
   ;;
@@ -4425,34 +5566,34 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_strict_prototypes" >&5
-$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
+echo "${ECHO_T}$ac_cv_cflags_strict_prototypes" >&6; }
 case ".$ac_cv_cflags_strict_prototypes" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
-   then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes"; } >&5
+   then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
   (: CFLAGS does contain $ac_cv_cflags_strict_prototypes) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-   else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\""; } >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+   else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
   (: CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
                       CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes"
    fi
  ;;
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking wall_flags for maximum warnings" >&5
-$as_echo_n "checking wall_flags for maximum warnings... " >&6; }
-if test "${ac_cv_cflags_warn_all+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
+echo $ECHO_N "checking wall_flags for maximum warnings... $ECHO_C" >&6; }
+if test "${ac_cv_cflags_warn_all+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_cflags_warn_all="no, unknown"
 
@@ -4465,7 +5606,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_save_CFLAGS="$CFLAGS"
 for ac_arg in "-pedantic  % -Wall"          "-xstrconst % -v"             "-std1      % -verbose -w0 -warnprotos"    "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd"    "-ansi -ansiE % -fullwarn"    "+ESlit     % +w1"            "-Xc        % -pvctl,fullmsg"    "-h conform % -h msglevel 2"    #
 do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4476,9 +5621,31 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
  CFLAGS="$ac_save_CFLAGS"
@@ -4490,24 +5657,24 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5
-$as_echo "$ac_cv_cflags_warn_all" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
+echo "${ECHO_T}$ac_cv_cflags_warn_all" >&6; }
 case ".$ac_cv_cflags_warn_all" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
-   then { { $as_echo "$as_me:${as_lineno-$LINENO}: : wall_flags does contain \$ac_cv_cflags_warn_all"; } >&5
+   then { (echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
   (: wall_flags does contain $ac_cv_cflags_warn_all) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-   else { { $as_echo "$as_me:${as_lineno-$LINENO}: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\""; } >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+   else { (echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
   (: wall_flags="$wall_flags $ac_cv_cflags_warn_all") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
                       wall_flags="$wall_flags $ac_cv_cflags_warn_all"
    fi
  ;;
@@ -4521,10 +5688,10 @@ CFLAGS="${CFLAGS} $wall_flags"
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler accepts the $wall_flags flag" >&5
-$as_echo_n "checking whether the C++ compiler accepts the $wall_flags flag... " >&6; }
-if eval "test \"\${ax_cv_cxx_check_flag_$flag+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+  { echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
+echo $ECHO_N "checking whether the C++ compiler accepts the $wall_flags flag... $ECHO_C" >&6; }
+if { as_var=ax_cv_cxx_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -4537,10 +5704,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
     save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS $wall_flags"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    cat >conftest.$ac_ext <<_ACEOF
 
-      int foo;
+      /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int foo;
 int
 main ()
 {
@@ -4550,15 +5721,35 @@ foo = 1;
 }
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
       eval "ax_cv_cxx_check_flag_$flag=yes"
 
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 
       eval "ax_cv_cxx_check_flag_$flag=no"
 
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     CXXFLAGS="$save_CXXFLAGS"
@@ -4572,11 +5763,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-eval ac_res=\$ax_cv_cxx_check_flag_$flag
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'ax_cv_cxx_check_flag_$flag'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
-  if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then :
+  if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then
 
     :
     cxx_does_wall="yes"
@@ -4588,6 +5779,7 @@ else
 
 fi
 
+
 if test "x$cxx_does_wall" = "xyes" ; then
       CXXFLAGS="${CXXFLAGS} $wall_flags"
 fi
@@ -4598,10 +5790,10 @@ fi
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
-$as_echo_n "checking whether the C++ preprocessor accepts the $wall_flags flag... " >&6; }
-if eval "test \"\${ax_cv_cxxcpp_check_flag_$flag+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+  { echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
+echo $ECHO_N "checking whether the C++ preprocessor accepts the $wall_flags flag... $ECHO_C" >&6; }
+if { as_var=ax_cv_cxxcpp_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -4614,10 +5806,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
     save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS $wall_flags"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    cat >conftest.$ac_ext <<_ACEOF
 
-      int foo;
+      /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int foo;
 int
 main ()
 {
@@ -4627,16 +5823,35 @@ foo = 1;
 }
 
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
 
       eval "ax_cv_cxxcpp_check_flag_$flag=yes"
 
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 
       eval "ax_cv_cxxcpp_check_flag_$flag=no"
 
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
     CXXFLAGS="$save_CXXFLAGS"
 
@@ -4649,11 +5864,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-eval ac_res=\$ax_cv_cxxcpp_check_flag_$flag
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'ax_cv_cxxcpp_check_flag_$flag'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
-  if eval "test \"`echo '$ax_cv_cxxcpp_check_flag_'$flag`\" = yes"; then :
+  if eval "test \"`echo '$ax_cv_cxxcpp_check_flag_'$flag`\" = yes"; then
 
     :
     cpp_does_wall="yes"
@@ -4665,6 +5880,7 @@ else
 
 fi
 
+
 if test "x$cpp_does_wall" = "xyes" ; then
       CPPFLAGS="${CPPFLAGS} $wall_flags"
 fi
@@ -4674,15 +5890,19 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
-$as_echo_n "checking for simple visibility declarations... " >&6; }
-    if test "${gl_cv_cc_visibility+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+    { echo "$as_me:$LINENO: checking for simple visibility declarations" >&5
+echo $ECHO_N "checking for simple visibility declarations... $ECHO_C" >&6; }
+    if test "${gl_cv_cc_visibility+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       gl_save_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS -fvisibility=hidden"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
@@ -4696,17 +5916,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_cc_visibility=yes
 else
-  gl_cv_cc_visibility=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_cc_visibility=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       CFLAGS="$gl_save_CFLAGS"
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-$as_echo "$gl_cv_cc_visibility" >&6; }
+    { echo "$as_me:$LINENO: result: $gl_cv_cc_visibility" >&5
+echo "${ECHO_T}$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -4724,10 +5964,10 @@ _ACEOF
 
 # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_WX_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_WX_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $WX_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -4740,14 +5980,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
@@ -4756,16 +5996,18 @@ esac
 fi
 WX_CONFIG=$ac_cv_path_WX_CONFIG
 if test -n "$WX_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG" >&5
-$as_echo "$WX_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
+echo "${ECHO_T}$WX_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 if [ "$WX_CONFIG" = "no" ] ; then
-   as_fn_error $? "\"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&5
+echo "$as_me: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "x$debug_preference" = "xyes"; then
@@ -4777,8 +6019,8 @@ fi
 wxconfigargs="$static_preference $unicode_preference  $wxconfigargs $wx_preference"
 wx_version=`${WX_CONFIG} $wxconfigargs --version`
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking that the chosen version of wxWidgets is 2.8.x" >&5
-$as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
+{ echo "$as_me:$LINENO: Checking that the chosen version of wxWidgets is 2.8.x" >&5
+echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
 
 case "${wx_version}" in
   2.8.*)
@@ -4786,12 +6028,19 @@ case "${wx_version}" in
     ;;
   *)
   wx_list=`${WX_CONFIG} --list`
-  as_fn_error $? "Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+  { { echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
 The currently available configurations are listed below.  If necessary, either
 install the package for your distribution or download the latest version of
 wxWidgets
 from http://wxwidgets.org.
-${wx_list}" "$LINENO" 5
+${wx_list}" >&5
+echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+The currently available configurations are listed below.  If necessary, either
+install the package for your distribution or download the latest version of
+wxWidgets
+from http://wxwidgets.org.
+${wx_list}" >&2;}
+   { (exit 1); exit 1; }; }
 esac
 
 ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\""
@@ -4801,8 +6050,6 @@ CXXFLAGS="$CXXFLAGS `$WX_CONFIG $wxconfigargs --cxxflags`"
 
 
 
-
-
 subdirs="$subdirs lib-src/FileDialog"
 
 LOCAL_LIBS="$LOCAL_LIBS FileDialog.a"
@@ -4814,10 +6061,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -4829,14 +6076,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -4844,11 +6091,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -4857,10 +6104,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -4872,14 +6119,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -4887,11 +6134,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -4899,8 +6146,12 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -4912,14 +6163,14 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 		PKG_CONFIG=""
 	fi
 
@@ -4977,17 +6228,57 @@ fi
   fi
 
   ax_popdir=`pwd`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-$as_echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
-      as_dir=""${srcdir}/lib-src/lib-widget-extra""; as_fn_mkdir_p
+  { echo "$as_me:$LINENO: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
+      { as_dir=""${srcdir}/lib-src/lib-widget-extra""
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
       ac_builddir=.
 
 case ""${srcdir}/lib-src/lib-widget-extra"" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo ""${srcdir}/lib-src/lib-widget-extra"" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo ""${srcdir}/lib-src/lib-widget-extra"" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -5025,8 +6316,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     # This should be Cygnus configure.
 	ax_sub_configure=$ac_aux_dir/configure
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&2;}
     ax_sub_configure=
   fi
 
@@ -5039,33 +6330,33 @@ $as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-sr
 	ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
     esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+    { echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
     # The eval makes quoting arguments work.
     eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
 	   --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
   fi
 
   cd "$ax_popdir"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
+  { echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+echo "$as_me: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
 
          PKG_CONFIG_PATH="${srcdir}/lib-src/lib-widget-extra/:$PKG_CONFIG_PATH"
    export PKG_CONFIG_PATH
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIDGETEXTRA" >&5
-$as_echo_n "checking for WIDGETEXTRA... " >&6; }
+{ echo "$as_me:$LINENO: checking for WIDGETEXTRA" >&5
+echo $ECHO_N "checking for WIDGETEXTRA... $ECHO_C" >&6; }
 
 if test -n "$WIDGETEXTRA_CFLAGS"; then
     pkg_cv_WIDGETEXTRA_CFLAGS="$WIDGETEXTRA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\"") >&5
   ($PKG_CONFIG --exists --print-errors "libwidgetextra") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_WIDGETEXTRA_CFLAGS=`$PKG_CONFIG --cflags "libwidgetextra" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5077,11 +6368,11 @@ if test -n "$WIDGETEXTRA_LIBS"; then
     pkg_cv_WIDGETEXTRA_LIBS="$WIDGETEXTRA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\"") >&5
   ($PKG_CONFIG --exists --print-errors "libwidgetextra") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_WIDGETEXTRA_LIBS=`$PKG_CONFIG --libs "libwidgetextra" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5107,21 +6398,23 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WIDGETEXTRA_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 widgetextra_available="no"
 elif test $pkg_failed = untried; then
 	widgetextra_available="no"
 else
 	WIDGETEXTRA_CFLAGS=$pkg_cv_WIDGETEXTRA_CFLAGS
 	WIDGETEXTRA_LIBS=$pkg_cv_WIDGETEXTRA_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	widgetextra_available="yes"
 fi
 
    if test "x$widgetextra_available" != "xyes" ; then
-      as_fn_error $? "lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." "$LINENO" 5
+      { { echo "$as_me:$LINENO: error: lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." >&5
+echo "$as_me: error: lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
 BUILD_LDFLAGS="$BUILD_LDFLAGS $WIDGETEXTRA_LIBS"
@@ -5130,14 +6423,14 @@ LIBSRC_BUILD="$LIBSRC_BUILD widgetextra"
 
 LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Determining what libraries are available in this tree and on the system" >&5
-$as_echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;}
+{ echo "$as_me:$LINENO: Determining what libraries are available in this tree and on the system" >&5
+echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;}
 
 
 
 
 # Check whether --with-libsndfile was given.
-if test "${with_libsndfile+set}" = set; then :
+if test "${with_libsndfile+set}" = set; then
   withval=$with_libsndfile; LIBSNDFILE_ARGUMENT=$withval
 else
   LIBSNDFILE_ARGUMENT="unspecified"
@@ -5147,18 +6440,18 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
-$as_echo_n "checking for SNDFILE... " >&6; }
+{ echo "$as_me:$LINENO: checking for SNDFILE" >&5
+echo $ECHO_N "checking for SNDFILE... $ECHO_C" >&6; }
 
 if test -n "$SNDFILE_CFLAGS"; then
     pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5170,11 +6463,11 @@ if test -n "$SNDFILE_LIBS"; then
     pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5200,16 +6493,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SNDFILE_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 sndfile_available_system="no"
 elif test $pkg_failed = untried; then
 	sndfile_available_system="no"
 else
 	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
 	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	sndfile_available_system="yes"
 fi
 
@@ -5217,33 +6510,35 @@ fi
       LIBSNDFILE_SYSTEM_AVAILABLE="yes"
       LIBSNDFILE_SYSTEM_LIBS=$SNDFILE_LIBS
       LIBSNDFILE_SYSTEM_CXXFLAGS=$SNDFILE_CFLAGS
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsndfile libraries are available as system libraries" >&5
-$as_echo "$as_me: Libsndfile libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsndfile libraries are available as system libraries" >&5
+echo "$as_me: Libsndfile libraries are available as system libraries" >&6;}
    else
       LIBSNDFILE_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsndfile libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Libsndfile libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsndfile libraries are NOT available as system libraries" >&5
+echo "$as_me: Libsndfile libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   libsndfile_found="yes"
 else
   libsndfile_found="no"
@@ -5255,15 +6550,15 @@ fi
       LIBSNDFILE_LOCAL_LIBS="libsndfile.a"
       LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src'
       LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-$as_echo "$as_me: libsndfile libraries are available in this source tree" >&6;}
+      { echo "$as_me:$LINENO: libsndfile libraries are available in this source tree" >&5
+echo "$as_me: libsndfile libraries are available in this source tree" >&6;}
 
 
             LIBSNDFILE_LOCAL_CONFIGURE_ARGS="--disable-sqlite --disable-external-libs --disable-alsa"
    else
       LIBSNDFILE_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are NOT available in this source tree" >&5
-$as_echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
+      { echo "$as_me:$LINENO: libsndfile libraries are NOT available in this source tree" >&5
+echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
    fi
 
 
@@ -5271,7 +6566,7 @@ $as_echo "$as_me: libsndfile libraries are NOT available in this source tree" >&
 
 
 # Check whether --with-expat was given.
-if test "${with_expat+set}" = set; then :
+if test "${with_expat+set}" = set; then
   withval=$with_expat; LIBEXPAT_ARGUMENT=$withval
 else
   LIBEXPAT_ARGUMENT="unspecified"
@@ -5279,14 +6574,18 @@ fi
 
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+   { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5304,18 +6603,39 @@ return XML_ParserCreate ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_expat_XML_ParserCreate=yes
 else
-  ac_cv_lib_expat_XML_ParserCreate=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_expat_XML_ParserCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
   libexpat_found="yes"
 else
   libexpat_found="no"
@@ -5324,8 +6644,132 @@ fi
 
    expat_h_found="no"
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-if test "x$ac_cv_header_expat_h" = x""yes; then :
+   if test "${ac_cv_header_expat_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_expat_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking expat.h usability" >&5
+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <expat.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking expat.h presence" >&5
+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <expat.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_expat_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_expat_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+
+fi
+if test $ac_cv_header_expat_h = yes; then
   expat_h_found="yes"
 else
   expat_h_found="no"
@@ -5337,33 +6781,35 @@ fi
       LIBEXPAT_SYSTEM_AVAILABLE="yes"
       LIBEXPAT_SYSTEM_LIBS="-lexpat"
       LIBEXPAT_SYSTEM_CPPSYMBOLS="USE_SYSTEM_EXPAT"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available as system libraries" >&5
-$as_echo "$as_me: Expat libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Expat libraries are available as system libraries" >&5
+echo "$as_me: Expat libraries are available as system libraries" >&6;}
    else
       LIBEXPAT_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Expat libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Expat libraries are NOT available as system libraries" >&5
+echo "$as_me: Expat libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/xmlparse/xmlparse.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/expat/xmlparse/xmlparse.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/expat/xmlparse/xmlparse.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   xmlparse_h_found="yes"
 else
   xmlparse_h_found="no"
@@ -5376,19 +6822,19 @@ fi
       LIBEXPAT_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/expat'
       LIBEXPAT_LOCAL_CPPSYMBOLS="USE_LOCAL_EXPAT"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-$as_echo "$as_me: Expat libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: Expat libraries are available in the local tree" >&5
+echo "$as_me: Expat libraries are available in the local tree" >&6;}
    else
       LIBEXPAT_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: Expat libraries are NOT available in the local tree" >&5
+echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
 
 # Check whether --with-libsamplerate was given.
-if test "${with_libsamplerate+set}" = set; then :
+if test "${with_libsamplerate+set}" = set; then
   withval=$with_libsamplerate; LIBSAMPLERATE_ARGUMENT=$withval
 else
   LIBSAMPLERATE_ARGUMENT="unspecified"
@@ -5397,25 +6843,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_LIBSAMPLERATE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBSAMPLERATE 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
-$as_echo_n "checking for SAMPLERATE... " >&6; }
+{ echo "$as_me:$LINENO: checking for SAMPLERATE" >&5
+echo $ECHO_N "checking for SAMPLERATE... $ECHO_C" >&6; }
 
 if test -n "$SAMPLERATE_CFLAGS"; then
     pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\"") >&5
   ($PKG_CONFIG --exists --print-errors "samplerate >= 0.1.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5427,11 +6875,11 @@ if test -n "$SAMPLERATE_LIBS"; then
     pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\"") >&5
   ($PKG_CONFIG --exists --print-errors "samplerate >= 0.1.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5457,16 +6905,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 samplerate_available_system="no"
 elif test $pkg_failed = untried; then
 	samplerate_available_system="no"
 else
 	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
 	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	samplerate_available_system="yes"
 fi
 
@@ -5475,33 +6923,35 @@ fi
       LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
       LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
       LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate libraries are available as system libraries" >&5
-$as_echo "$as_me: Libsamplerate libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsamplerate libraries are available as system libraries" >&5
+echo "$as_me: Libsamplerate libraries are available as system libraries" >&6;}
    else
       LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Libsamplerate libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsamplerate libraries are NOT available as system libraries" >&5
+echo "$as_me: Libsamplerate libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsamplerate/src/samplerate.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libsamplerate/src/samplerate.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libsamplerate/src/samplerate.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   samplerate_h_found="yes"
 else
   samplerate_h_found="no"
@@ -5517,19 +6967,19 @@ fi
       if test ! -f lib-src/libsamplerate/Makefile ; then
          LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate"
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsamplerate libraries are available in the local tree" >&5
-$as_echo "$as_me: libsamplerate libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libsamplerate libraries are available in the local tree" >&5
+echo "$as_me: libsamplerate libraries are available in the local tree" >&6;}
    else
       LIBSAMPLERATE_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsamplerate libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libsamplerate libraries are NOT available in the local tree" >&5
+echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
 
 # Check whether --with-libresample was given.
-if test "${with_libresample+set}" = set; then :
+if test "${with_libresample+set}" = set; then
   withval=$with_libresample; LIBRESAMPLE_ARGUMENT=$withval
 else
   LIBRESAMPLE_ARGUMENT="unspecified"
@@ -5538,7 +6988,9 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_LIBRESAMPLE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBRESAMPLE 1
+_ACEOF
 
    fi
 
@@ -5547,24 +6999,26 @@ $as_echo "#define USE_LIBRESAMPLE 1" >>confdefs.h
    LIBRESAMPLE_SYSTEM_AVAILABLE="no"
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libresample/include/libresample.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libresample/include/libresample.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libresample/include/libresample.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libresample/include/libresample.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libresample/include/libresample.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   resample_h_found="yes"
 else
   resample_h_found="no"
@@ -5580,25 +7034,27 @@ fi
       if test ! -f lib-src/libresample/Makefile ; then
          LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libresample libraries are available in the local tree" >&5
-$as_echo "$as_me: libresample libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libresample libraries are available in the local tree" >&5
+echo "$as_me: libresample libraries are available in the local tree" >&6;}
    else
       LIBRESAMPLE_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libresample libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libresample libraries are NOT available in the local tree" >&5
+echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
    if false ; then
 
-$as_echo "#define USE_LIBVORBIS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBVORBIS 1
+_ACEOF
 
    fi
 
 
 # Check whether --with-libvorbis was given.
-if test "${with_libvorbis+set}" = set; then :
+if test "${with_libvorbis+set}" = set; then
   withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
 else
   LIBVORBIS_ARGUMENT="unspecified"
@@ -5606,14 +7062,18 @@ fi
 
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
-$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
-if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+   { echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
+echo $ECHO_N "checking for vorbis_bitrate_addblock in -lvorbisfile... $ECHO_C" >&6; }
+if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvorbisfile -lvorbis -logg $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5631,26 +7091,171 @@ return vorbis_bitrate_addblock ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
 else
-  ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
-$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
-if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
+echo "${ECHO_T}$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
+if test $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock = yes; then
   lib_found="yes"
 else
   lib_found="no"
 fi
 
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then :
+   if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
+echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
+echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking vorbis/vorbisfile.h usability" >&5
+echo $ECHO_N "checking vorbis/vorbisfile.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <vorbis/vorbisfile.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking vorbis/vorbisfile.h presence" >&5
+echo $ECHO_N "checking vorbis/vorbisfile.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <vorbis/vorbisfile.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
+echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_vorbis_vorbisfile_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
+echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6; }
+
+fi
+if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
   header_found="yes"
 else
   header_found="no"
@@ -5662,57 +7267,61 @@ fi
       LIBVORBIS_SYSTEM_AVAILABLE="yes"
       LIBVORBIS_SYSTEM_LIBS="-lvorbisenc -lvorbisfile -lvorbis -logg"
       LIBVORBIS_SYSTEM_CPPSYMBOLS="USE_LIBVORBIS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are available as system libraries" >&5
-$as_echo "$as_me: Vorbis libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Vorbis libraries are available as system libraries" >&5
+echo "$as_me: Vorbis libraries are available as system libraries" >&6;}
    else
       LIBVORBIS_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Vorbis libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Vorbis libraries are NOT available as system libraries" >&5
+echo "$as_me: Vorbis libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   vorbisenc_h_available="yes"
 else
   vorbisenc_h_available="no"
 fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   ogg_h_available="yes"
 else
   ogg_h_available="no"
@@ -5730,24 +7339,26 @@ fi
       LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
 
       LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are available in this source tree" >&5
-$as_echo "$as_me: Vorbis libraries are available in this source tree" >&6;}
+      { echo "$as_me:$LINENO: Vorbis libraries are available in this source tree" >&5
+echo "$as_me: Vorbis libraries are available in this source tree" >&6;}
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are NOT available in this source tree" >&5
-$as_echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
+      { echo "$as_me:$LINENO: Vorbis libraries are NOT available in this source tree" >&5
+echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
    fi
 
 
 
    if false ; then
 
-$as_echo "#define USE_LIBMAD 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBMAD 1
+_ACEOF
 
    fi
 
 
 # Check whether --with-libmad was given.
-if test "${with_libmad+set}" = set; then :
+if test "${with_libmad+set}" = set; then
   withval=$with_libmad; LIBMAD_ARGUMENT=$withval
 else
   LIBMAD_ARGUMENT="unspecified"
@@ -5757,18 +7368,18 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMAD" >&5
-$as_echo_n "checking for LIBMAD... " >&6; }
+{ echo "$as_me:$LINENO: checking for LIBMAD" >&5
+echo $ECHO_N "checking for LIBMAD... $ECHO_C" >&6; }
 
 if test -n "$LIBMAD_CFLAGS"; then
     pkg_cv_LIBMAD_CFLAGS="$LIBMAD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\"") >&5
   ($PKG_CONFIG --exists --print-errors "mad >= 0.14.2b") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.14.2b" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5780,11 +7391,11 @@ if test -n "$LIBMAD_LIBS"; then
     pkg_cv_LIBMAD_LIBS="$LIBMAD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\"") >&5
   ($PKG_CONFIG --exists --print-errors "mad >= 0.14.2b") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.14.2b" 2>/dev/null`
 else
   pkg_failed=yes
@@ -5810,28 +7421,32 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBMAD_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 libmad_available_system="no"
 elif test $pkg_failed = untried; then
 	libmad_available_system="no"
 else
 	LIBMAD_CFLAGS=$pkg_cv_LIBMAD_CFLAGS
 	LIBMAD_LIBS=$pkg_cv_LIBMAD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	libmad_available_system="yes"
 fi
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad_decoder_init in -lmad" >&5
-$as_echo_n "checking for mad_decoder_init in -lmad... " >&6; }
-if test "${ac_cv_lib_mad_mad_decoder_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+   { echo "$as_me:$LINENO: checking for mad_decoder_init in -lmad" >&5
+echo $ECHO_N "checking for mad_decoder_init in -lmad... $ECHO_C" >&6; }
+if test "${ac_cv_lib_mad_mad_decoder_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmad  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5849,18 +7464,39 @@ return mad_decoder_init ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_mad_mad_decoder_init=yes
 else
-  ac_cv_lib_mad_mad_decoder_init=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_mad_mad_decoder_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mad_mad_decoder_init" >&5
-$as_echo "$ac_cv_lib_mad_mad_decoder_init" >&6; }
-if test "x$ac_cv_lib_mad_mad_decoder_init" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mad_mad_decoder_init" >&5
+echo "${ECHO_T}$ac_cv_lib_mad_mad_decoder_init" >&6; }
+if test $ac_cv_lib_mad_mad_decoder_init = yes; then
   libmad_found="yes"
 else
   libmad_found="no"
@@ -5868,8 +7504,8 @@ fi
 
 
    if test "x$libmad_available_system" = "xyes" && test "x$libmad_found" = "xno" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&5
-$as_echo "$as_me: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&2;}
+      { echo "$as_me:$LINENO: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&5
+echo "$as_me: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&2;}
    fi
 
    if test "x$libmad_available_system" = "xyes" ; then
@@ -5877,32 +7513,34 @@ $as_echo "$as_me: WARNING: system installation of libmad found, but it is too ol
       LIBMAD_SYSTEM_LIBS="$LIBMAD_LIBS"
 	  LIBMAD_SYSTEM_CXXFLAGS="$LIBMAD_CFLAGS"
       LIBMAD_SYSTEM_CPPSYMBOLS="USE_LIBMAD"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available as system libraries" >&5
-$as_echo "$as_me: libmad libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: libmad libraries are available as system libraries" >&5
+echo "$as_me: libmad libraries are available as system libraries" >&6;}
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: libmad libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: libmad libraries are NOT available as system libraries" >&5
+echo "$as_me: libmad libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libmad/frame.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libmad/frame.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   frame_h_found="yes"
 else
   frame_h_found="no"
@@ -5915,25 +7553,27 @@ fi
       LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad'
       LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD"
       LIBMAD_LOCAL_CONFIG_SUBDIRS="lib-src/libmad"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-$as_echo "$as_me: libmad libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libmad libraries are available in the local tree" >&5
+echo "$as_me: libmad libraries are available in the local tree" >&6;}
    else
       LIBMAD_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libmad libraries are NOT available in the local tree" >&5
+echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
    if false ; then
 
-$as_echo "#define USE_LIBFLAC 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBFLAC 1
+_ACEOF
 
    fi
 
 
 # Check whether --with-libflac was given.
-if test "${with_libflac+set}" = set; then :
+if test "${with_libflac+set}" = set; then
   withval=$with_libflac; LIBFLAC_ARGUMENT=$withval
 else
   LIBFLAC_ARGUMENT="unspecified"
@@ -5941,14 +7581,18 @@ fi
 
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC__stream_decoder_new in -lFLAC" >&5
-$as_echo_n "checking for FLAC__stream_decoder_new in -lFLAC... " >&6; }
-if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+   { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lFLAC -lFLAC++ -lFLAC $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5966,26 +7610,171 @@ return FLAC__stream_decoder_new ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
 else
-  ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
-$as_echo "$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
-if test "x$ac_cv_lib_FLAC_FLAC__stream_decoder_new" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
   lib_found="yes"
 else
   lib_found="no"
 fi
 
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "FLAC/format.h" "ac_cv_header_FLAC_format_h" "$ac_includes_default"
-if test "x$ac_cv_header_FLAC_format_h" = x""yes; then :
+   if test "${ac_cv_header_FLAC_format_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
+echo $ECHO_N "checking for FLAC/format.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_FLAC_format_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
+echo "${ECHO_T}$ac_cv_header_FLAC_format_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking FLAC/format.h usability" >&5
+echo $ECHO_N "checking FLAC/format.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <FLAC/format.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking FLAC/format.h presence" >&5
+echo $ECHO_N "checking FLAC/format.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <FLAC/format.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: FLAC/format.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: FLAC/format.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: FLAC/format.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: FLAC/format.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: FLAC/format.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: FLAC/format.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: FLAC/format.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: FLAC/format.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
+echo $ECHO_N "checking for FLAC/format.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_FLAC_format_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_FLAC_format_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
+echo "${ECHO_T}$ac_cv_header_FLAC_format_h" >&6; }
+
+fi
+if test $ac_cv_header_FLAC_format_h = yes; then
   header_found="yes"
 else
   header_found="no"
@@ -5999,57 +7788,61 @@ fi
       LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
       # this file shouldn't be built at if no libflac is available
       LIBFLAC_SYSTEM_OPTOBJS="ondemand/ODDecodeFlacTask.o"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: FLAC libraries are available as system libraries" >&5
-$as_echo "$as_me: FLAC libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: FLAC libraries are available as system libraries" >&5
+echo "$as_me: FLAC libraries are available as system libraries" >&6;}
    else
       LIBFLAC_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: FLAC/FLAC++ libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: FLAC/FLAC++ libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: FLAC/FLAC++ libraries are NOT available as system libraries" >&5
+echo "$as_me: FLAC/FLAC++ libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   flac_h_available="yes"
 else
   flac_h_available="no"
 fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   flacpp_h_available="yes"
 else
   flacpp_h_available="no"
@@ -6069,18 +7862,18 @@ fi
       LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o"
       LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: FLAC libraries are available in this source tree" >&5
-$as_echo "$as_me: FLAC libraries are available in this source tree" >&6;}
+      { echo "$as_me:$LINENO: FLAC libraries are available in this source tree" >&5
+echo "$as_me: FLAC libraries are available in this source tree" >&6;}
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: FLAC libraries are NOT available in this source tree" >&5
-$as_echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
+      { echo "$as_me:$LINENO: FLAC libraries are NOT available in this source tree" >&5
+echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
    fi
 
 
 
 
 # Check whether --with-libid3tag was given.
-if test "${with_libid3tag+set}" = set; then :
+if test "${with_libid3tag+set}" = set; then
   withval=$with_libid3tag; LIBID3TAG_ARGUMENT=$withval
 else
   LIBID3TAG_ARGUMENT="unspecified"
@@ -6089,19 +7882,25 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_LIBID3TAG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBID3TAG 1
+_ACEOF
 
    fi
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3_file_open in -lid3tag" >&5
-$as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
-if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+   { echo "$as_me:$LINENO: checking for id3_file_open in -lid3tag" >&5
+echo $ECHO_N "checking for id3_file_open in -lid3tag... $ECHO_C" >&6; }
+if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lid3tag -lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -6119,26 +7918,171 @@ return id3_file_open ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_id3tag_id3_file_open=yes
 else
-  ac_cv_lib_id3tag_id3_file_open=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_id3tag_id3_file_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3tag_id3_file_open" >&5
-$as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
-if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_id3tag_id3_file_open" >&5
+echo "${ECHO_T}$ac_cv_lib_id3tag_id3_file_open" >&6; }
+if test $ac_cv_lib_id3tag_id3_file_open = yes; then
   libid3tag_found="yes"
 else
   libid3tag_found="no"
 fi
 
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "id3tag.h" "ac_cv_header_id3tag_h" "$ac_includes_default"
-if test "x$ac_cv_header_id3tag_h" = x""yes; then :
+   if test "${ac_cv_header_id3tag_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for id3tag.h" >&5
+echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_id3tag_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
+echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking id3tag.h usability" >&5
+echo $ECHO_N "checking id3tag.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <id3tag.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking id3tag.h presence" >&5
+echo $ECHO_N "checking id3tag.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <id3tag.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: id3tag.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: id3tag.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: id3tag.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: id3tag.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: id3tag.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: id3tag.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: id3tag.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for id3tag.h" >&5
+echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_id3tag_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_id3tag_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
+echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6; }
+
+fi
+if test $ac_cv_header_id3tag_h = yes; then
   id3tag_h_found="yes"
 else
   id3tag_h_found="no"
@@ -6150,33 +8094,35 @@ fi
       LIBID3TAG_SYSTEM_AVAILABLE="yes"
       LIBID3TAG_SYSTEM_LIBS=-lid3tag
       LIBID3TAG_SYSTEM_CPPSYMBOLS="USE_LIBID3TAG"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libid3tag libraries are available as system libraries" >&5
-$as_echo "$as_me: Libid3tag libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libid3tag libraries are available as system libraries" >&5
+echo "$as_me: Libid3tag libraries are available as system libraries" >&6;}
    else
       LIBID3TAG_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libid3tag libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Libid3tag libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libid3tag libraries are NOT available as system libraries" >&5
+echo "$as_me: Libid3tag libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libid3tag/frame.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   frame_h_found="yes"
 else
   frame_h_found="no"
@@ -6190,18 +8136,18 @@ fi
       LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag'
       LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG"
       LIBID3TAG_LOCAL_CONFIG_SUBDIRS="lib-src/libid3tag"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-$as_echo "$as_me: libid3tag libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libid3tag libraries are available in the local tree" >&5
+echo "$as_me: libid3tag libraries are available in the local tree" >&6;}
    else
       LIBID3TAG_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: libid3tag libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libid3tag libraries are NOT available in the local tree" >&5
+echo "$as_me: libid3tag libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
 # Check whether --with-sbsms was given.
-if test "${with_sbsms+set}" = set; then :
+if test "${with_sbsms+set}" = set; then
   withval=$with_sbsms; LIBSBSMS_ARGUMENT=$withval
 else
   LIBSBSMS_ARGUMENT="unspecified"
@@ -6210,25 +8156,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_SBSMS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_SBSMS 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SBSMS" >&5
-$as_echo_n "checking for SBSMS... " >&6; }
+{ echo "$as_me:$LINENO: checking for SBSMS" >&5
+echo $ECHO_N "checking for SBSMS... $ECHO_C" >&6; }
 
 if test -n "$SBSMS_CFLAGS"; then
     pkg_cv_SBSMS_CFLAGS="$SBSMS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sbsms >= 1.6.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sbsms >= 1.6.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "sbsms >= 1.6.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SBSMS_CFLAGS=`$PKG_CONFIG --cflags "sbsms >= 1.6.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6240,11 +8188,11 @@ if test -n "$SBSMS_LIBS"; then
     pkg_cv_SBSMS_LIBS="$SBSMS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sbsms >= 1.6.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sbsms >= 1.6.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "sbsms >= 1.6.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SBSMS_LIBS=`$PKG_CONFIG --libs "sbsms >= 1.6.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6270,16 +8218,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SBSMS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 sbsms_available_system="no"
 elif test $pkg_failed = untried; then
 	sbsms_available_system="no"
 else
 	SBSMS_CFLAGS=$pkg_cv_SBSMS_CFLAGS
 	SBSMS_LIBS=$pkg_cv_SBSMS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	sbsms_available_system="yes"
 fi
 
@@ -6289,33 +8237,35 @@ fi
       LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS
       LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS
       LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsbsms libraries are available as system libraries" >&5
-$as_echo "$as_me: Libsbsms libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsbsms libraries are available as system libraries" >&5
+echo "$as_me: Libsbsms libraries are available as system libraries" >&6;}
    else
       LIBSBSMS_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsbsms libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Libsbsms libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsbsms libraries are NOT available as system libraries" >&5
+echo "$as_me: Libsbsms libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   sbsms_h_found="yes"
 else
   sbsms_h_found="no"
@@ -6331,19 +8281,19 @@ fi
 	        LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
 	  	   LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsbsms libraries are available in the local tree" >&5
-$as_echo "$as_me: libsbsms libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libsbsms libraries are available in the local tree" >&5
+echo "$as_me: libsbsms libraries are available in the local tree" >&6;}
    else
       LIBSBSMS_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsbsms libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: libsbsms libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libsbsms libraries are NOT available in the local tree" >&5
+echo "$as_me: libsbsms libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
 
 # Check whether --with-soundtouch was given.
-if test "${with_soundtouch+set}" = set; then :
+if test "${with_soundtouch+set}" = set; then
   withval=$with_soundtouch; LIBSOUNDTOUCH_ARGUMENT=$withval
 else
   LIBSOUNDTOUCH_ARGUMENT="unspecified"
@@ -6352,25 +8302,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_SOUNDTOUCH 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_SOUNDTOUCH 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDTOUCH" >&5
-$as_echo_n "checking for SOUNDTOUCH... " >&6; }
+{ echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
+echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6; }
 
 if test -n "$SOUNDTOUCH_CFLAGS"; then
     pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6382,11 +8334,11 @@ if test -n "$SOUNDTOUCH_LIBS"; then
     pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.4 >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch-1.4 >= 1.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.4 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6412,33 +8364,33 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDTOUCH_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 soundtouch_available_system="no"
 elif test $pkg_failed = untried; then
 	soundtouch_available_system="no"
 else
 	SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
 	SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	soundtouch_available_system="yes"
 fi
       if test "x$soundtouch_available_system" = "xno" ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDTOUCH" >&5
-$as_echo_n "checking for SOUNDTOUCH... " >&6; }
+{ echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
+echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6; }
 
 if test -n "$SOUNDTOUCH_CFLAGS"; then
     pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6450,11 +8402,11 @@ if test -n "$SOUNDTOUCH_LIBS"; then
     pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6480,34 +8432,34 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDTOUCH_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 soundtouch_available_system="no"
 elif test $pkg_failed = untried; then
 	soundtouch_available_system="no"
 else
 	SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
 	SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	soundtouch_available_system="yes"
 fi
    fi
    if test "x$soundtouch_available_system" = "xno" ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDTOUCH" >&5
-$as_echo_n "checking for SOUNDTOUCH... " >&6; }
+{ echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
+echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6; }
 
 if test -n "$SOUNDTOUCH_CFLAGS"; then
     pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6519,11 +8471,11 @@ if test -n "$SOUNDTOUCH_LIBS"; then
     pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6549,16 +8501,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDTOUCH_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 soundtouch_available_system="no"
 elif test $pkg_failed = untried; then
 	soundtouch_available_system="no"
 else
 	SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
 	SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	soundtouch_available_system="yes"
 fi
    fi
@@ -6568,33 +8520,35 @@ fi
       LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
       LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
       LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsoundtouch libraries are available as system libraries" >&5
-$as_echo "$as_me: Libsoundtouch libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsoundtouch libraries are available as system libraries" >&5
+echo "$as_me: Libsoundtouch libraries are available as system libraries" >&6;}
    else
       LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libsoundtouch libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Libsoundtouch libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Libsoundtouch libraries are NOT available as system libraries" >&5
+echo "$as_me: Libsoundtouch libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   soundtouch_h_found="yes"
 else
   soundtouch_h_found="no"
@@ -6607,18 +8561,18 @@ fi
       LIBSOUNDTOUCH_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include'
       LIBSOUNDTOUCH_LOCAL_CPPSYMBOLS="USE_SOUNDTOUCH"
       LIBSOUNDTOUCH_LOCAL_CONFIG_SUBDIRS="lib-src/soundtouch"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-$as_echo "$as_me: libsoundtouch libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libsoundtouch libraries are available in the local tree" >&5
+echo "$as_me: libsoundtouch libraries are available in the local tree" >&6;}
    else
       LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: libsoundtouch libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libsoundtouch libraries are NOT available in the local tree" >&5
+echo "$as_me: libsoundtouch libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
    # Check whether --enable-nyquist was given.
-if test "${enable_nyquist+set}" = set; then :
+if test "${enable_nyquist+set}" = set; then
   enableval=$enable_nyquist; LIBNYQUIST_ARGUMENT=$enableval
 else
   LIBNYQUIST_ARGUMENT="unspecified"
@@ -6627,31 +8581,35 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_NYQUIST 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_NYQUIST 1
+_ACEOF
 
    fi
 
          LIBNYQUIST_SYSTEM_AVAILABLE="no"
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libnyquist/nyx.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   nyx_h_found="yes"
 else
   nyx_h_found="no"
@@ -6668,18 +8626,18 @@ fi
 
       LIBNYQUIST_LOCAL_CONFIG_SUBDIRS="lib-src/libnyquist"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-$as_echo "$as_me: nyquist libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: nyquist libraries are available in the local tree" >&5
+echo "$as_me: nyquist libraries are available in the local tree" >&6;}
    else
       LIBNYQUIST_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: nyquist libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: nyquist libraries are NOT available in the local tree" >&5
+echo "$as_me: nyquist libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
 # Check whether --with-libvamp was given.
-if test "${with_libvamp+set}" = set; then :
+if test "${with_libvamp+set}" = set; then
   withval=$with_libvamp; LIBVAMP_ARGUMENT=$withval
 else
   LIBVAMP_ARGUMENT="unspecified"
@@ -6688,25 +8646,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_VAMP 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_VAMP 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VAMP" >&5
-$as_echo_n "checking for VAMP... " >&6; }
+{ echo "$as_me:$LINENO: checking for VAMP" >&5
+echo $ECHO_N "checking for VAMP... $ECHO_C" >&6; }
 
 if test -n "$VAMP_CFLAGS"; then
     pkg_cv_VAMP_CFLAGS="$VAMP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6718,11 +8678,11 @@ if test -n "$VAMP_LIBS"; then
     pkg_cv_VAMP_LIBS="$VAMP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6748,16 +8708,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$VAMP_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 vamp_available_system="no"
 elif test $pkg_failed = untried; then
 	vamp_available_system="no"
 else
 	VAMP_CFLAGS=$pkg_cv_VAMP_CFLAGS
 	VAMP_LIBS=$pkg_cv_VAMP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	vamp_available_system="yes"
 fi
 
@@ -6767,33 +8727,35 @@ fi
       LIBVAMP_SYSTEM_CXXFLAGS=$VAMP_CFLAGS
 	        LIBVAMP_SYSTEM_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
       LIBVAMP_SYSTEM_CPPSYMBOLS="USE_VAMP"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vamp libraries are available as system libraries" >&5
-$as_echo "$as_me: Vamp libraries are available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Vamp libraries are available as system libraries" >&5
+echo "$as_me: Vamp libraries are available as system libraries" >&6;}
    else
       LIBVAMP_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vamp libraries are NOT available as system libraries" >&5
-$as_echo "$as_me: Vamp libraries are NOT available as system libraries" >&6;}
+      { echo "$as_me:$LINENO: Vamp libraries are NOT available as system libraries" >&5
+echo "$as_me: Vamp libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   vamp_h_found="yes"
 else
   vamp_h_found="no"
@@ -6810,18 +8772,18 @@ fi
 	        LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
 	  	   LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vamp libraries are available in the local tree" >&5
-$as_echo "$as_me: Vamp libraries are available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: Vamp libraries are available in the local tree" >&5
+echo "$as_me: Vamp libraries are available in the local tree" >&6;}
    else
       LIBVAMP_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Vamp libraries are NOT available in the local tree" >&5
-$as_echo "$as_me: Vamp libraries are NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: Vamp libraries are NOT available in the local tree" >&5
+echo "$as_me: Vamp libraries are NOT available in the local tree" >&6;}
    fi
 
 
 
 # Check whether --with-libtwolame was given.
-if test "${with_libtwolame+set}" = set; then :
+if test "${with_libtwolame+set}" = set; then
   withval=$with_libtwolame; LIBTWOLAME_ARGUMENT=$withval
 else
   LIBTWOLAME_ARGUMENT="unspecified"
@@ -6830,25 +8792,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_LIBTWOLAME 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBTWOLAME 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTWOLAME" >&5
-$as_echo_n "checking for LIBTWOLAME... " >&6; }
+{ echo "$as_me:$LINENO: checking for LIBTWOLAME" >&5
+echo $ECHO_N "checking for LIBTWOLAME... $ECHO_C" >&6; }
 
 if test -n "$LIBTWOLAME_CFLAGS"; then
     pkg_cv_LIBTWOLAME_CFLAGS="$LIBTWOLAME_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\"") >&5
   ($PKG_CONFIG --exists --print-errors "twolame >= 0.3.9") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_LIBTWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame >= 0.3.9" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6860,11 +8824,11 @@ if test -n "$LIBTWOLAME_LIBS"; then
     pkg_cv_LIBTWOLAME_LIBS="$LIBTWOLAME_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\"") >&5
   ($PKG_CONFIG --exists --print-errors "twolame >= 0.3.9") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_LIBTWOLAME_LIBS=`$PKG_CONFIG --libs "twolame >= 0.3.9" 2>/dev/null`
 else
   pkg_failed=yes
@@ -6890,16 +8854,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBTWOLAME_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 twolame_available_system="no"
 elif test $pkg_failed = untried; then
 	twolame_available_system="no"
 else
 	LIBTWOLAME_CFLAGS=$pkg_cv_LIBTWOLAME_CFLAGS
 	LIBTWOLAME_LIBS=$pkg_cv_LIBTWOLAME_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	twolame_available_system="yes"
 fi
 
@@ -6908,33 +8872,35 @@ fi
       LIBTWOLAME_SYSTEM_LIBS=$LIBTWOLAME_LIBS
       LIBTWOLAME_SYSTEM_CXXFLAGS=$LIBTWOLAME_CFLAGS
       LIBTWOLAME_SYSTEM_CPPSYMBOLS="USE_LIBTWOLAME"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libtwolame library available as system library" >&5
-$as_echo "$as_me: Libtwolame library available as system library" >&6;}
+      { echo "$as_me:$LINENO: Libtwolame library available as system library" >&5
+echo "$as_me: Libtwolame library available as system library" >&6;}
    else
       LIBTWOLAME_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Libtwolame library NOT available as system library" >&5
-$as_echo "$as_me: Libtwolame library NOT available as system library" >&6;}
+      { echo "$as_me:$LINENO: Libtwolame library NOT available as system library" >&5
+echo "$as_me: Libtwolame library NOT available as system library" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   twolame_h_found="yes"
 else
   twolame_h_found="no"
@@ -6950,18 +8916,18 @@ fi
 	        LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
 	  	   LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libtwolame library is available in the local tree" >&5
-$as_echo "$as_me: libtwolame library is available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libtwolame library is available in the local tree" >&5
+echo "$as_me: libtwolame library is available in the local tree" >&6;}
    else
       LIBTWOLAME_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libtwolame library is NOT available in the local tree" >&5
-$as_echo "$as_me: libtwolame library is NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: libtwolame library is NOT available in the local tree" >&5
+echo "$as_me: libtwolame library is NOT available in the local tree" >&6;}
    fi
 
 
 
 # Check whether --with-ffmpeg was given.
-if test "${with_ffmpeg+set}" = set; then :
+if test "${with_ffmpeg+set}" = set; then
   withval=$with_ffmpeg; FFMPEG_ARGUMENT=$withval
 else
   FFMPEG_ARGUMENT="unspecified"
@@ -6970,25 +8936,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_FFMPEG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_FFMPEG 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVCODEC" >&5
-$as_echo_n "checking for AVCODEC... " >&6; }
+{ echo "$as_me:$LINENO: checking for AVCODEC" >&5
+echo $ECHO_N "checking for AVCODEC... $ECHO_C" >&6; }
 
 if test -n "$AVCODEC_CFLAGS"; then
     pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavcodec >= 51.53") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 51.53" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7000,11 +8968,11 @@ if test -n "$AVCODEC_LIBS"; then
     pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavcodec >= 51.53") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.53" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7030,32 +8998,32 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVCODEC_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 avcodec_available_system="no"
 elif test $pkg_failed = untried; then
 	avcodec_available_system="no"
 else
 	AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
 	AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	avcodec_available_system="yes"
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
-$as_echo_n "checking for AVFORMAT... " >&6; }
+{ echo "$as_me:$LINENO: checking for AVFORMAT" >&5
+echo $ECHO_N "checking for AVFORMAT... $ECHO_C" >&6; }
 
 if test -n "$AVFORMAT_CFLAGS"; then
     pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7067,11 +9035,11 @@ if test -n "$AVFORMAT_LIBS"; then
     pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7097,32 +9065,32 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVFORMAT_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 avformat_available_system="no"
 elif test $pkg_failed = untried; then
 	avformat_available_system="no"
 else
 	AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
 	AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	avformat_available_system="yes"
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVUTIL" >&5
-$as_echo_n "checking for AVUTIL... " >&6; }
+{ echo "$as_me:$LINENO: checking for AVUTIL" >&5
+echo $ECHO_N "checking for AVUTIL... $ECHO_C" >&6; }
 
 if test -n "$AVUTIL_CFLAGS"; then
     pkg_cv_AVUTIL_CFLAGS="$AVUTIL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavutil\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_AVUTIL_CFLAGS=`$PKG_CONFIG --cflags "libavutil" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7134,11 +9102,11 @@ if test -n "$AVUTIL_LIBS"; then
     pkg_cv_AVUTIL_LIBS="$AVUTIL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavutil\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_AVUTIL_LIBS=`$PKG_CONFIG --libs "libavutil" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7164,16 +9132,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVUTIL_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 libavutil_available_system="no"
 elif test $pkg_failed = untried; then
 	libavutil_available_system="no"
 else
 	AVUTIL_CFLAGS=$pkg_cv_AVUTIL_CFLAGS
 	AVUTIL_LIBS=$pkg_cv_AVUTIL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	libavutil_available_system="yes"
 fi
 
@@ -7184,57 +9152,61 @@ fi
       FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
                   FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
          export/ExportFFmpegDialogs.o"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: FFmpeg library available as system library" >&5
-$as_echo "$as_me: FFmpeg library available as system library" >&6;}
+      { echo "$as_me:$LINENO: FFmpeg library available as system library" >&5
+echo "$as_me: FFmpeg library available as system library" >&6;}
    fi
    if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: FFmpeg library NOT available as system library" >&5
-$as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
+      { echo "$as_me:$LINENO: FFmpeg library NOT available as system library" >&5
+echo "$as_me: FFmpeg library NOT available as system library" >&6;}
    fi
 
          FFMPEG_LOCAL_AVAILABLE="no"
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   avcodec_h_found="yes"
 else
   avcodec_h_found="no"
 fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   avformat_h_found="yes"
 else
   avformat_h_found="no"
@@ -7249,20 +9221,20 @@ fi
          FFMPEG_LOCAL_CPPSYMBOLS="USE_FFMPEG"
                            FFMPEG_LOCAL_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
             export/ExportFFmpegDialogs.o"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: FFmpeg headers are available in the local tree" >&5
-$as_echo "$as_me: FFmpeg headers are available in the local tree" >&6;}
+         { echo "$as_me:$LINENO: FFmpeg headers are available in the local tree" >&5
+echo "$as_me: FFmpeg headers are available in the local tree" >&6;}
       fi
    fi
    if test "x$FFMPEG_LOCAL_AVAILABLE" = "xno" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpeg library is NOT available in the local tree" >&5
-$as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: ffmpeg library is NOT available in the local tree" >&5
+echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
    fi
 
 
 
 
 # Check whether --with-midi was given.
-if test "${with_midi+set}" = set; then :
+if test "${with_midi+set}" = set; then
   withval=$with_midi; PORTSMF_ARGUMENT=$withval
 else
   PORTSMF_ARGUMENT="unspecified"
@@ -7271,25 +9243,27 @@ fi
 
    if false ; then
 
-$as_echo "#define USE_MIDI 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_MIDI 1
+_ACEOF
 
    fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTSMF" >&5
-$as_echo_n "checking for PORTSMF... " >&6; }
+{ echo "$as_me:$LINENO: checking for PORTSMF" >&5
+echo $ECHO_N "checking for PORTSMF... $ECHO_C" >&6; }
 
 if test -n "$PORTSMF_CFLAGS"; then
     pkg_cv_PORTSMF_CFLAGS="$PORTSMF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
   ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7301,11 +9275,11 @@ if test -n "$PORTSMF_LIBS"; then
     pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
   ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7331,16 +9305,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PORTSMF_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 portsmf_available_system="no"
 elif test $pkg_failed = untried; then
 	portsmf_available_system="no"
 else
 	PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
 	PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	portsmf_available_system="yes"
 fi
 
@@ -7350,32 +9324,34 @@ fi
       PORTSMF_SYSTEM_CXXFLAGS="$PORTSMF_CFLAGS"
       PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
             PORTSMF_SYSTEM_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available as system library" >&5
-$as_echo "$as_me: portSMF library is available as system library" >&6;}
+      { echo "$as_me:$LINENO: portSMF library is available as system library" >&5
+echo "$as_me: portSMF library is available as system library" >&6;}
    else
       PORTSMF_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is NOT available as system library" >&5
-$as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
+      { echo "$as_me:$LINENO: portSMF library is NOT available as system library" >&5
+echo "$as_me: portSMF library is NOT available as system library" >&6;}
    fi
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/portsmf/allegro.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   allegro_h_available="yes"
 else
   allegro_h_available="no"
@@ -7396,7 +9372,7 @@ fi
 
 
 # Check whether --with-portaudio was given.
-if test "${with_portaudio+set}" = set; then :
+if test "${with_portaudio+set}" = set; then
   withval=$with_portaudio; PORTAUDIO_ARGUMENT=$withval
 else
   PORTAUDIO_ARGUMENT="unspecified"
@@ -7406,18 +9382,18 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
-$as_echo_n "checking for PORTAUDIO... " >&6; }
+{ echo "$as_me:$LINENO: checking for PORTAUDIO" >&5
+echo $ECHO_N "checking for PORTAUDIO... $ECHO_C" >&6; }
 
 if test -n "$PORTAUDIO_CFLAGS"; then
     pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\"") >&5
   ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7429,11 +9405,11 @@ if test -n "$PORTAUDIO_LIBS"; then
     pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\"") >&5
   ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 19" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7459,70 +9435,76 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PORTAUDIO_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 portaudio_available_system="no"
 elif test $pkg_failed = untried; then
 	portaudio_available_system="no"
 else
 	PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
 	PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	portaudio_available_system="yes"
 fi
 
    if test "x$portaudio_available_system" = "xyes" ; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <portaudio.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Pa_GetStreamHostApiType" >/dev/null 2>&1; then :
+  $EGREP "Pa_GetStreamHostApiType" >/dev/null 2>&1; then
   have_portaudio_support=yes
 else
   have_portaudio_support=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 
       if test "x$have_portaudio_support" = "xyes" ; then
          PORTAUDIO_SYSTEM_AVAILABLE="yes"
          PORTAUDIO_SYSTEM_LIBS=$PORTAUDIO_LIBS
          PORTAUDIO_SYSTEM_CXXFLAGS=$PORTAUDIO_CFLAGS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available as system library" >&5
-$as_echo "$as_me: portaudio19 library is available as system library" >&6;}
+         { echo "$as_me:$LINENO: portaudio19 library is available as system library" >&5
+echo "$as_me: portaudio19 library is available as system library" >&6;}
       else
          PORTAUDIO_SYSTEM_AVAILABLE="no"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&5
-$as_echo "$as_me: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&6;}
+         { echo "$as_me:$LINENO: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&5
+echo "$as_me: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&6;}
       fi
    else
       PORTAUDIO_SYSTEM_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available as system library" >&5
-$as_echo "$as_me: portaudio19 library is NOT available as system library" >&6;}
+      { echo "$as_me:$LINENO: portaudio19 library is NOT available as system library" >&5
+echo "$as_me: portaudio19 library is NOT available as system library" >&6;}
    fi
 
 
-   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
-$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
+echo $ECHO_N "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   portaudio_h_found="yes"
 else
   portaudio_h_found="no"
@@ -7537,19 +9519,19 @@ fi
             PORTAUDIO_LOCAL_CONFIG_SUBDIRS="lib-src/portaudio-v19"
       PORTAUDIO_LOCAL_CONFIGURE_ARGS="--with-pa-include=../portaudio-v19/include"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available in the local tree" >&5
-$as_echo "$as_me: portaudio19 library is available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: portaudio19 library is available in the local tree" >&5
+echo "$as_me: portaudio19 library is available in the local tree" >&6;}
    else
       PORTAUDIO_LOCAL_AVAILABLE="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available in the local tree" >&5
-$as_echo "$as_me: portaudio19 library is NOT available in the local tree" >&6;}
+      { echo "$as_me:$LINENO: portaudio19 library is NOT available in the local tree" >&5
+echo "$as_me: portaudio19 library is NOT available in the local tree" >&6;}
    fi
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Figuring out what libraries to enable" >&5
-$as_echo "$as_me: Figuring out what libraries to enable" >&6;}
+{ echo "$as_me:$LINENO: Figuring out what libraries to enable" >&5
+echo "$as_me: Figuring out what libraries to enable" >&6;}
 
 lib_preference=`echo $lib_preference | tr [:lower:], "[:upper:] "`
 
@@ -7565,37 +9547,43 @@ for lib in $LIBRARIES ; do
          if test "$AVAILABLE" = "yes" ; then
             eval ${lib}_USE_${sys_or_local}="yes"
             lib_activated="yes"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Using $sys_or_local libraries for $lib" >&5
-$as_echo "$as_me: Using $sys_or_local libraries for $lib" >&6;}
+            { echo "$as_me:$LINENO: Using $sys_or_local libraries for $lib" >&5
+echo "$as_me: Using $sys_or_local libraries for $lib" >&6;}
             break
          fi
       done
       if test "$lib_activated" = no ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: disabling $lib" >&5
-$as_echo "$as_me: disabling $lib" >&6;}
+         { echo "$as_me:$LINENO: disabling $lib" >&5
+echo "$as_me: disabling $lib" >&6;}
       fi
    else
             if test "$LIB_ARGUMENT" = local ; then
          if test "$LIB_LOCAL_AVAILABLE" = yes ; then
             eval ${lib}_USE_LOCAL="yes"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Using the LOCAL libraries for $lib because you specifically requested this" >&5
-$as_echo "$as_me: Using the LOCAL libraries for $lib because you specifically requested this" >&6;}
+            { echo "$as_me:$LINENO: Using the LOCAL libraries for $lib because you specifically requested this" >&5
+echo "$as_me: Using the LOCAL libraries for $lib because you specifically requested this" >&6;}
          else
-            as_fn_error $? "You requested using the local libraries for $lib but they are not available" "$LINENO" 5
+            { { echo "$as_me:$LINENO: error: You requested using the local libraries for $lib but they are not available" >&5
+echo "$as_me: error: You requested using the local libraries for $lib but they are not available" >&2;}
+   { (exit 1); exit 1; }; }
          fi
       elif test "$LIB_ARGUMENT" = system ; then
          if test "$LIB_SYSTEM_AVAILABLE" = yes ; then
             eval ${lib}_USE_SYSTEM="yes"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Using the SYSTEM libraries for $lib because you specifically requested this" >&5
-$as_echo "$as_me: Using the SYSTEM libraries for $lib because you specifically requested this" >&6;}
+            { echo "$as_me:$LINENO: Using the SYSTEM libraries for $lib because you specifically requested this" >&5
+echo "$as_me: Using the SYSTEM libraries for $lib because you specifically requested this" >&6;}
          else
-            as_fn_error $? "You requested using the system libraries for $lib but they are not available" "$LINENO" 5
+            { { echo "$as_me:$LINENO: error: You requested using the system libraries for $lib but they are not available" >&5
+echo "$as_me: error: You requested using the system libraries for $lib but they are not available" >&2;}
+   { (exit 1); exit 1; }; }
          fi
       elif test "$LIB_ARGUMENT" = no ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: disabling $lib at your request" >&5
-$as_echo "$as_me: disabling $lib at your request" >&6;}
+         { echo "$as_me:$LINENO: disabling $lib at your request" >&5
+echo "$as_me: disabling $lib at your request" >&6;}
       else
-         as_fn_error $? "I didn't understand the argument $LIB_ARGUMENT for $lib" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: I didn't understand the argument $LIB_ARGUMENT for $lib" >&5
+echo "$as_me: error: I didn't understand the argument $LIB_ARGUMENT for $lib" >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
 done
@@ -7607,38 +9595,46 @@ done
 #     liblrdf
 
 if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
-   as_fn_error $? "Audacity requires libsndfile to be enabled" "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: Audacity requires libsndfile to be enabled" >&5
+echo "$as_me: error: Audacity requires libsndfile to be enabled" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "$LIBEXPAT_USE_LOCAL" != "yes" && test "$LIBEXPAT_USE_SYSTEM" != "yes" ; then
-   as_fn_error $? "Audacity requires expat to be enabled" "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: Audacity requires expat to be enabled" >&5
+echo "$as_me: error: Audacity requires expat to be enabled" >&2;}
+   { (exit 1); exit 1; }; }
 else
    if test "$LIBEXPAT_USE_SYSTEM" = "yes" ; then
 
-$as_echo "#define USE_SYSTEM_EXPAT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_EXPAT 1
+_ACEOF
 
    fi
 fi
 
 if test "$PORTAUDIO_USE_LOCAL" != "yes" && test "$PORTAUDIO_USE_SYSTEM" != "yes" ; then
-   as_fn_error $? "Audacity requires portaudio to be enabled" "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: Audacity requires portaudio to be enabled" >&5
+echo "$as_me: error: Audacity requires portaudio to be enabled" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsamplerate are available" >&5
-$as_echo "$as_me: Both libresample and libsamplerate are available" >&6;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: deciding which to use based on arguments ..." >&5
-$as_echo "$as_me: deciding which to use based on arguments ..." >&6;}
+      { echo "$as_me:$LINENO: Both libresample and libsamplerate are available" >&5
+echo "$as_me: Both libresample and libsamplerate are available" >&6;}
+   { echo "$as_me:$LINENO: deciding which to use based on arguments ..." >&5
+echo "$as_me: deciding which to use based on arguments ..." >&6;}
    if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
             LIBSAMPLERATE_USE_LOCAL="no"
       LIBSAMPLERATE_USE_SYSTEM="no"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate not explicity requested, using libresample" >&5
-$as_echo "$as_me: Libsamplerate not explicity requested, using libresample" >&6;}
+            { echo "$as_me:$LINENO: Libsamplerate not explicity requested, using libresample" >&5
+echo "$as_me: Libsamplerate not explicity requested, using libresample" >&6;}
    else
                         LIBRESAMPLE_USE_LOCAL="no"
       LIBRESAMPLE_USE_SYSTEM="no"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Using libsamplerate as requested" >&5
-$as_echo "$as_me: Using libsamplerate as requested" >&6;}
+            { echo "$as_me:$LINENO: Using libsamplerate as requested" >&5
+echo "$as_me: Using libsamplerate as requested" >&6;}
    fi
 fi
 
@@ -7689,7 +9685,7 @@ done
 
 
 # Check whether --enable-audiounits was given.
-if test "${enable_audiounits+set}" = set; then :
+if test "${enable_audiounits+set}" = set; then
   enableval=$enable_audiounits; use_audiounits=$enableval
 else
   use_audiounits="auto"
@@ -7697,7 +9693,7 @@ fi
 
 
 # Check whether --enable-ladspa was given.
-if test "${enable_ladspa+set}" = set; then :
+if test "${enable_ladspa+set}" = set; then
   enableval=$enable_ladspa; use_ladspa=$enableval
 else
   use_ladspa="yes"
@@ -7705,7 +9701,7 @@ fi
 
 
 # Check whether --enable-quicktime was given.
-if test "${enable_quicktime+set}" = set; then :
+if test "${enable_quicktime+set}" = set; then
   enableval=$enable_quicktime; use_quicktime=$enableval
 else
   use_quicktime="auto"
@@ -7715,7 +9711,7 @@ fi
 
 
 # Check whether --with-portmixer was given.
-if test "${with_portmixer+set}" = set; then :
+if test "${with_portmixer+set}" = set; then
   withval=$with_portmixer; use_portmixer=$withval
 else
   use_portmixer="yes"
@@ -7724,27 +9720,35 @@ fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -7760,24 +9764,28 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -7816,10 +9824,14 @@ case "${host_os}" in
       CONFIGHEADER="configwin.h"
 
 
-$as_echo "#define __CYGWIN__ 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define __CYGWIN__ 1
+_ACEOF
 
 
-$as_echo "#define _FILE_OFFSET_BITS 32" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _FILE_OFFSET_BITS 32
+_ACEOF
 
 
       AFTERBUILD=""
@@ -7831,13 +9843,17 @@ $as_echo "#define _FILE_OFFSET_BITS 32" >>confdefs.h
       EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
       EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-$as_echo_n "checking for library containing dlopen... " >&6; }
-if test "${ac_cv_search_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+            { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+if test "${ac_cv_search_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7862,50 +9878,75 @@ for ac_lib in '' dl; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_cxx_try_link "$LINENO"; then :
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_dlopen=$ac_res
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_dlopen+set}" = set; then :
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_dlopen+set}" = set; then
   break
 fi
 done
-if test "${ac_cv_search_dlopen+set}" = set; then :
-
+if test "${ac_cv_search_dlopen+set}" = set; then
+  :
 else
   ac_cv_search_dlopen=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-$as_echo "$ac_cv_search_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
 ac_res=$ac_cv_search_dlopen
-if test "$ac_res" != no; then :
+if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
       if [ "$ac_cv_search_dlopen" = no ]; then
-         as_fn_error required by Audacity "dlopen not found" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: dlopen not found" >&5
+echo "$as_me: error: dlopen not found" >&2;}
+   { (exit required by Audacity); exit required by Audacity; }; }
       fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
+{ echo "$as_me:$LINENO: checking for GTK" >&5
+echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
 
 if test -n "$GTK_CFLAGS"; then
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7917,11 +9958,11 @@ if test -n "$GTK_LIBS"; then
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -7947,22 +9988,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 have_gtk=no
 elif test $pkg_failed = untried; then
 	have_gtk=no
 else
 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
 	GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	have_gtk=yes
 fi
       if [ "$have_gtk" = "yes" ]
       then
 
-$as_echo "#define HAVE_GTK 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GTK 1
+_ACEOF
 
          CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
          LIBS="$LIBS $GTK_LIBS"
@@ -7979,14 +10022,18 @@ case "${host_os}" in
    cygwin*)
       ;;
    *)
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
-$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+            { echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8004,18 +10051,39 @@ return snd_pcm_open ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  ac_cv_lib_asound_snd_pcm_open=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_asound_snd_pcm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test $ac_cv_lib_asound_snd_pcm_open = yes; then
   have_alsa=yes
 else
   have_alsa=no
@@ -8026,18 +10094,18 @@ fi
       fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
+{ echo "$as_me:$LINENO: checking for JACK" >&5
+echo $ECHO_N "checking for JACK... $ECHO_C" >&6; }
 
 if test -n "$JACK_CFLAGS"; then
     pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
   ($PKG_CONFIG --exists --print-errors "jack") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
 else
   pkg_failed=yes
@@ -8049,11 +10117,11 @@ if test -n "$JACK_LIBS"; then
     pkg_cv_JACK_LIBS="$JACK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack\""; } >&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
   ($PKG_CONFIG --exists --print-errors "jack") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
 else
   pkg_failed=yes
@@ -8079,29 +10147,33 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JACK_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 have_jack=no
 elif test $pkg_failed = untried; then
 	have_jack=no
 else
 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
 	JACK_LIBS=$pkg_cv_JACK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	have_jack=yes
 fi
       if [ $have_jack = "yes" ] ; then
          LIBS="$LIBS $JACK_LIBS"
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HPI_SubSysCreate in -lhpi" >&5
-$as_echo_n "checking for HPI_SubSysCreate in -lhpi... " >&6; }
-if test "${ac_cv_lib_hpi_HPI_SubSysCreate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+      { echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" >&5
+echo $ECHO_N "checking for HPI_SubSysCreate in -lhpi... $ECHO_C" >&6; }
+if test "${ac_cv_lib_hpi_HPI_SubSysCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhpi -lm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8119,18 +10191,39 @@ return HPI_SubSysCreate ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_hpi_HPI_SubSysCreate=yes
 else
-  ac_cv_lib_hpi_HPI_SubSysCreate=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_hpi_HPI_SubSysCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpi_HPI_SubSysCreate" >&5
-$as_echo "$ac_cv_lib_hpi_HPI_SubSysCreate" >&6; }
-if test "x$ac_cv_lib_hpi_HPI_SubSysCreate" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_hpi_HPI_SubSysCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_hpi_HPI_SubSysCreate" >&6; }
+if test $ac_cv_lib_hpi_HPI_SubSysCreate = yes; then
   have_asihpi=yes
 else
   have_asihpi=no
@@ -8139,14 +10232,18 @@ fi
       if [ $have_asihpi = "yes" ] ; then
          LIBS="$LIBS -lhpi"
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+      { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
+echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8164,29 +10261,133 @@ return clock_gettime ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_rt_clock_gettime=yes
 else
-  ac_cv_lib_rt_clock_gettime=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_rt_clock_gettime=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6; }
+if test $ac_cv_lib_rt_clock_gettime = yes; then
   rt_libs=" -lrt"
 fi
 
       LIBS="${LIBS}${rt_libs}"
-      for ac_func in clock_gettime nanosleep
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+
+for ac_func in clock_gettime nanosleep
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8198,7 +10399,9 @@ esac
 
 if [ "$use_portmixer" = "yes" ] ; then
 
-$as_echo "#define USE_PORTMIXER 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_PORTMIXER 1
+_ACEOF
 
 
    CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
@@ -8208,12 +10411,16 @@ $as_echo "#define USE_PORTMIXER 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrint" >&5
-$as_echo_n "checking for lrint... " >&6; }
-if test "${ac_cv_c99_lrint+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for lrint" >&5
+echo $ECHO_N "checking for lrint... $ECHO_C" >&6; }
+if test "${ac_cv_c99_lrint+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #define		_ISOC9X_SOURCE	1
@@ -8229,27 +10436,53 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c99_lrint=yes
 else
-  ac_cv_c99_lrint=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c99_lrint=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_lrint" >&5
-$as_echo "$ac_cv_c99_lrint" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_c99_lrint" >&5
+echo "${ECHO_T}$ac_cv_c99_lrint" >&6; }
 if test "x$ac_cv_c99_lrint" = "xyes"; then
 
-$as_echo "#define HAVE_LRINT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LRINT 1
+_ACEOF
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrintf" >&5
-$as_echo_n "checking for lrintf... " >&6; }
-if test "${ac_cv_c99_lrintf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for lrintf" >&5
+echo $ECHO_N "checking for lrintf... $ECHO_C" >&6; }
+if test "${ac_cv_c99_lrintf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #define		_ISOC9X_SOURCE	1
@@ -8265,18 +10498,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c99_lrintf=yes
 else
-  ac_cv_c99_lrintf=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c99_lrintf=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_lrintf" >&5
-$as_echo "$ac_cv_c99_lrintf" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_c99_lrintf" >&5
+echo "${ECHO_T}$ac_cv_c99_lrintf" >&6; }
 if test "x$ac_cv_c99_lrintf" = "xyes"; then
 
-$as_echo "#define HAVE_LRINTF 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LRINTF 1
+_ACEOF
 
 fi
 
@@ -8287,7 +10542,9 @@ if [ "$use_ladspa" = "yes" ] ; then
    OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
 
 
-$as_echo "#define USE_LADSPA 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_LADSPA 1
+_ACEOF
 
 
       case "$host_os" in
@@ -8304,7 +10561,9 @@ if [ "$use_audiounits" = "yes" ] ; then
    OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
 
 
-$as_echo "#define USE_AUDIO_UNITS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_AUDIO_UNITS 1
+_ACEOF
 
 fi
 
@@ -8313,7 +10572,9 @@ if [ "$use_quicktime" = "yes" ] ; then
    OPTOBJS="$OPTOBJS import/ImportQTWrapper.o"
 
 
-$as_echo "#define USE_QUICKTIME 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_QUICKTIME 1
+_ACEOF
 
 fi
 
@@ -8374,13 +10635,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -8388,8 +10648,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -8412,12 +10672,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -8430,15 +10690,14 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -8447,13 +10706,11 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -8463,79 +10720,59 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-
 SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
 fi
 
 
@@ -8544,18 +10781,20 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -8566,111 +10805,32 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
+done
 
+# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -8684,17 +10844,13 @@ else
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
+# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -8709,103 +10865,104 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -8822,12 +10979,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
-	case $1 in #(
-	-*)set "./$1";;
+	case $1 in
+        -*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -8842,19 +10999,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8867,41 +11018,29 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+  --file=FILE[:TEMPLATE]
+		   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+		   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -8909,42 +11048,36 @@ $config_files
 Configuration headers:
 $config_headers
 
-Report bugs to the package provider."
+Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.67,
-  with options \\"\$ac_cs_config\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
-test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -8957,41 +11090,34 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
 
-  *) as_fn_append ac_config_targets " $1"
+  *) ac_config_targets="$ac_config_targets $1"
      ac_need_defaults=false ;;
 
   esac
@@ -9006,32 +11132,30 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
   export CONFIG_SHELL
-  exec "\$@"
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -9047,7 +11171,9 @@ do
     "lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
   esac
 done
 
@@ -9073,7 +11199,7 @@ $debug ||
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap 'as_fn_exit 1' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -9084,285 +11210,252 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
 if test -n "$CONFIG_FILES"; then
 
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+HAVE_PKG_CONFIG!$HAVE_PKG_CONFIG$ac_delim
+LOCAL_LIBS!$LOCAL_LIBS$ac_delim
+EXTRAOBJS!$EXTRAOBJS$ac_delim
+EXTRATARGETS!$EXTRATARGETS$ac_delim
+EXTRAINSTALLTARGETS!$EXTRAINSTALLTARGETS$ac_delim
+EXTRAUNINSTALLTARGETS!$EXTRAUNINSTALLTARGETS$ac_delim
+OPTOBJS!$OPTOBJS$ac_delim
+CDEPEND!$CDEPEND$ac_delim
+PRECOMP_CFLAGS!$PRECOMP_CFLAGS$ac_delim
+AFTERBUILD!$AFTERBUILD$ac_delim
+INSTALL_PREFIX!$INSTALL_PREFIX$ac_delim
+CONFIGHEADER!$CONFIGHEADER$ac_delim
+BUILD_LDFLAGS!$BUILD_LDFLAGS$ac_delim
+LIBSRC_BUILD!$LIBSRC_BUILD$ac_delim
+AUDACITY_NAME!$AUDACITY_NAME$ac_delim
+SED!$SED$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+CFLAG_VISIBILITY!$CFLAG_VISIBILITY$ac_delim
+HAVE_VISIBILITY!$HAVE_VISIBILITY$ac_delim
+WX_CONFIG!$WX_CONFIG$ac_delim
+subdirs!$subdirs$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+WIDGETEXTRA_CFLAGS!$WIDGETEXTRA_CFLAGS$ac_delim
+WIDGETEXTRA_LIBS!$WIDGETEXTRA_LIBS$ac_delim
+SNDFILE_CFLAGS!$SNDFILE_CFLAGS$ac_delim
+SNDFILE_LIBS!$SNDFILE_LIBS$ac_delim
+SAMPLERATE_CFLAGS!$SAMPLERATE_CFLAGS$ac_delim
+SAMPLERATE_LIBS!$SAMPLERATE_LIBS$ac_delim
+LIBMAD_CFLAGS!$LIBMAD_CFLAGS$ac_delim
+LIBMAD_LIBS!$LIBMAD_LIBS$ac_delim
+SBSMS_CFLAGS!$SBSMS_CFLAGS$ac_delim
+SBSMS_LIBS!$SBSMS_LIBS$ac_delim
+SOUNDTOUCH_CFLAGS!$SOUNDTOUCH_CFLAGS$ac_delim
+SOUNDTOUCH_LIBS!$SOUNDTOUCH_LIBS$ac_delim
+VAMP_CFLAGS!$VAMP_CFLAGS$ac_delim
+VAMP_LIBS!$VAMP_LIBS$ac_delim
+LIBTWOLAME_CFLAGS!$LIBTWOLAME_CFLAGS$ac_delim
+LIBTWOLAME_LIBS!$LIBTWOLAME_LIBS$ac_delim
+AVCODEC_CFLAGS!$AVCODEC_CFLAGS$ac_delim
+AVCODEC_LIBS!$AVCODEC_LIBS$ac_delim
+AVFORMAT_CFLAGS!$AVFORMAT_CFLAGS$ac_delim
+AVFORMAT_LIBS!$AVFORMAT_LIBS$ac_delim
+AVUTIL_CFLAGS!$AVUTIL_CFLAGS$ac_delim
+AVUTIL_LIBS!$AVUTIL_LIBS$ac_delim
+PORTSMF_CFLAGS!$PORTSMF_CFLAGS$ac_delim
+_ACEOF
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
-rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 _ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+PORTSMF_LIBS!$PORTSMF_LIBS$ac_delim
+PORTAUDIO_CFLAGS!$PORTAUDIO_CFLAGS$ac_delim
+PORTAUDIO_LIBS!$PORTAUDIO_LIBS$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+HAVE_GTK!$HAVE_GTK$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+JACK_CFLAGS!$JACK_CFLAGS$ac_delim
+JACK_LIBS!$JACK_LIBS$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
-shift
-for ac_tag
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -9390,34 +11483,26 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
+      ac_file_inputs="$ac_file_inputs $ac_f"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
     fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$tmp/stdin";;
     esac
     ;;
   esac
@@ -9427,7 +11512,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -9445,15 +11530,55 @@ $as_echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -9493,12 +11618,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
+
+case `sed -n '/datarootdir/ {
   p
   q
 }
@@ -9506,37 +11631,36 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+/@mandir@/p
+' $ac_file_inputs` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
+    s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -9546,48 +11670,119 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
+  rm -f "$tmp/out12"
  ;;
 
 
@@ -9596,13 +11791,11 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
 done # for ac_tag
 
 
-as_fn_exit 0
+{ (exit 0); exit 0; }
 _ACEOF
+chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -9622,7 +11815,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || { (exit 1); exit 1; }
 fi
 
 #
@@ -9630,8 +11823,7 @@ fi
 #
 if test "$no_recursion" != yes; then
 
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
   ac_sub_configure_args=
   ac_prev=
   eval "set x $ac_configure_args"
@@ -9660,13 +11852,11 @@ if test "$no_recursion" != yes; then
       ac_prev=prefix ;;
     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
       ;;
-    --disable-option-checking)
-      ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
-      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
+      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
     esac
   done
 
@@ -9674,7 +11864,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -9683,10 +11873,6 @@ if test "$no_recursion" != yes; then
     ac_sub_configure_args="--silent $ac_sub_configure_args"
   fi
 
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
@@ -9695,17 +11881,57 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
-    as_dir="$ac_dir"; as_fn_mkdir_p
+    echo "$as_me:$LINENO: $ac_msg" >&5
+    echo "$ac_msg" >&6
+    { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -9744,8 +11970,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/configure
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -9758,21 +11984,19 @@ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+   { (exit 1); exit 1; }; }
     fi
 
     cd "$ac_popdir"
   done
 fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
 
 
 echo ""
diff --git a/configure.in b/configure.in
index 358853239..f1ea1bb59 100644
--- a/configure.in
+++ b/configure.in
@@ -48,6 +48,7 @@ dnl if $CFLAGS is blank and it finds GCC
 cflags_save="$CFLAGS"
 cppflags_save="$CPPFLAGS"
 cxxflags_save="$CXXFLAGS"
+AX_COMPILER_VENDOR
 AC_PROG_CC
 AC_LANG([C++])
 AC_PROG_CXX
@@ -173,6 +174,10 @@ AC_ARG_WITH(lib-preference,
             lib_preference=$withval,
             lib_preference="system local")
 
+AC_ARG_ENABLE(sse, [AC_HELP_STRING([--enable-sse],[enable SSE optimizations])], enable_sse=$enableval, enable_sse=yes)
+
+AC_ARG_ENABLE(universal_binary,[  --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
+
 dnl AC_ARG_WITH(wx-version,
 dnl            [AS_HELP_STRING([--with-wx-version],
 dnl                            [select wxWidgets version (if both installed) [2.8,]])],
@@ -185,6 +190,29 @@ dnl ----------------------------------------------------
 dnl If user asked for debug, put debug in compiler flags
 dnl ----------------------------------------------------
 
+if test x$enable_universal_binary = xyes; then
+   case "$target_os" in
+     darwin*)
+        CPPFLAGS="${CPPFLAGS} -mmacosx-version-min=10.4 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC"
+	;;
+     *)
+	;;
+   esac
+fi
+
+if test x$enable_sse = xyes; then
+
+   if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
+      AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+   fi
+
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+   if test x$sse_ok = xyes; then
+      AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+   fi
+fi
+
 if test x"$debug_preference" = "xyes" ; then
    dnl we want debuging on
    AC_MSG_NOTICE([Adding -g for debugging to CFLAGS and CXXFLAGS ...])
diff --git a/lib-src/sbsms/ChangeLog b/lib-src/sbsms/ChangeLog
index 08a627a85..e69de29bb 100644
--- a/lib-src/sbsms/ChangeLog
+++ b/lib-src/sbsms/ChangeLog
@@ -1,196 +0,0 @@
-Version 2.0.2 (15 Aug 2005)
-
-  * packaging changes:
-    - require automake (>= 1.5) for 'make -f Makefile.cvs'
-      (mandatory for 'dist-bzip2' automake option)
-
-  * src/gig.cpp, src/gig.h:
-    - support for gig v3 multi-file format (.gig, .gx01, .gx02, ...),
-      the extension files are read automatically when the samples are
-      loaded
-    - fixed the 24 bit decompression, the result should now be exact
-      instead of an approximation
-    - added VCFCutoffControllerInvert parameter and GetVelocityCutoff
-      function to DimensionRegion
-
-  * src/DLS.cpp, src/DLS.h:
-    - the upper bits of the pool table indices are read (used as
-      extension file numbers for gig v3)
-
-  * src/RIFF.cpp, src/RIFF.h:
-    - the file name is remembered in the RIFF::File object
-
-Version 2.0.1 (12 Jun 2005)
-
-  * packaging changes:
-    - include debian/ directory on 'make dist'
-    - create a bzip2 tarball on 'make dist'
-
-  * src/gigextract.cpp:
-    - show also version of libsndfile or build version of libaudiofile when
-      using the -v switch
-    - fixed mutual link dependency to libsndfile / libaudiofile
-
-  * src/gig.cpp, src/gig.h:
-    - added DimensionRegion::GetVelocityRelease function
-
-Version 2.0.0 (9 May 2005)
-
-  * packaging changes:
-    - fixed conditional linkage of either libsndfile or libaudiofile
-      (if none of the two exist, configure script will abort)
-    - man pages are now auto generated with the correct libgig version
-
-  * src/gig.cpp, src/gig.h:
-    - experimental support for Gigasampler v3 format;
-      64 bit file offsets are truncated to 32 bit, 24 bit samples are
-      truncated to 16 bit, up to 8 dimensions are read, additional
-      articulation informations are ignored at the moment
-      (patch by Andreas Persson)
-    - added some file format compatibility checks
-    - fixed vcf_type_lowpassturbo value (vcf_type_lowpassturbo was actually
-      never used, because the necessary check was made before
-      initialization)
-    - fixed crossfade points order (structure for big endian and little
-      endian systems was interchanged)
-    - fixed some memory leaks (patch by 'Gene', a.k.a Anders Alm)
-    - fixed crash which occured when patches did not have a sample assigned
-      to their region or dimension region (patch by Andreas Persson)
-    - support for compressed mono samples
-    - experimental support for compressed 24 bit samples
-    - fixed decompression on big-endian CPUs
-    - fixed decompression bug that truncated the last block of samples
-    - external decompression buffers can now be used for streaming samples
-      to avoid race conditions in case of multiple streaming threads
-    - added pre-calculated sample attenuation parameter
-    - added v3 "random" and "round robin" dimensions
-    - implemented progress indicator callback mechanism for loading
-      instruments and samples
-    - added functions libraryName() and libraryVersion()
-
-  * src/DLS.cpp, src/DLS.h:
-    - fixed File constructor which caused variable File::Instruments always
-      to be zero
-    - added functions libraryName() and libraryVersion()
-
-  * src/RIFF.cpp, src/RIFF.h:
-    - fixed method List::LoadSubChunks() which did not restore the original
-      position within the body of the given list chunk
-    - added functions libraryName() and libraryVersion()
-
-  * src/rifftree.cpp:
-    - added command line switch -v to show rifftree's revision and the used
-      libgig version
-
-  * src/dlsdump.cpp:
-    - added command line switch -v to show dlsdump's revision and the used
-      libgig version
-
-  * src/gigdump.cpp:
-    - added output of UnityNote, FineTune, Gain, SampleStartOffset an
-      LoopPlayCount
-    - added command line switch -v to show gigdump's revision and the used
-      libgig version
-
-  * src/gigextract.cpp:
-    - support for compressed mono samples and compressed 24 bit samples
-    - added command line switch -v to show gigextract's revision and the
-      used libgig version
-
-Version 1.0.0 (26 Nov 2004)
-
-  * packaging changes:
-    - renamed 'libgig.pc.in' -> 'gig.pc.in' and renamed pkg-config lib name
-      'libgig' -> 'gig' as it's common practice to omit the 'lib' prefix
-    - fixed man pages automake install rule (which didn't work on Mandrake,
-      SuSE and Fedora)
-    - fixed generation of Doxygen API documentation (now also included in
-      RPM and Debian packages)
-
-  * src/gig.cpp, src/gig.h:
-    - fixed / improved accuracy of all three velocity to volume
-      transformation functions a.k.a. 'nonlinear','linear','special'
-      (patch by Andreas Persson)
-    - denormals are filtered from the velocity to volume tables
-    - bugfix for dimension region switching (wrong handling of the release
-      trigger dimension, no bit range check for dimensions of split type
-      'split_type_bit')
-    - fixed panorama value in DimensionRegion (invalid conversion from
-      signed 7 bit to signed 8 bit)
-    - added class attribute 'Layers' to class 'gig::Region'
-    - symbol prototyping of gig::Region (fixes build failure with qsampler)
-
-  * src/gigextract.cpp:
-    - added support for libsndfile (if libaudiofile and libsndfile are
-      available then libsndfile is preferred)
-
-  * src/gigdump.cpp:
-    - added printout for dimension informations (amount, type, bits, zones)
-    - added printout for velocity response curve parameters
-    - added printout for crossfade definitions
-    - added printout for panorama value for each DimensionRegion
-    - replaced printout of DLS Region layer by printout of amount of
-      Gigasampler layers
-
-Version 0.7.1 (2 Jul 2004)
-
-  * packaging changes:
-    - added libgig.spec and libgig.pc package configurations for generating
-      Redhat packages
-    - header files included on installation.
-    - autotools-generated files removed from CVS repository.
-    - added support for generating Debian packages
-    - version of shared library can be set in configure.in
-
-Version 0.7.0 (3 May 2004)
-
-  * general changes:
-    - various big endian specific corrections
-      (successfully tested now on PPC)
-    - minor adjustments to avoid compile errors on some systems
-      (using now pow() instead of powl() and --pedantic g++ compiler switch)
-    - libtoolized the library
-    - added man pages for the command line tools
-      (gigextract, gigdump, dlsdump, rifftree)
-
-  * src/gig.cpp, src/gig.h:
-    - fixed bug in decompression algorithm which caused it not to detect
-      the end of a stream
-    - added method GetVelocityAttenuation() to class 'DimensionRegion' which
-      takes the MIDI key velocity value as an argument and returns the
-      appropriate volume factor (0.0 ... 1.0) for the sample to be played
-      back, the velocity curve transformation functions used for this are
-      only an approximation so far
-    - fixed class attributes 'Sample::LoopStart', 'Sample::LoopEnd' and
-      'Sample::LoopSize' which reflected wrong values
-    - class attributes 'Sample::LoopStart' and 'Sample::LoopEnd' are now
-      measured in sample points instead of byte offset
-    - renamed misleading attribute name 'Sample::MIDIPitchFraction' to
-      'Sample::FineTune'
-    - added class attribute 'Sample::LoopSize'
-    - added method GetInstrument(uint index) to class 'File'
-    - added ReadAndLoop() method to class 'Sample' which is an extension to
-      the normal Read() method to honor the sample's looping information
-      while streaming from disk
-    - changed interface for 'attenuation_ctrl_t', 'eg1_ctrl_t' and
-      'eg2_ctrl_t': replaced this huge enumeration by a structure which
-      reflects the MIDI controller number in case of an ordinary control
-      change controller (this saves a huge switch-case block in the
-      application of the library user)
-    - renamed following attributes in class 'DimensionRegion':
-      'AttenuationContol' -> 'AttenuationController',
-      'InvertAttenuationControl' -> 'InvertAttenuationController',
-      'AttenuationControlTreshold' -> 'AttenuationControllerThreshold'
-    - minor fix in API documentation for method GetVelocityAttenuation() in
-      class 'DimensionRegion'
-
-  * src/RIFF.cpp, src/RIFF.h:
-    - added additional API documentation
-    - minor fix in Chunk::Read() method (only a minor efficiency issue)
-
-  * src/gigdump.cpp:
-    - added printout of samples' looping informations
-
-Version 0.6.0 (3 Nov 2003)
-
-  * initial release
diff --git a/lib-src/sbsms/Makefile.in b/lib-src/sbsms/Makefile.in
index 99c70d835..f6f30691d 100644
--- a/lib-src/sbsms/Makefile.in
+++ b/lib-src/sbsms/Makefile.in
@@ -42,6 +42,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
 	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
+	$(top_srcdir)/m4/ax_check_compiler_flags.m4 \
+	$(top_srcdir)/m4/ax_compiler_vendor.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in
diff --git a/lib-src/sbsms/configure b/lib-src/sbsms/configure
index 438993b17..b6e86562b 100755
--- a/lib-src/sbsms/configure
+++ b/lib-src/sbsms/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sbsms 1.5.0.
+# Generated by GNU Autoconf 2.61 for sbsms 2.0.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -721,8 +721,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sbsms'
 PACKAGE_TARNAME='sbsms'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='sbsms 1.5.0'
+PACKAGE_VERSION='2.0.0'
+PACKAGE_STRING='sbsms 2.0.0'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/sbsms.cpp"
@@ -1400,7 +1400,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sbsms 1.5.0 to adapt to many kinds of systems.
+\`configure' configures sbsms 2.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1471,7 +1471,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sbsms 1.5.0:";;
+     short | recursive ) echo "Configuration of sbsms 2.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1483,9 +1483,11 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-universal_binary enable universal binary build: (default: disable)
   --enable-static enable static build: (default: disable)
   --enable-debug enable debug build: (default: disable)
+  --enable-multithreaded enable multithreaded build: (default: disable)
+  --enable-sse            enable SSE optimizations
+  --enable-universal_binary enable universal binary build: (default: disable)
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -1574,7 +1576,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sbsms configure 1.5.0
+sbsms configure 2.0.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1588,7 +1590,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sbsms $as_me 1.5.0, which was
+It was created by sbsms $as_me 2.0.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1947,8 +1949,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #------------------------------------------------------------------------------------
 # Library's "official" release version:
 
-LIBSBSMS_RELEASE_MAJOR=1
-LIBSBSMS_RELEASE_MINOR=7
+LIBSBSMS_RELEASE_MAJOR=2
+LIBSBSMS_RELEASE_MINOR=0
 LIBSBSMS_RELEASE_BUILD=0
 
 ac_aux_dir=
@@ -2159,7 +2161,7 @@ fi
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-SHARED_VERSION_INFO="8:0:7"
+SHARED_VERSION_INFO="10:0:0"
 
 case `pwd` in
   *\ * | *\	*)
@@ -3758,13 +3760,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3761: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3763: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3764: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3766: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3767: output\"" >&5)
+  (eval echo "\"\$as_me:3769: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -4986,7 +4988,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4989 "configure"' > conftest.$ac_ext
+  echo '#line 4991 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6102,7 +6104,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -6123,7 +6125,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -6807,11 +6809,11 @@ else
    -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:6810: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6812: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6814: \$? = $ac_status" >&5
+   echo "$as_me:6816: \$? = $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.
@@ -7146,11 +7148,11 @@ else
    -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:7149: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7151: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7153: \$? = $ac_status" >&5
+   echo "$as_me:7155: \$? = $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.
@@ -7251,11 +7253,11 @@ else
    -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:7254: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7256: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7258: \$? = $ac_status" >&5
+   echo "$as_me:7260: \$? = $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
@@ -7306,11 +7308,11 @@ else
    -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:7309: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7311: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7313: \$? = $ac_status" >&5
+   echo "$as_me:7315: \$? = $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
@@ -10075,7 +10077,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10078 "configure"
+#line 10080 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10171,7 +10173,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10174 "configure"
+#line 10176 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13176,11 +13178,11 @@ else
    -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:13179: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13181: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13183: \$? = $ac_status" >&5
+   echo "$as_me:13185: \$? = $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.
@@ -13275,11 +13277,11 @@ else
    -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:13278: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13280: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13282: \$? = $ac_status" >&5
+   echo "$as_me:13284: \$? = $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
@@ -13327,11 +13329,11 @@ else
    -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:13330: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13332: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13334: \$? = $ac_status" >&5
+   echo "$as_me:13336: \$? = $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
@@ -14527,281 +14529,72 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+
+{ echo "$as_me:$LINENO: checking for C++ compiler vendor" >&5
+echo $ECHO_N "checking for C++ compiler vendor... $ECHO_C" >&6; }
+if test "${ax_cv_cxx_compiler_vendor+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ax_cv_cxx_compiler_vendor=unknown
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#if !($vencpp)
+      thisisanerror;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_compiler_vendor=`echo $ventest | cut -d: -f1`; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+
+fi
+{ echo "$as_me:$LINENO: result: $ax_cv_cxx_compiler_vendor" >&5
+echo "${ECHO_T}$ax_cv_cxx_compiler_vendor" >&6; }
+
 # restore those variables back
 CFLAGS="$cflags_save"
 CPPFLAGS="$cppflags_save"
 CXXFLAGS="$cxxflags_save"
 
-
-
-
-
-
-for ac_func in malloc calloc free memcpy memmove
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-{ echo "$as_me:$LINENO: checking for floor in -lm" >&5
-echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_floor+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char floor ();
-int
-main ()
-{
-return floor ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_m_floor=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_m_floor=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
-echo "${ECHO_T}$ac_cv_lib_m_floor" >&6; }
-if test $ac_cv_lib_m_floor = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-
-
-
-
-
-
-for ac_func in floor sqrt log exp sin cos
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
 { echo "$as_me:$LINENO: checking for lrint" >&5
 echo $ECHO_N "checking for lrint... $ECHO_C" >&6; }
 if test "${ac_cv_c99_lrint+set}" = set; then
@@ -14930,14 +14723,6 @@ fi
 
 
 
-# Check whether --enable-universal_binary was given.
-if test "${enable_universal_binary+set}" = set; then
-  enableval=$enable_universal_binary; enable_universal_binary=$enableval
-else
-  enable_universal_binary=no
-fi
-
-
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then
   enableval=$enable_static; enable_static=$enableval
@@ -14954,7 +14739,31 @@ else
 fi
 
 
-SBSMS_CFLAGS="-ffast-math -fstrict-aliasing"
+# Check whether --enable-multithreaded was given.
+if test "${enable_multithreaded+set}" = set; then
+  enableval=$enable_multithreaded; enable_multithreaded=$enableval
+else
+  enable_multithreaded=no
+fi
+
+
+# Check whether --enable-sse was given.
+if test "${enable_sse+set}" = set; then
+  enableval=$enable_sse; enable_sse=$enableval
+else
+  enable_sse=yes
+fi
+
+
+# Check whether --enable-universal_binary was given.
+if test "${enable_universal_binary+set}" = set; then
+  enableval=$enable_universal_binary; enable_universal_binary=$enableval
+else
+  enable_universal_binary=no
+fi
+
+
+SBSMS_CFLAGS="-ffast-math -funroll-loops"
 
 if test x$enable_static = xno; then
   case "$target_os" in
@@ -14966,6 +14775,141 @@ if test x$enable_static = xno; then
    esac
 fi
 
+if test x$enable_debug = xyes; then
+   SBSMS_CFLAGS="$SBSMS_CFLAGS -g -O3"
+else
+   SBSMS_CFLAGS="$SBSMS_CFLAGS -O3 -fomit-frame-pointer"
+fi
+
+if test x$enable_multithreaded = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define MULTITHREADED 1
+_ACEOF
+
+fi
+
+echo "${ax_cv_cxx_compiler_vendor} XXX"
+
+if test x$enable_sse = xyes; then
+
+   if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
+       { echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse" >&5
+echo $ECHO_N "checking whether C++ compiler accepts -msse... $ECHO_C" >&6; }
+if test "${ax_cv_cxx_flags__msse+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+      ax_save_FLAGS=$CXXFLAGS
+      CXXFLAGS="-msse"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_flags__msse=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ax_cv_cxx_flags__msse=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CXXFLAGS=$ax_save_FLAGS
+fi
+
+eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse
+{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+	SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"
+else
+	{ { echo "$as_me:$LINENO: error: Need a version of gcc with -msse" >&5
+echo "$as_me: error: Need a version of gcc with -msse" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+   fi
+
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <xmmintrin.h>
+int
+main ()
+{
+__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  sse_ok=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	sse_ok=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+   if test x$sse_ok = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_SSE 1
+_ACEOF
+
+   fi
+fi
+
 if test x$enable_universal_binary = xyes; then
    case "$target_os" in
      darwin*)
@@ -14976,20 +14920,6 @@ if test x$enable_universal_binary = xyes; then
    esac
 fi
 
-case "$target_os" in
-     darwin*)
-	macosx="yes"
-	;;
-     *)
-	macosx="no"
-	;;
-esac
-
-if test x$enable_debug = xyes; then
-   SBSMS_CFLAGS="$SBSMS_CFLAGS -g"
-else
-   SBSMS_CFLAGS="$SBSMS_CFLAGS -O3"
-fi
 
 
 am__api_version='1.10'
@@ -15360,7 +15290,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sbsms'
- VERSION='1.5.0'
+ VERSION='2.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16172,7 +16102,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sbsms $as_me 1.5.0, which was
+This file was extended by sbsms $as_me 2.0.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16225,7 +16155,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sbsms config.status 1.5.0
+sbsms config.status 2.0.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib-src/sbsms/configure.in b/lib-src/sbsms/configure.in
index ecea50bc2..ee11724d8 100644
--- a/lib-src/sbsms/configure.in
+++ b/lib-src/sbsms/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([sbsms],[1.5.0])
+AC_INIT([sbsms],[2.0.0])
 
 dnl Use the m4/ directory to contain libtool macros that will be needed to 
 dnl go with the ltmain.sh script (both will be created/updated via the command
@@ -8,8 +8,8 @@ AC_CONFIG_MACRO_DIR([m4])
 #------------------------------------------------------------------------------------
 # Library's "official" release version:
 
-LIBSBSMS_RELEASE_MAJOR=1
-LIBSBSMS_RELEASE_MINOR=7
+LIBSBSMS_RELEASE_MAJOR=2
+LIBSBSMS_RELEASE_MINOR=0
 LIBSBSMS_RELEASE_BUILD=0
 AC_CONFIG_SRCDIR([src/sbsms.cpp])
 AC_CANONICAL_TARGET([])
@@ -34,7 +34,7 @@ AC_DISABLE_SHARED dnl allows for optimizations
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-SHARED_VERSION_INFO="8:0:7"
+SHARED_VERSION_INFO="10:0:0"
 
 AC_PROG_LIBTOOL
 AM_PROG_LIBTOOL
@@ -47,29 +47,29 @@ cxxflags_save="$CXXFLAGS"
 AC_LANG([C++])
 AC_PROG_CXX
 AC_PROG_CXXCPP
+AX_COMPILER_VENDOR
 # restore those variables back
 CFLAGS="$cflags_save"
 CPPFLAGS="$cppflags_save"
 CXXFLAGS="$cxxflags_save"
 
-AC_CHECK_FUNCS(malloc calloc free memcpy memmove)
-
-AC_CHECK_LIB([m],floor)
-AC_CHECK_FUNCS(floor sqrt log exp sin cos)
-
 AC_C99_FUNC_LRINT()
 AC_C99_FUNC_LRINTF()
 
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
 
-AC_ARG_ENABLE(universal_binary,[  --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
-
 AC_ARG_ENABLE(static,[  --enable-static enable static build: (default: disable)],[enable_static=$enableval],[enable_static=no])
 
 AC_ARG_ENABLE(debug,[  --enable-debug enable debug build: (default: disable)],[enable_debug=$enableval],[enable_debug=no])
 
-SBSMS_CFLAGS="-ffast-math -fstrict-aliasing"
+AC_ARG_ENABLE(multithreaded,[  --enable-multithreaded enable multithreaded build: (default: disable)],[enable_multithreaded=$enableval],[enable_multithreaded=no])
+
+AC_ARG_ENABLE(sse, [AC_HELP_STRING([--enable-sse],[enable SSE optimizations])], enable_sse=$enableval, enable_sse=yes)
+
+AC_ARG_ENABLE(universal_binary,[  --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
+
+SBSMS_CFLAGS="-ffast-math -funroll-loops"
 
 if test x$enable_static = xno; then
   case "$target_os" in
@@ -81,35 +81,47 @@ if test x$enable_static = xno; then
    esac
 fi
 
+if test x$enable_debug = xyes; then
+   SBSMS_CFLAGS="$SBSMS_CFLAGS -g -O3"
+else
+   SBSMS_CFLAGS="$SBSMS_CFLAGS -O3 -fomit-frame-pointer"
+fi
+
+if test x$enable_multithreaded = xyes; then
+    AC_DEFINE(MULTITHREADED,1,[Define to compile multithreaded sbsms])
+fi
+
+echo "${ax_cv_cxx_compiler_vendor} XXX"
+
+if test x$enable_sse = xyes; then
+
+   if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
+      AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+   fi
+
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+   if test x$sse_ok = xyes; then
+      AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+   fi
+fi
+
 if test x$enable_universal_binary = xyes; then
    case "$target_os" in
      darwin*)
-        SBSMS_CFLAGS="$SBSMS_CFLAGS -mmacosx-version-min=10.4 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+        SBSMS_CFLAGS="$SBSMS_CFLAGS -mmacosx-version-min=10.4 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC"
 	;;
      *)
 	;;
    esac
 fi
 
-case "$target_os" in
-     darwin*)
-	macosx="yes"
-	;;
-     *)
-	macosx="no"
-	;;
-esac
-
-if test x$enable_debug = xyes; then
-   SBSMS_CFLAGS="$SBSMS_CFLAGS -g"
-else
-   SBSMS_CFLAGS="$SBSMS_CFLAGS -O3"
-fi
 AC_SUBST(SBSMS_CFLAGS)
 
-AM_INIT_AUTOMAKE([])
+AM_INIT_AUTOMAKE([no-dependencies])
 
 AM_MAINTAINER_MODE([enabled])
 
 AC_CONFIG_FILES([Makefile src/Makefile libsbsms.spec sbsms.pc])
+
 AC_OUTPUT
diff --git a/lib-src/sbsms/include/sbsms.h b/lib-src/sbsms/include/sbsms.h
index a583c8652..167c9e4be 100644
--- a/lib-src/sbsms/include/sbsms.h
+++ b/lib-src/sbsms/include/sbsms.h
@@ -1,172 +1,177 @@
+// -*- mode: c++ -*-
 #ifndef SBSMS_INCLUDE
 #define SBSMS_INCLUDE
 
 #include <stdio.h>
 
-#define SBSMS_REAL_FLOAT 1
-
 namespace _sbsms_ {
-typedef float real;
-typedef real interleaved[2];
-typedef interleaved audio;
 
-struct sbsms_quality {
-  long inframesize;
-  long maxoutframesize;
-  real minrate;
-  real maxrate;
-  int bands;
-  int M_MAX;
-  int H[5];
-  int N[8];
-  int S[8];
-  int res[8];
-  real pad[8];
-  real P[8];
-  real Q[8];
+typedef float t_fft[2];
+typedef t_fft audio;
+typedef long long int SampleCountType;
+typedef long long int TimeType;
+typedef unsigned char TrackIndexType;
+
+enum {
+  maxBands = 10,
+  numQualityParams = 52
 };
 
-extern const sbsms_quality sbsms_quality_standard;
-extern const sbsms_quality sbsms_quality_fast;
+struct SBSMSQualityParams {
+  int bands;
+  int H;
+  int N[maxBands];
+  int N0[maxBands];
+  int N1[maxBands];
+  int N2[maxBands];
+  int res[maxBands];
+};
 
-struct sbsms_resample_frame {
-  real ratio0;
-  real ratio1;
-  audio *in;
+class SBSMSQuality {
+ public:
+  SBSMSQuality(const SBSMSQualityParams *params);
+  SBSMSQualityParams params;
+  long getFrameSize();
+  long getMaxPresamples();
+};
+
+extern const SBSMSQualityParams SBSMSQualityStandard;
+
+struct SBSMSFrame {
+  float ratio0;
+  float ratio1;
+  audio *buf;
   long size;
 };
 
-typedef long (*sbsms_cb)(audio *buf, long n, void *data);
-typedef real (*sbsms_rate_cb)(long nProcessed, void *data);
-typedef real (*sbsms_pitch_cb)(long nProcessed, void *data);
-typedef long (*sbsms_resample_cb)(void *cb_data, sbsms_resample_frame *frame);
+typedef long (*SBSMSResampleCB)(void *cbData, SBSMSFrame *frame);
 
-class subband;
-class TrackAllocator;
-class PeakAllocator;
-
-struct sbsms {
-  FILE *fp;
-  sbsms_cb getSamplesCB;
-  sbsms_rate_cb getRateCB;
-  sbsms_pitch_cb getPitchCB;
-  subband *top;
-  TrackAllocator *ta;
-  PeakAllocator *pa;
-  long n_prepad, n_postpad, n_prespent, n_processed;
-  bool bWritingComplete;
-  sbsms_quality quality;
-  int channels;
-  audio *ina;
-  void *threadData;
-};
-
-class SampleBufBase {
+class SBSMSInterface {
  public:
-  SampleBufBase() {};
-  virtual ~SampleBufBase() {};
-  virtual long read(audio *buf, long n)=0;
-  virtual void advance(long n)=0;
-  virtual long n_readable()=0;
+  virtual ~SBSMSInterface() {}
+  virtual long samples(audio *buf, long n) { return 0; }
+  virtual float getStretch(float t)=0;
+  virtual float getPitch(float t)=0;
+  virtual long getPresamples()=0;
+  virtual SampleCountType getSamplesToInput()=0;
+  virtual SampleCountType getSamplesToOutput()=0;
 };
 
-class grain;
-
-class SampleBuf {
+class SBSMSTrackPoint {
  public:
-  //SampleBuf() {};
-  SampleBuf(int N);
-  SampleBuf(int N, long delay);
-  void init(int N, long delay);
-  void clear();
-  virtual ~SampleBuf();
-
-  void grow(long pos);
-  long write(audio *buf, long n);
-  long write(grain* g, int h);
-  virtual long read(audio *buf, long n);
-  virtual void advance(long n);
-  virtual long n_readable();
-  audio *getReadBuf();
-
-  long readPos, writePos;
-  long delay;
-
-  int N;
-  long length;
-  audio *buf;  
+  virtual ~SBSMSTrackPoint() {}
+  virtual float getF()=0;
+  virtual float getM()=0;
+  virtual float getPhase()=0;
 };
 
+class SBSMSTrack {
+ public:
+  virtual ~SBSMSTrack() {}
+  virtual SBSMSTrackPoint *getSBSMSTrackPoint(const TimeType &time)=0;
+  virtual TrackIndexType getIndex()=0;
+  virtual bool isFirst(const TimeType &synthtime)=0;
+  virtual bool isLast(const TimeType &synthtime)=0;
+};
+
+class SBSMSRenderer {
+ public:
+  virtual ~SBSMSRenderer() {}
+  virtual void startFrame() {}
+  virtual void startTime(int c, const TimeType &time, int n) {}
+  virtual void render(int c, SBSMSTrack *t) {}
+  virtual void endTime(int c) {}
+  virtual void endFrame() {}
+  virtual void end(const SampleCountType &samples) {}
+};
+
+enum SBSMSError {
+  SBSMSErrorNone = 0,
+  SBSMSErrorInvalidRate
+};
+
+class SBSMSImp;
+
+class SBSMS {
+ public:
+  SBSMS(int channels, SBSMSQuality *quality, bool bSynthesize);
+  ~SBSMS();
+
+  long read(SBSMSInterface *iface, audio *buf, long n);
+  void addRenderer(SBSMSRenderer *renderer);
+  void removeRenderer(SBSMSRenderer *renderer);
+  long renderFrame(SBSMSInterface *iface);
+  long getInputFrameSize();
+  SBSMSError getError();
+  friend class SBSMSImp;
+ protected:
+  SBSMSImp *imp;
+};
+
+enum SlideType {
+  SlideIdentity = 0,
+  SlideConstant,
+  SlideLinearInputRate,
+  SlideLinearOutputRate,
+  SlideLinearInputStretch,
+  SlideLinearOutputStretch,
+  SlideGeometricInput,
+  SlideGeometricOutput
+};
+
+class SlideImp;
+
+class Slide {
+ public:
+  Slide(SlideType slideType, float rate0 = 1.0f, float rate1 = 1.0f, const SampleCountType &n = 0);
+  ~Slide();
+  float getTotalStretch();
+  float getStretchedTime(float t);
+  float getRate(float t);
+  float getStretch(float t);
+  float getRate();
+  float getStretch();
+  void step();
+ protected:
+  SlideImp *imp;
+};
+ 
+class SBSMSInterfaceSlidingImp;
+
+class SBSMSInterfaceSliding : public SBSMSInterface {
+public:
+  SBSMSInterfaceSliding(Slide *rateSlide, 
+                        Slide *pitchSlide, 
+                        bool bPitchReferenceInput, 
+                        const SampleCountType &samplesToInput, 
+                        long preSamples,
+                        SBSMSQuality *quality);
+  virtual ~SBSMSInterfaceSliding();
+  virtual float getStretch(float t);
+  virtual float getPitch(float t);
+  virtual long getPresamples();
+  virtual SampleCountType getSamplesToInput();
+  virtual SampleCountType getSamplesToOutput();
+
+  friend class SBSMSInterfaceSlidingImp;
+protected:
+  SBSMSInterfaceSlidingImp *imp;
+};
+
+class ResamplerImp;
+
 class Resampler {
  public:
-  Resampler(sbsms_resample_cb func, void *data);
-  Resampler(SampleBuf *in, real pitch);
+  Resampler(SBSMSResampleCB func, void *data, SlideType slideType = SlideConstant);
   ~Resampler();
   long read(audio *audioOut, long frames);
-  void writingComplete();
   void reset();
-  void init();
   long samplesInOutput();
 
  protected:
-  sbsms_resample_frame frame;
-  long startAbs;
-  long midAbs;
-  real midAbsf;
-  long endAbs;
-  long writePosAbs;
-  bool bInput;
-  SampleBuf *out;
-  sbsms_resample_cb cb;
-  void *data;
-  bool bPull;
-  SampleBuf *in;
-  long inOffset;
-  real sincZeros;
-  bool bWritingComplete;
+  ResamplerImp *imp;
 };
 
-void sbsms_init(int n);
-void sbsms_reset(sbsms *sbsmser);
-void sbsms_seek(sbsms *sbsmser, long framePos, long samplePos);
-sbsms* sbsms_create(sbsms_cb getSamplesCB, sbsms_rate_cb getRateCB, sbsms_pitch_cb getPitchCB, int channels, sbsms_quality *quality, bool bPreAnalyze, bool bSynthesize);
-sbsms* sbsms_create(FILE *fp, sbsms_rate_cb getRateCB, sbsms_pitch_cb getPitchCB);
-void sbsms_destroy(sbsms* sbsmser);
-long sbsms_read_frame(audio *out, void *data, sbsms *sbsmer, real *pitch0, real *pitch1);
-long sbsms_write_frame(FILE *fp, void *data, sbsms *sbsmser);
-long sbsms_samples_processed(sbsms *sbsmser);
-long sbsms_pre_analyze(sbsms_cb getSamplesCB, void *data, sbsms *sbsmser);
-void sbsms_pre_analyze_complete(sbsms *sbsmser);
-
-long sbsms_get_samples_queued(sbsms *sbsmser);
-long sbsms_get_frames_queued(sbsms *sbsmser);
-long sbsms_get_last_input_frame_size(sbsms *sbsmser);
-long sbsms_get_frame_pos(sbsms *sbsmser);
-
-void sbsms_close_write(FILE *fp, sbsms *sbsmser);
-FILE *sbsms_open_write(const char *fileName, sbsms *sbsmser, long samples_to_process);
-void sbsms_close_read(FILE *fp);
-FILE *sbsms_open_read(const char *fileName);
-long sbsms_get_samples_to_process(FILE *fp);
-long sbsms_get_frames_to_process(FILE *fp);
-long sbsms_get_channels(FILE *fp);
-void sbsms_get_quality(FILE *fp, sbsms_quality *quality);
-void sbsms_seek_start_data(FILE *fp);
-
-struct sbsmsInfo {
-  real rate0, rate1;
-  real pitch0, pitch1;
-  long samplesToProcess;
-  long samplesToGenerate;
-  Resampler *rs;
-};
-
-long getLinearOutputSamples(sbsmsInfo *si);
-real rateCBLinear(long nProcessed, void *userData);
-real rateCBConstant(long nProcessed, void *userData);
-real pitchCBLinear(long nProcessed, void *userData);
-real pitchCBConstant(long nProcessed, void *userData);
-
 }
 
 #endif
diff --git a/lib-src/sbsms/src/Makefile.am b/lib-src/sbsms/src/Makefile.am
index c03adecc9..62dda2d04 100644
--- a/lib-src/sbsms/src/Makefile.am
+++ b/lib-src/sbsms/src/Makefile.am
@@ -4,4 +4,4 @@ libsbsmsincludedir = $(includedir)
 libsbsmsinclude_HEADERS = ../include/sbsms.h
 
 lib_LTLIBRARIES = libsbsms.la
-libsbsms_la_SOURCES = peak.cpp sms.cpp track.cpp trackpoint.cpp utils.cpp audio.cpp resample.cpp sbsms.cpp fft.cpp grain.cpp buffer.cpp subband.cpp audio.h buffer.h fft.h utils.h peak.h trackpoint.h grain.h real.h resample.h ../include/sbsms.h sms.h subband.h track.h
+libsbsms_la_SOURCES = sms.cpp track.cpp trackpoint.cpp resample.cpp sbsms.cpp fft.cpp grain.cpp buffer.cpp dBTable.cpp slide.cpp dBTable.h synthTable.h sse.h subband.cpp buffer.h fft.h utils.h trackpoint.h grain.h real.h resample.h ../include/sbsms.h sms.h subband.h track.h
diff --git a/lib-src/sbsms/src/Makefile.in b/lib-src/sbsms/src/Makefile.in
index ea556e096..1615afd08 100644
--- a/lib-src/sbsms/src/Makefile.in
+++ b/lib-src/sbsms/src/Makefile.in
@@ -40,6 +40,8 @@ DIST_COMMON = $(libsbsmsinclude_HEADERS) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
 	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
+	$(top_srcdir)/m4/ax_check_compiler_flags.m4 \
+	$(top_srcdir)/m4/ax_compiler_vendor.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in
@@ -59,9 +61,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libsbsms_la_LIBADD =
-am_libsbsms_la_OBJECTS = peak.lo sms.lo track.lo trackpoint.lo \
-	utils.lo audio.lo resample.lo sbsms.lo fft.lo grain.lo \
-	buffer.lo subband.lo
+am_libsbsms_la_OBJECTS = sms.lo track.lo trackpoint.lo resample.lo \
+	sbsms.lo fft.lo grain.lo buffer.lo subband.lo dBTable.lo \
+	slide.lo
 libsbsms_la_OBJECTS = $(am_libsbsms_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -213,11 +215,11 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CXXFLAGS = -I../include @SBSMS_CFLAGS@
+AM_CXXFLAGS = @SBSMS_CFLAGS@ -I../include
 libsbsmsincludedir = $(includedir)
 libsbsmsinclude_HEADERS = ../include/sbsms.h
 lib_LTLIBRARIES = libsbsms.la
-libsbsms_la_SOURCES = peak.cpp sms.cpp track.cpp trackpoint.cpp utils.cpp audio.cpp resample.cpp sbsms.cpp fft.cpp grain.cpp buffer.cpp subband.cpp audio.h buffer.h fft.h utils.h peak.h trackpoint.h grain.h real.h resample.h ../include/sbsms.h sms.h subband.h track.h
+libsbsms_la_SOURCES = sms.cpp track.cpp trackpoint.cpp resample.cpp sbsms.cpp fft.cpp grain.cpp buffer.cpp subband.cpp dBTable.cpp buffer.h fft.h sse.h utils.h trackpoint.h grain.h real.h synthTable.h dBTable.h sincCoeffs.h ../include/sbsms.h sms.h subband.h track.h slide.cpp
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -305,18 +307,17 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dBTable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grain.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peak.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resample.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sbsms.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slide.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sms.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subband.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trackpoint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/lib-src/sbsms/src/buffer.cpp b/lib-src/sbsms/src/buffer.cpp
index 5cd2bfd09..bce213840 100644
--- a/lib-src/sbsms/src/buffer.cpp
+++ b/lib-src/sbsms/src/buffer.cpp
@@ -9,162 +9,49 @@ using namespace std;
 
 namespace _sbsms_ {
 
-#define INIT_SAMPLEBUF_LENGTH 8192
-#define INIT_GRAINBUF_LENGTH 128
-#define INIT_TPLBUF_LENGTH 128
-
-/****************
-
- SampleBuf
-
-****************/
-
-SampleBuf :: SampleBuf(int N) 
+template<>
+void SampleBuf :: write(grain *g, int h)
 {
-  init(N,0);
-}
-
-SampleBuf :: SampleBuf(int N, long delay) 
-{
-  init(N,delay);
-}
-
-void SampleBuf :: init(int N, long delay)
-{
-  this->delay = delay;
-  this->N = N;
-  this->length = INIT_SAMPLEBUF_LENGTH;
-  this->buf = make_audio_buf(2*length);
-  this->readPos = 0;
-  this->writePos = 0;
-}
-
-SampleBuf :: ~SampleBuf() 
-{
-  free_audio_buf(buf);
-}
-
-long SampleBuf :: write(audio *in, long n)
-{
-  if(n==0) {
-    return 0;
-  }
-  grow(n);
-  memcpy(buf+writePos,in,n*sizeof(audio));
-  writePos += n;
-  return n;
-}
-
-void SampleBuf :: grow(long n)
-{
-  long pos = writePos+n;
-  while(pos >= 2*length) {
-    length *= 2;
-    audio *newBuf = make_audio_buf(2*length);
-    memcpy(newBuf,buf+readPos,(length-readPos)*sizeof(audio));
-    free_audio_buf(buf);
-    buf = newBuf;
-    writePos -= readPos;
-    pos -= readPos;
-    readPos = 0;
-  }
-}
-
-long SampleBuf :: write(grain *g, int h)
-{
-  grow(g->N);
+  grow(N);
   g->synthesize();
-  real f = 2.6666666666666666666666666f/(real)(N/h);
-  
+  float f = 2.6666666666666666666666666f/(float)(N/h);
   for(int c=0;c<2;c++) {
     int j = 0;
-    for(int k=writePos; k<writePos+g->N; k++) {
+    int kend = writePos + N;
+    for(int k=writePos; k<kend; k++) {
       buf[k][c] += g->x[j++][c] * f;
     }
   }
   writePos += h;
-  return h;
 }
 
-long SampleBuf :: read(audio *outBuf, long n)
+GrainBuf :: GrainBuf(int N, int h, int N2, int type) :
+  grainAllocator(N,N2,type)
 {
-  if(n==0)
-    return 0;
-  assert(writePos < 2*length);
-  n = min(n,n_readable());
-  n = max(n,(long)0);
-  memcpy(outBuf,buf+readPos,n*sizeof(audio));
-  return n;
-}
-
-long SampleBuf :: n_readable()
-{
-  return max(writePos-delay - readPos,(long)0);
-}
-
-void SampleBuf :: advance(long n) {
-  assert(readPos+n <= writePos);
-  memset(buf+readPos,0,n*sizeof(audio));
-  readPos += n;
-  if(readPos >= length) {
-    long endPos;
-    if(N==0)
-      endPos = 2*length;
-    else 
-      endPos = min(2*length,writePos+N);
-    memcpy(buf,buf+readPos,(endPos-readPos)*sizeof(audio));
-    memset(buf+readPos,0,(endPos-readPos)*sizeof(audio));
-    writePos -= readPos;
-    readPos = 0;
-  }
-}
-
-audio *SampleBuf :: getReadBuf() 
-{
-  return (buf+readPos);
-}
-
-void SampleBuf :: clear()
-{
-  advance(writePos-readPos);
-}
-
-/****************
-
- GrainBuf
-
-****************/
-
-GrainBuf :: GrainBuf(int N, int h) 
-{
-  init(N,h,1);
-}
-
-GrainBuf :: GrainBuf(int N, int h, real pad) 
-{
-  init(N,h,pad);
-}
-
-void GrainBuf :: init(int N, int h, real pad)
-{
-  this->length = INIT_GRAINBUF_LENGTH;
+  this->length = initGrainBufLength;
   this->buf = (grain**) calloc(2*length,sizeof(grain*));
-  this->iBuf = (audio*) calloc(N,sizeof(audio));
-  
-  this->pad = pad;
-  this->N = N;
+  this->iBuf = (audio*) calloc(N2,sizeof(audio));
+  this->N2 = N2;
   this->h = h;
+  this->overlap = N2 - h;
+  this->xOffset = (N-N2)>>1;
   this->iBufWritePos = 0;
   this->readPos = 0;
   this->writePos = 0;
-  
 }
 
 GrainBuf :: ~GrainBuf() 
 {
-  clear();
+  for(int k=readPos;k<writePos;k++) {
+    grainAllocator.forget(buf[k]);
+  }
   free(buf);
-  free_audio_buf(iBuf);
+  free(iBuf);
+}
+
+audio *GrainBuf :: getWindowFFT()
+{
+  return grainAllocator.W;
 }
 
 long GrainBuf :: write(audio *buf2, long n)
@@ -173,48 +60,43 @@ long GrainBuf :: write(audio *buf2, long n)
     return 0;
   }
   long ng = 0;
-  int overlap = N - h;
   long bufReadPos = 0;
-
+  long nToCopy;
   while(bufReadPos<n) {
-    long nToCopy = min((n-bufReadPos),N-iBufWritePos);
-    memcpy(iBuf+iBufWritePos, buf2+bufReadPos, nToCopy*sizeof(audio));
-
-    if(nToCopy+iBufWritePos == N) {
-      convert(iBuf);
+    nToCopy = min((n-bufReadPos),N2-iBufWritePos);
+    if(nToCopy+iBufWritePos == N2) {
+      if(buf2) {
+        memcpy(iBuf+iBufWritePos, buf2+bufReadPos, nToCopy*sizeof(audio));
+      } else {
+        memset(iBuf+iBufWritePos, 0, nToCopy*sizeof(audio));
+      }
+      grain *g = grainAllocator.create();
+      memcpy(g->x+xOffset,iBuf,N2*sizeof(audio));
+      write(g);
       ng++;
       memcpy(iBuf,iBuf+h,overlap*sizeof(audio));
       iBufWritePos = overlap;
       bufReadPos += nToCopy;
     } else break;
   }
-
-  // copy the remainder to the iBuf
-  long nToCopy = min((n-bufReadPos),N-iBufWritePos);
-  memcpy(iBuf+iBufWritePos, buf2+bufReadPos, nToCopy*sizeof(audio));
+  nToCopy = min((n-bufReadPos),N2-iBufWritePos);
+  if(buf2) {
+    memcpy(iBuf+iBufWritePos, buf2+bufReadPos, nToCopy*sizeof(audio));
+  } else {
+    memset(iBuf+iBufWritePos, 0, nToCopy*sizeof(audio));
+  }
   iBufWritePos += nToCopy;
     
   return ng;
 }
 
-void GrainBuf :: convert(audio *timebuf) 
-{
-  grain *g = grain::create(N,pad);
-  memcpy(g->x,timebuf,N*sizeof(audio));
-  g->analyze();
-  g->h = h;
-  write(g);
-}
-
 void GrainBuf :: advance(long n)
 {
   assert(readPos+n <= writePos);
   for(int k=readPos;k<readPos+n;k++) {
-    grain :: forget(buf[k]);
+    grainAllocator.forget(buf[k]);
   }
   readPos += n;
-
-  //grain::count-=n;
   if(readPos >= length) {
     memcpy(buf,buf+readPos,(writePos-readPos)*sizeof(grain*));
     writePos = writePos - readPos;
@@ -227,35 +109,43 @@ grain* GrainBuf :: read(long k)
   return buf[k];
 }
 
+long GrainBuf :: nReadable()
+{
+  return writePos - readPos;
+}
+
 void GrainBuf :: write(grain *g) 
 {
-  if(writePos >= 2*length) {
-    length *= 2;
-    grain **newBuf = (grain**)calloc(2*length,sizeof(grain*));
+  if(writePos >= length<<1) {
+    length <<= 1;
+    grain **newBuf = (grain**)calloc((length<<1),sizeof(grain*));
     memcpy(newBuf,buf+readPos,(writePos-readPos)*sizeof(grain*));
     free(buf);
     buf = newBuf;
     writePos -= readPos;
     readPos = 0;
   }
-
-  grain :: referenced(g);
+  grainAllocator.reference(g);
   buf[writePos++] = g;
 }
 
+void GrainBuf :: reference(grain *g)
+{
+  grainAllocator.reference(g);
+}
+
+void GrainBuf :: forget(grain *g)
+{
+  grainAllocator.forget(g);
+}
+
 void GrainBuf :: clear()
 {
-  memset(iBuf,0,N*sizeof(audio));
+  memset(iBuf,0,N2*sizeof(audio));
   iBufWritePos = 0;
-  advance(n_readable());
+  advance(writePos-readPos);
 }
 
-/****************
-
- Mixer
-
-****************/
-
 Mixer :: Mixer(SampleBufBase *b1, SampleBuf *b2)
 {
   this->b1 = b1;
@@ -264,86 +154,16 @@ Mixer :: Mixer(SampleBufBase *b1, SampleBuf *b2)
 
 long Mixer :: read(audio *outBuf, long n)
 {
-  if(n==0)
-    return 0;
-  n = min(n,n_readable());
-
-  b1->read(outBuf,n);
+  if(n==0) return 0;
+  n = min(n,b2->nReadable());
+  n = b1->read(outBuf,n);
   audio *buf2 = b2->getReadBuf();
-
   for(int k=0;k<n;k++) {
     for(int c=0;c<2;c++) 
       outBuf[k][c] += buf2[k][c];
   }
+  b2->advance(n);
   return n;
 }
 
-void Mixer::advance(long n)
-{
-  b1->advance(n);
-  b2->advance(n);
-}
-
-long Mixer::n_readable()
-{
-  return min(b1->n_readable(), b2->n_readable());
-}
-
-/********************
- TrackPointListBuffer
-********************/
-
-TrackPointListBuffer :: TrackPointListBuffer() {
-  length = INIT_TPLBUF_LENGTH;
-  buf = (tplist**) calloc(2*length,sizeof(tplist*));
-  readPos = 0;
-  writePos = 0;
-}
-
-TrackPointListBuffer :: ~TrackPointListBuffer() {
-  for(int k=readPos;k<writePos;k++)
-    delete buf[k];
-  free(buf);
-}
-
-long TrackPointListBuffer :: write(tplist *tpl) 
-{
-  if(writePos >= 2*length) {
-    length *= 2;
-    tplist **newBuf = (tplist**) calloc(2*length,sizeof(tplist*));
-    memcpy(newBuf,buf+readPos,(writePos-readPos)*sizeof(tplist*));
-    free(buf);
-    buf = newBuf;
-    writePos -= readPos;
-    readPos = 0;
-  }
-
-  buf[writePos++] = tpl;
-  return 1;
-}
-
-long TrackPointListBuffer :: n_readable()
-{
-  return writePos-readPos;
-}
-
-tplist *TrackPointListBuffer :: read(long k) 
-{
-  return buf[k];
-}
-
-void TrackPointListBuffer :: advance(long n)
-{
-  assert(readPos+n <= writePos);
-  for(int k=readPos;k<readPos+n;k++) {
-    delete buf[k];
-  }
-  readPos += n;
-  if(readPos >= length) {
-    memcpy(buf,buf+readPos,(writePos-readPos)*sizeof(tplist*));
-    writePos = writePos - readPos;
-    readPos = 0;
-  }
-}
-
 }
diff --git a/lib-src/sbsms/src/buffer.h b/lib-src/sbsms/src/buffer.h
index eb4e9c34a..443d10c0a 100644
--- a/lib-src/sbsms/src/buffer.h
+++ b/lib-src/sbsms/src/buffer.h
@@ -1,31 +1,32 @@
+// -*- mode: c++ -*-
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include <assert.h>
-#include <cstring>
-#include <cstdlib>
 #include "sbsms.h"
 #include "grain.h"
-#include "trackpoint.h"
+#include <stdlib.h>
 #include <list>
 using namespace std;
 
 namespace _sbsms_ {
 
-typedef list<trackpoint*> tplist;
+enum {
+  initSampleBufLength = 8192,
+  initGrainBufLength = 256,
+  initRingBufferLength = 64
+};
 
 template <class T>
 class RingBuffer {
  public:
   RingBuffer();
   ~RingBuffer();
-  
   long write(T a);
   T read(long k);
-  long n_readable();
+  T read();
+  long nReadable();
   void advance(long n);
   void clear();
-
   long readPos;
   long writePos;
  protected:
@@ -33,8 +34,6 @@ class RingBuffer {
   long length;
 };
 
-#define INIT_RINGBUF_LENGTH 128
-
 /********************
  RingBuffer
 ********************/
@@ -42,7 +41,7 @@ class RingBuffer {
 template <class T>
 RingBuffer<T> :: RingBuffer()
 {
-  length = INIT_RINGBUF_LENGTH;
+  length = initRingBufferLength;
   buf = (T*) calloc(2*length,sizeof(T));
   readPos = 0;
   writePos = 0;
@@ -77,7 +76,13 @@ T RingBuffer<T> :: read(long k)
 }
 
 template <class T>
-long RingBuffer<T> :: n_readable()
+T RingBuffer<T> :: read()
+{
+  return buf[readPos];
+}
+
+template <class T>
+long RingBuffer<T> :: nReadable()
 {
   return writePos-readPos;
 }
@@ -85,7 +90,6 @@ long RingBuffer<T> :: n_readable()
 template <class T>
 void RingBuffer<T> :: advance(long n)
 {
-  assert(readPos+n <= writePos);
   readPos += n;
   if(readPos >= length) {
     memcpy(buf,buf+readPos,(writePos-readPos)*sizeof(T));
@@ -101,64 +105,159 @@ void RingBuffer<T> :: clear()
   writePos = 0;
 }
 
-class TrackPointListBuffer {
+class SampleBufBase {
  public:
-  TrackPointListBuffer();
-  ~TrackPointListBuffer();
-  
-  long write(tplist *tpl);
-  tplist *read(long k);
-  long n_readable();
-  void advance(long n);
-  
-  long readPos;
-  long writePos;
-
- protected:
-  tplist **buf;  
-  long length;
+  SampleBufBase() {};
+  virtual ~SampleBufBase() {};
+  virtual long read(audio *buf, long n)=0;
 };
 
+/****************
+
+SampleBuf
+
+****************/
+
+class grain;
+
+template<class T>
+class ArrayRingBuffer
+{
+ public:
+  ArrayRingBuffer(int N);
+  virtual ~ArrayRingBuffer();
+  void clear();
+  void grow(long pos);
+  void write(T *buf, long n);
+  void write(grain *g, int h);
+  void read(T *buf, long n);
+  void advance(long n);
+  long nReadable();
+  T *getReadBuf();
+  long readPos, writePos;
+  int N;
+  long length;
+  T *buf;
+};
+
+
+template<class T>
+ArrayRingBuffer<T> :: ArrayRingBuffer(int N) 
+{
+  this->N = N;
+  this->length = initSampleBufLength;
+  this->buf = (T*)calloc(2*length,sizeof(T));
+  this->readPos = 0;
+  this->writePos = 0;
+}
+
+template<class T>
+ArrayRingBuffer<T> :: ~ArrayRingBuffer() 
+{
+  free(buf);
+}
+
+template<class T>
+void ArrayRingBuffer<T> :: write(T *in, long n)
+{
+  grow(n);
+  if(in) memcpy(buf+writePos,in,n*sizeof(T));
+  writePos += n;
+}
+
+template<class T>
+void ArrayRingBuffer<T> :: grow(long n)
+{
+  long pos = writePos+n;
+  while(pos >= 2*length) {
+    length *= 2;
+    T *newBuf = (T*)calloc(2*length,sizeof(T));
+    memcpy(newBuf,buf+readPos,(length-readPos)*sizeof(T));
+    free(buf);
+    buf = newBuf;
+    writePos -= readPos;
+    pos -= readPos;
+    readPos = 0;
+  }
+}
+
+template<class T>
+void ArrayRingBuffer<T> :: read(T *outBuf, long n)
+{
+  n = max(0L,min(n,nReadable()));
+  memcpy(outBuf,buf+readPos,n*sizeof(T));
+  advance(n);
+}
+
+template<class T>
+long ArrayRingBuffer<T> :: nReadable()
+{
+  return max(0L,writePos-readPos);
+}
+
+template<class T>
+void ArrayRingBuffer<T> :: advance(long n) {
+  memset(buf+readPos,0,n*sizeof(T));
+  readPos += n;
+  if(readPos >= length) {
+    long endPos;
+    endPos = writePos+N;
+    memcpy(buf,buf+readPos,(endPos-readPos)*sizeof(T));
+    memset(buf+readPos,0,((length<<1)-readPos)*sizeof(T));
+    writePos -= readPos;
+    readPos = 0;
+  }
+}
+
+template<class T>
+T *ArrayRingBuffer<T> :: getReadBuf() 
+{
+  return (buf+readPos);
+}
+
+template<class T>
+void ArrayRingBuffer<T> :: clear()
+{
+  advance(writePos-readPos);
+}
+
+typedef ArrayRingBuffer<audio> SampleBuf;
+
 class GrainBuf {
  public:
-  GrainBuf(int N, int h);
-  GrainBuf(int N, int h, real pad);
+  GrainBuf(int N, int h, int N2, int type);
   ~GrainBuf();
-
-  void init(int N, int h, real pad);
   long write(audio *buf, long n);
   void write(grain *g);
   void advance(long n);
-  long n_readable() { return writePos - readPos; }
+  long nReadable();
   void clear();
   grain* read(long k);
-
-  long length;
-  long readPos, writePos;
-  int N,h;
-  real pad;
-
+  void reference(grain *g);
+  void forget(grain *g);
+  audio *getWindowFFT();
+  long readPos;
+  long writePos;
  protected:
-  void convert(audio *buf);
   audio *iBuf;
-  long iBufWritePos;
   grain **buf;
-  
+  long length;
+  long N2;
+  long h;
+  long overlap;
+  long xOffset;
+  long iBufWritePos;
+  GrainAllocator grainAllocator;
 };
 
 class Mixer : public SampleBufBase {
  public:
   Mixer(SampleBufBase *, SampleBuf *);
-  long read(audio *buf, long n);
-  void advance(long n);
-  long n_readable();
   ~Mixer() {}
-
+  virtual long read(audio *buf, long n);
 protected:
-  SampleBuf *buf;
   SampleBufBase *b1;
-  SampleBuf *b2;
- 
+  SampleBuf *b2; 
 };
 
 }
diff --git a/lib-src/sbsms/src/config.h.in b/lib-src/sbsms/src/config.h.in
index 300f8d29f..6ef76ad36 100644
--- a/lib-src/sbsms/src/config.h.in
+++ b/lib-src/sbsms/src/config.h.in
@@ -1,14 +1,14 @@
 /* src/config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define to enable sse */
+#undef ENABLE_SSE
+
 /* Define to 1 if you have the `calloc' function. */
 #undef HAVE_CALLOC
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `floor' function. */
-#undef HAVE_FLOOR
-
 /* Define to 1 if you have the `free' function. */
 #undef HAVE_FREE
 
@@ -18,18 +18,12 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
-/* Define to 1 if you have the `log' function. */
-#undef HAVE_LOG
-
 /* Define if you have C99's lrint function. */
 #undef HAVE_LRINT
 
 /* Define if you have C99's lrintf function. */
 #undef HAVE_LRINTF
 
-/* Define to use libmad */
-#undef HAVE_MAD
-
 /* Define to 1 if you have the `malloc' function. */
 #undef HAVE_MALLOC
 
@@ -39,14 +33,8 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to use libportaudio */
-#undef HAVE_PORTAUDIO
-
-/* Define to use libsndfile */
-#undef HAVE_SNDFILE
-
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
diff --git a/lib-src/sbsms/src/fft.cpp b/lib-src/sbsms/src/fft.cpp
index 652446085..5a69de642 100644
--- a/lib-src/sbsms/src/fft.cpp
+++ b/lib-src/sbsms/src/fft.cpp
@@ -1,737 +1,35 @@
 #include "fft.h"
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdlib.h>
-#include "utils.h"
 
 namespace _sbsms_ {
 
-#define REAL(tr,ti,r,i) (tr*r - ti*i)
-#define IMAG(tr,ti,r,i) (tr*i + ti*r)
-
-t_fft *make_fft_buf(int N) 
+void fft128(t_fft *x) 
 {
-  return (t_fft*) malloc(N*sizeof(t_fft));
+  fft<128,1>(x);
 }
 
-void free_fft_buf(t_fft *buf)
+void ifft128(t_fft *x) 
 {
-  free(buf);
+  fft<128,-1>(x);
 }
 
-void optimizeFactors(int *f)
+void fft256(t_fft *x) 
 {
-  int n = 0;
-  for(int k=0;;k++) {
-    if(f[k]==0) break;
-    n++;
-  }
-  int *g = (int*)calloc(n+1,sizeof(int));
-  for(int k=0;k<n;k++) {
-    g[k] = f[k];
-  }
-
-  int m = 0;
-  for(int k=0;k<n;k++) {
-    int f2 = g[k] * g[k+1];
-    if(f2 == 6) {
-      f[m++] = 6;
-      k++;
-    } else if(f2 == 4) {
-      f[m++] = 4;
-      k++;
-    } else {
-      f[m++] = g[k];
-    }
-  }
-  f[m] = 0;
-  free(g);
+  fft<256,1>(x);
 }
 
-int *getOrder(int n, int *N1, int *N2)
+void ifft256(t_fft *x) 
 {
-  int N = N1[0]*N2[0];
-  int *order = (int*)calloc(N,sizeof(int));
-  for(int k=0;k<N;k++) {
-    int kr = 0;
-    int k0 = k;
-    for(int i=0;i<n;i++) {
-      int k2 = k0%N2[i];
-      k0 /= N2[i];
-      kr += N1[i]*k2;
-    }
-    order[k] = kr;
-  }
-    
-  return order;
+  fft<256,-1>(x);
 }
 
-t_fft **calcTwiddles(int n, int *N1, int *N2, int *order, int sign)
+void fft384(t_fft *x) 
 {
-  t_fft **t = (t_fft**)calloc(n,sizeof(t_fft*));
-
-  for(int i=0;i<n;i++) {
-    int Np = N1[i]*N2[i];
-    t[i] = (t_fft*)calloc(Np,sizeof(t_fft));
-    for(int k=0;k<Np;k++) {
-      t[i][k][0] = cos((real)(-sign)*TWOPI*(real)k/(real)Np);
-      t[i][k][1] = sin((real)(-sign)*TWOPI*(real)k/(real)Np);
-    }
-  }
-  return t;
+  fft<384,1>(x);
 }
 
-fft_func *getFuncs(int *f)
+void fft512(t_fft *x) 
 {
-  int n = 0;
-  for(int k=0;;k++) {
-    if(f[k] == 0) break;
-    n++;
-  }
-
-  fft_func *func = (fft_func*)calloc(n,sizeof(fft_func));
-  for(int k=0;k<n;k++) {
-    switch(f[k]) {
-    case 2 : func[k] = fft2; break;
-    case 3 : func[k] = fft3; break;
-    case 4 : func[k] = fft4; break;
-    case 5 : func[k] = fft5; break;
-    case 6 : func[k] = fft6; break;
-    case 7 : func[k] = fft7; break;
-    }
-  }
-  return func;
-}
-
-int *getN1(int *f, int N)
-{
-  int n = 0;
-  for(int k=0;;k++) {
-    if(f[k] == 0) break;
-    n++;
-  }
-  
-  int *N1 = (int*)calloc(n,sizeof(int));
-  for(int k=0;k<n;k++) {
-    N /= f[k];
-    N1[k] = N;
-  }
-  return N1;
-}
-
-int getNFactors(int *f)
-{
-  int n = 0;
-  for(int k=0;;k++) {
-    if(f[k] == 0) break;
-    n++;
-  }
-  return n;
-}
-
-fftplan *planFFT(int N) 
-{
-  int *factors = factor(N);
-  optimizeFactors(factors);
-
-  fftplan *plan = new fftplan;
-  plan->dir = 1;
-  plan->n = getNFactors(factors);
-  plan->N2 = factors;
-  plan->N1 = getN1(factors,N);
-  plan->order = getOrder(plan->n,plan->N1,plan->N2);
-  plan->reorder = (t_fft*)malloc(N*sizeof(t_fft));
-  plan->t = calcTwiddles(plan->n,plan->N1,plan->N2,plan->order,1);
-  plan->f = getFuncs(factors);
-  plan->N = N;
-  plan->norm = 1.0;
-  return plan;
-}
-
-fftplan *planIFFT(int N) 
-{
-  int *factors = factor(N);
-  optimizeFactors(factors);
-  fftplan *plan = new fftplan;
-  plan->dir = -1;
-  plan->n = getNFactors(factors);
-  plan->N2 = factors;
-  plan->N1 = getN1(factors,N);
-  plan->order = getOrder(plan->n,plan->N1,plan->N2);
-  plan->reorder = (t_fft*)malloc(N*sizeof(t_fft));
-  plan->t = calcTwiddles(plan->n,plan->N1,plan->N2,plan->order,-1);
-  plan->f = getFuncs(factors);
-  plan->N = N;
-  plan->norm = 1.0f/(real)N;
-  return plan;
-}
-
-void destroy_fftplan(fftplan *plan)
-{
-  free(plan->reorder);
-  free(plan->order);
-  free(plan->f);
-  for(int i=0;i<plan->n;i++)
-    free(plan->t[i]);
-  free(plan->t);
-  free(plan->N1);
-  free(plan->N2);
-  free(plan);
-}
-
-void FFT(fftplan *plan, t_fft *x) 
-{
-  fft(plan,x,0,0);
-  
-  for(int k=0;k<plan->N;k++) {
-    plan->reorder[k][0] = x[k][0];
-    plan->reorder[k][1] = x[k][1];
-  } 
-  for(int k=0;k<plan->N;k++) {
-    int kr = plan->order[k];
-    if(k != kr) {
-      x[k][0] = plan->reorder[kr][0];
-      x[k][1] = plan->reorder[kr][1];
-    }
-  }
-
-}
-
-void IFFT(fftplan *plan, t_fft *x) 
-{
-  FFT(plan,x);
-  /*
-  real norm = plan->norm;
-  for(int k=0;k<plan->N;k++) {
-    x[k][0] *= norm;
-    x[k][1] *= norm;
-  }
-  */
-}
-
-void fft(fftplan *plan, t_fft *x, int r, int i)
-{
-  int N1 = plan->N1[i];
-  int N2 = plan->N2[i];
-  for(int n1=0;n1<N1;n1++) {
-    (plan->f[i])(x,n1,N1,r,plan->t[i],plan->dir);
-  }
-  if(N1==1) return;
-  for(int k2=0;k2<N2;k2++) {
-    fft(plan,x,r,i+1);
-    r += N1;
-  }
-}
-
-void fft2(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
-{
-  int i = r+n1;
-  real *x0 = x[i]; i+= N1;
-  real *x1 = x[i];
-
-  real y0 = x0[0] - x1[0];
-  real y1 = x0[1] - x1[1];
-
-  x0[0] += x1[0];
-  x0[1] += x1[1];
-
-  real *t1 = t[n1];
-  real t10 = t1[0];
-  real t11 = t1[1];
-  x1[0] = REAL(t10,t11,y0,y1);
-  x1[1] = IMAG(t10,t11,y0,y1);
-}
-
-#define T300 0.5f
-#define T301 0.86602540378444f
-void fft3(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
-{
-  int i = r+n1;
-  real *x0 = x[i]; i+=N1;
-  real *x1 = x[i]; i+=N1;
-  real *x2 = x[i];
-
-  real z00 = x1[0] + x2[0];
-  real z01 = x1[1] + x2[1];
-  
-  real z10 = x0[0] - T300*z00;
-  real z11 = x0[1] - T300*z01;
-
-  real z20;
-  real z21;
-  if(dir==1) {
-    z20 = T301*(x2[0] - x1[0]);
-    z21 = T301*(x2[1] - x1[1]);
-  } else {
-    z20 = T301*(x1[0] - x2[0]);
-    z21 = T301*(x1[1] - x2[1]);
-  }
-
-  x0[0] = z00 + x0[0];
-  x0[1] = z01 + x0[1];
-
-  real z30 = z10 - z21;
-  real z31 = z11 + z20;
-  real *t1 = t[n1];
-  real t10 = t1[0];
-  real t11 = t1[1];
-  x1[0] = REAL(t10,t11,z30,z31);
-  x1[1] = IMAG(t10,t11,z30,z31);
-
-  real z40 = z10 + z21;
-  real z41 = z11 - z20;
-  real *t2 = t[n1<<1];
-  real t20 = t2[0];
-  real t21 = t2[1];
-  x2[0] = REAL(t20,t21,z40,z41);
-  x2[1] = IMAG(t20,t21,z40,z41);
-}
-
-void fft4(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
-{
-  int i = r+n1;
-  real *x0 = x[i]; i+=N1;
-  real *x1 = x[i]; i+=N1;
-  real *x2 = x[i]; i+=N1;
-  real *x3 = x[i];
-
-  real z20 = x0[0] - x2[0];
-  real z21 = x0[1] - x2[1];
-  real z00 = x0[0] + x2[0];
-  real z01 = x0[1] + x2[1];
-  
-  real z10 = x1[0] + x3[0];
-  real z11 = x1[1] + x3[1];
-  
-  x0[0] = z00 + z10;
-  x0[1] = z01 + z11;
-  
-  real y20 = z00 - z10;
-  real y21 = z01 - z11;
-  real *t2 = t[n1<<1];
-  real t20 = t2[0];
-  real t21 = t2[1];
-  x2[0] = REAL(t20,t21,y20,y21);
-  x2[1] = IMAG(t20,t21,y20,y21);
-
-  real z30;
-  real z31;
-  if(dir==1) {
-    z30 = (x3[0] - x1[0]);
-    z31 = (x3[1] - x1[1]);  
-  } else {
-    z30 = (x1[0] - x3[0]);
-    z31 = (x1[1] - x3[1]);  
-  }
-
-  real y10 = z20 - z31;
-  real y11 = z21 + z30;
-  real *t1 = t[n1];
-  real t10 = t1[0];
-  real t11 = t1[1];
-  x1[0] = REAL(t10,t11,y10,y11);
-  x1[1] = IMAG(t10,t11,y10,y11);
-
-  real y30 = z20 + z31;
-  real y31 = z21 - z30;
-  real *t3 = t[n1*3];
-  real t30 = t3[0];
-  real t31 = t3[1];
-  x3[0] = REAL(t30,t31,y30,y31);
-  x3[1] = IMAG(t30,t31,y30,y31);
-}
-
-#define T500 0.95105651629515f
-#define T501 0.58778525229247f
-#define T510 0.55901699437495f
-#define T511 0.25f
-
-void fft5(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
-{
-  int i = r+n1;
-  real *x0 = x[i]; i+=N1;
-  real *x1 = x[i]; i+=N1;
-  real *x2 = x[i]; i+=N1;
-  real *x3 = x[i]; i+=N1;
-  real *x4 = x[i];
-
-  real z00 = x1[0] + x4[0];
-  real z01 = x1[1] + x4[1];
-
-  real z10 = x2[0] + x3[0];
-  real z11 = x2[1] + x3[1];
-
-  real z20 = x1[0] - x4[0];
-  real z21 = x1[1] - x4[1];
-
-  real z30 = x2[0] - x3[0];
-  real z31 = x2[1] - x3[1];
-
-  real z40 = z00 + z10;
-  real z41 = z01 + z11;
- 
-  real z50 = T510*(z00 - z10);
-  real z51 = T510*(z01 - z11);
-
-  real z60 = x0[0] - T511*z40;
-  real z61 = x0[1] - T511*z41;
-
-  real z70 = z50 + z60;
-  real z71 = z51 + z61;
-
-  real z80 = z60 - z50;
-  real z81 = z61 - z51;
-  
-  real z90;
-  real z91;
-  if(dir==1) {
-    z90 = -(T500*z20 + T501*z30);
-    z91 = -(T500*z21 + T501*z31);
-  } else {
-    z90 = (T500*z20 + T501*z30);
-    z91 = (T500*z21 + T501*z31);
-  }
-  
-  real z100;
-  real z101;
-  if(dir==1) {
-    z100 = (T500*z30 - T501*z20);
-    z101 = (T500*z31 - T501*z21);
-  } else {
-    z100 = (T501*z20 - T500*z30);
-    z101 = (T501*z21 - T500*z31);
-  }
-
-  x0[0] = x0[0] + z40;
-  x0[1] = x0[1] + z41;
-
-  real y10 = z70 - z91;
-  real y11 = z71 + z90;
-  real *t1 = t[n1];
-  real t10 = t1[0];
-  real t11 = t1[1];
-  x1[0] = REAL(t10,t11,y10,y11);
-  x1[1] = IMAG(t10,t11,y10,y11);
-
-  real y20 = z80 - z101;
-  real y21 = z81 + z100;
-  real *t2 = t[n1<<1];
-  real t20 = t2[0];
-  real t21 = t2[1];
-  x2[0] = REAL(t20,t21,y20,y21);
-  x2[1] = IMAG(t20,t21,y20,y21);
-
-  real y30 = z80 + z101;
-  real y31 = z81 - z100;
-  real *t3 = t[n1*3];
-  real t30 = t3[0];
-  real t31 = t3[1];
-  x3[0] = REAL(t30,t31,y30,y31);
-  x3[1] = IMAG(t30,t31,y30,y31);
-
-  real y40 = z70 + z91;
-  real y41 = z71 - z90;
-  real *t4 = t[n1<<2];
-  real t40 = t4[0];
-  real t41 = t4[1];
-  x4[0] = REAL(t40,t41,y40,y41);
-  x4[1] = IMAG(t40,t41,y40,y41);
-}
-
-#define T600 0.86602540378444f
-#define T601 0.5f
-void fft6(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
-{
-  int i = r+n1;
-  real *x0 = x[i]; i+=N1;
-  real *x1 = x[i]; i+=N1;
-  real *x2 = x[i]; i+=N1;
-  real *x3 = x[i]; i+=N1;
-  real *x4 = x[i]; i+=N1;
-  real *x5 = x[i];
-
-  real za00 = x2[0] + x4[0];
-  real za01 = x2[1] + x4[1];
-  
-  real za10 = x0[0] - T601*za00;
-  real za11 = x0[1] - T601*za01;
-
-  real za20;
-  real za21;
-  if(dir==1) {
-    za20 = T600*(x4[0] - x2[0]);
-    za21 = T600*(x4[1] - x2[1]);
-  } else {
-    za20 = T600*(x2[0] - x4[0]);
-    za21 = T600*(x2[1] - x4[1]);
-  }
-
-  real a00 = x0[0] + za00;
-  real a01 = x0[1] + za01;
-
-  real a10 = za10 - za21;
-  real a11 = za11 + za20;
-
-  real a20 = za10 + za21;
-  real a21 = za11 - za20;
-
-  real zb00 = x1[0] + x5[0];
-  real zb01 = x1[1] + x5[1];
-  
-  real zb10 = x3[0] - T601*zb00;
-  real zb11 = x3[1] - T601*zb01;
-
-  real zb20;
-  real zb21;
-  if(dir==1) {
-    zb20 = T600*(x1[0] - x5[0]);
-    zb21 = T600*(x1[1] - x5[1]);
-  } else {
-    zb20 = T600*(x5[0] - x1[0]);
-    zb21 = T600*(x5[1] - x1[1]);
-  }
-
-  real b00 = x3[0] + zb00;
-  real b01 = x3[1] + zb01;
-
-  real b10 = zb10 - zb21;
-  real b11 = zb11 + zb20;
-
-  real b20 = zb10 + zb21;
-  real b21 = zb11 - zb20;
-
-  x0[0] = a00 + b00;
-  x0[1] = a01 + b01;
-
-  real y10 = a10 - b10;
-  real y11 = a11 - b11;
-  real *t1 = t[n1];
-  real t10 = t1[0];
-  real t11 = t1[1];
-  x1[0] = REAL(t10,t11,y10,y11);
-  x1[1] = IMAG(t10,t11,y10,y11);
-
-  real y20 = a20 + b20;
-  real y21 = a21 + b21;
-  real *t2 = t[n1<<1];
-  real t20 = t2[0];
-  real t21 = t2[1];
-  x2[0] = REAL(t20,t21,y20,y21);
-  x2[1] = IMAG(t20,t21,y20,y21);
-
-  real y30 = a00 - b00;
-  real y31 = a01 - b01;
-  real *t3 = t[n1*3];
-  real t30 = t3[0];
-  real t31 = t3[1];
-  x3[0] = REAL(t30,t31,y30,y31);
-  x3[1] = IMAG(t30,t31,y30,y31);
-
-  real y40 = a10 + b10;
-  real y41 = a11 + b11;
-  real *t4 = t[n1<<2];
-  real t40 = t4[0];
-  real t41 = t4[1];
-  x4[0] = REAL(t40,t41,y40,y41);
-  x4[1] = IMAG(t40,t41,y40,y41);
-
-  real y50 = a20 - b20;
-  real y51 = a21 - b21;
-  real *t5 = t[n1*5];
-  real t50 = t5[0];
-  real t51 = t5[1];
-  x5[0] = REAL(t50,t51,y50,y51);
-  x5[1] = IMAG(t50,t51,y50,y51);
-}
-
-#define C71 -1.16666666666667f
-#define C72 0.79015646852540f
-#define C73 0.05585426728965f
-#define C74 0.73430220123575f
-#define C75 0.44095855184410f
-#define C76 0.34087293062393f
-#define C77 -0.53396936033773f
-#define C78 0.87484229096166f
-
-void fft7(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
-{
-  int i = r+n1;
-  real *x0 = x[i]; i+=N1;
-  real *x1 = x[i]; i+=N1;
-  real *x2 = x[i]; i+=N1;
-  real *x3 = x[i]; i+=N1;
-  real *x4 = x[i]; i+=N1;
-  real *x5 = x[i]; i+=N1;
-  real *x6 = x[i];
-
-  real u00 = x1[0] + x6[0];
-  real u01 = x1[1] + x6[1];
-
-  real u10 = x1[0] - x6[0];
-  real u11 = x1[1] - x6[1];
-
-  real u20 = x2[0] + x5[0];
-  real u21 = x2[1] + x5[1];
-
-  real u30 = x2[0] - x5[0];
-  real u31 = x2[1] - x5[1];
-
-  real u40 = x4[0] + x3[0];
-  real u41 = x4[1] + x3[1];
-
-  real u50 = x4[0] - x3[0];
-  real u51 = x4[1] - x3[1];
-
-  real u60 = u20 + u00;
-  real u61 = u21 + u01;
-
-  real u70 = u50 + u30;
-  real u71 = u51 + u31;
-
-  real b00 = x0[0] + u60 + u40;
-  real b01 = x0[1] + u61 + u41;
-
-  real b10 = C71*(u60 + u40);
-  real b11 = C71*(u61 + u41);
-  
-  real b20 = C72*(u00 - u40);
-  real b21 = C72*(u01 - u41);
-
-  real b30 = C73*(u40 - u20);
-  real b31 = C73*(u41 - u21);
-
-  real b40 = C74*(u20 - u00);
-  real b41 = C74*(u21 - u01);
-  
-  real b50;
-  real b51;
-  if(dir==1) {
-    b50 = C75*(u70 + u10);
-    b51 = C75*(u71 + u11);
-  } else {
-    b50 = -C75*(u70 + u10);
-    b51 = -C75*(u71 + u11);
-  }
-
-  real b60;
-  real b61;
-  if(dir==1) {
-    b60 = C76*(u10 - u50);
-    b61 = C76*(u11 - u51);
-  } else {
-    b60 = C76*(u50 - u10);
-    b61 = C76*(u51 - u11);
-  }
-  
-  real b70;
-  real b71;
-  if(dir==1) {
-    b70 = C77*(u50 - u30);
-    b71 = C77*(u51 - u31);
-  } else {
-    b70 = C77*(u30 - u50);
-    b71 = C77*(u31 - u51);
-  }
-
-  real b80;
-  real b81;
-  if(dir==1) {
-    b80 = C78*(u30 - u10);
-    b81 = C78*(u31 - u11);
-  } else {
-    b80 = C78*(u10 - u30);
-    b81 = C78*(u11 - u31);
-  }
-
-  real T00 = b00 + b10;
-  real T01 = b01 + b11;
-
-  real T10 = b20 + b30;
-  real T11 = b21 + b31;
-
-  real T20 = b40 - b30;
-  real T21 = b41 - b31;
-
-  real T30 = -b20 - b40;
-  real T31 = -b21 - b41;
-
-  real T40 = b60 + b70;
-  real T41 = b61 + b71;
-
-  real T50 = b80 - b70;
-  real T51 = b81 - b71;
-
-  real T60 = -b80 - b60;
-  real T61 = -b81 - b61;
-
-  real T70 = T00 + T10;
-  real T71 = T01 + T11;
-
-  real T80 = T00 + T20;
-  real T81 = T01 + T21;
-
-  real T90 = T00 + T30;
-  real T91 = T01 + T31;
-
-  real T100 = T40 + b50;
-  real T101 = T41 + b51;
-
-  real T110 = T50 + b50;
-  real T111 = T51 + b51;
-
-  real T120 = T60 + b50;
-  real T121 = T61 + b51;
-
-  x0[0] = b00;
-  x0[1] = b01;
-
-  real y10 = T70 + T101;
-  real y11 = T71 - T100;
-  real *t1 = t[n1];
-  real t10 = t1[0];
-  real t11 = t1[1];
-  x1[0] = REAL(t10,t11,y10,y11);
-  x1[1] = IMAG(t10,t11,y10,y11);
-
-  real y20 = T90 + T121;
-  real y21 = T91 - T120;
-  real *t2 = t[n1<<1];
-  real t20 = t2[0];
-  real t21 = t2[1];
-  x2[0] = REAL(t20,t21,y20,y21);
-  x2[1] = IMAG(t20,t21,y20,y21);
-
-  real y30 = T80 - T111;
-  real y31 = T81 + T110;
-  real *t3 = t[n1*3];
-  real t30 = t3[0];
-  real t31 = t3[1];
-  x3[0] = REAL(t30,t31,y30,y31);
-  x3[1] = IMAG(t30,t31,y30,y31);
-
-  real y40 = T80 + T111;
-  real y41 = T81 - T110;
-  real *t4 = t[n1<<2];
-  real t40 = t4[0];
-  real t41 = t4[1];
-  x4[0] = REAL(t40,t41,y40,y41);
-  x4[1] = IMAG(t40,t41,y40,y41);
-
-  real y50 = T90 - T121;
-  real y51 = T91 + T120;
-  real *t5 = t[n1*5];
-  real t50 = t5[0];
-  real t51 = t5[1];
-  x5[0] = REAL(t50,t51,y50,y51);
-  x5[1] = IMAG(t50,t51,y50,y51);
-
-  real y60 = T70 - T101;
-  real y61 = T71 + T100;
-  real *t6 = t[n1*6];
-  real t60 = t6[0];
-  real t61 = t6[1];
-  x6[0] = REAL(t60,t61,y60,y61);
-  x6[1] = IMAG(t60,t61,y60,y61);
+  fft<512,1>(x);
 }
 
 }
diff --git a/lib-src/sbsms/src/fft.h b/lib-src/sbsms/src/fft.h
index 2bc11f091..2914f6565 100644
--- a/lib-src/sbsms/src/fft.h
+++ b/lib-src/sbsms/src/fft.h
@@ -1,51 +1,853 @@
+// -*- mode: c++ -*-
 #ifndef FFT_H
 #define FFT_H
 
-#include "sbsms.h"
+#include <math.h>
+#include <string.h>
+#include "utils.h"
+
+#if defined(ENABLE_SSE) && !defined(APPLE_PPC)
+#include "sse.h"
+#endif
 
 namespace _sbsms_ {
 
-typedef real t_fft[2];
+typedef void (*fftplan)(t_fft *x);
+void fft128(t_fft *x);
+void ifft128(t_fft *x);
+void fft256(t_fft *x);
+void ifft256(t_fft *x);
+void fft384(t_fft *x);
+void fft512(t_fft *x);
 
-typedef void (*fft_func)(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
-
-struct fftplan {
-  fft_func *f;
-  int *order;
-  t_fft *reorder;
-  int *N1;
-  int *N2;
-  int N;
-  int n;
-  int dir;
-  real norm;
-  t_fft **t;
+template<int N>
+class Factor {
+public:
+  enum { value = (N%8==0)?8:(N%7==0)?7:(N%4==0)?4:(N%5==0)?5:(N%6==0)?6:(N%3==0)?3:(N%2==0)?2:1 };
 };
 
-t_fft *make_fft_buf(int N);
-void free_fft_buf(t_fft *buf);
-fftplan *planFFT(int N);
-fftplan *planIFFT(int N);
-void destroy_fftplan(fftplan *plan);
-void FFT(fftplan *plan, t_fft *x);
-void IFFT(fftplan *plan, t_fft *x);
+template<int N>
+class LastFactor {
+public:
+  enum { radix = Factor<N>::value,
+         stride = N / radix,
+         value = (stride==1?radix:LastFactor<stride>::value) };
+};
 
-void fft(fftplan *plan, t_fft *x, int r, int i);
-void optimizeFactors(int *f);
-int *getOrder(int n, int *N1, int *N2);
-t_fft **calcTwiddles(int n, int *N1, int *N2, int dir);
-fft_func *getFuncs(int *f);
-int *getN1(int *f, int N);
-int getNFactors(int *f);
+template <>
+class LastFactor<1> {
+public:
+  enum { value = 1 };
+};
 
-void fft2(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
-void fft3(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
-void fft4(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
-void fft5(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
-void fft6(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
-void fft7(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+template<int istride, int ostride, int radix, int dir>
+class __fft {
+public:
+  static inline void execute(t_fft *x, t_fft *y, int step);
+};
+
+template <int N, int dir> 
+class FloatTwiddles {
+public:
+  float c[N];
+  float s[N];
+  FloatTwiddles() {
+    for(int k=0; k<N; k++) {
+      c[k] = cos(TWOPI * (float)k / (float)N);
+      s[k] = sin(TWOPI * (float)(-dir*k) / (float)N);
+    }
+  }
+};
+
+template <int N, int dir> 
+class FloatTwiddle {
+ public:
+  static const float *c;
+  static const float *s;
+  static const FloatTwiddles<N,dir> t;
+  static inline void twiddle(int k, t_fft *x, float r, float i) {
+    float cc = c[k];
+    float ss = s[k];
+    (*x)[0] = cc * r - ss * i;
+    (*x)[1] = ss * r + cc * i;
+  }
+};
+
+template <int N, int dir>
+const FloatTwiddles<N,dir> FloatTwiddle<N,dir>::t;
+
+template <int N, int dir>
+const float* FloatTwiddle<N,dir>::c = t.c;
+
+template <int N, int dir>
+const float* FloatTwiddle<N,dir>::s = t.s;
+
+template<int istride, int ostride, int dir>
+class __fft<istride,ostride,2,dir> {
+public:
+  enum { i1 = istride, o1 = ostride, 
+         ir0 = 0, ii0 = 1, or0 = 0, oi0 = 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+    float y0 = x[ir0] - x[ir1]; float y1 = x[ii0] - x[ii1];
+    y[or0] = x[ir0] + x[ir1]; y[oi0] = x[ii0] + x[ii1];
+    y[or1] = y0; y[oi1] = y1;
+  }
+};
+
+template<int istride, int ostride, int dir>
+class __fft<istride,ostride,3,dir> {
+public:
+  enum { N = istride * 3,
+         i1_ = istride, o1 = ostride,
+         i2_ = istride + istride, o2 = o1 + ostride,
+         i1 = (dir==1?i1_:i2_),
+         i2 = (dir==1?i2_:i1_),
+         ir0 = 0, ii0 = 1, or0 = 0, oi0 = 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+    float z00 = x[ir1] + x[ir2]; float z01 = x[ii1] + x[ii2];
+    float z10 = x[ir0] - 0.5f*z00; float z11 = x[ii0] - 0.5f*z01;
+    float z20 = 0.86602540378444f*(x[ir2] - x[ir1]); float z21 = 0.86602540378444f*(x[ii2] - x[ii1]);
+    y[or0] = x[ir0] + z00; y[oi0] = x[ii0] + z01;
+    if(step) {
+      FloatTwiddle<N,dir>::twiddle(step, _y+o1,z10 - z21,z11 + z20);
+      FloatTwiddle<N,dir>::twiddle(step+step, _y+o2,z10 + z21,z11 - z20);
+    } else {
+      y[or1] = z10 - z21; y[oi1] = z11 + z20;
+      y[or2] = z10 + z21; y[oi2] = z11 - z20;
+    }
+  }
+};
+
+template<int istride, int ostride, int dir> 
+  class __fft<istride,ostride,5,dir> {
+public:
+  enum { N = istride*5,
+         i0 = 0, o0 = 0,
+         i1_ = i0 + istride, o1 = o0 + ostride,
+         i2_ = i1_ + istride, o2 = o1 + ostride,
+         i3_ = i2_ + istride, o3 = o2 + ostride,
+         i4_ = i3_ + istride, o4 = o3 + ostride,
+         i1 = (dir==1?i4_:i1_),
+         i2 = (dir==1?i3_:i2_),
+         i3 = (dir==1?i2_:i3_),
+         i4 = (dir==1?i1_:i4_),
+         ir0 = i0<<1, ii0 = ir0 + 1, or0 = o0<<1, oi0 = or0 + 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1,
+         ir3 = i3<<1, ii3 = ir3 + 1, or3 = o3<<1, oi3 = or3 + 1,
+         ir4 = i4<<1, ii4 = ir4 + 1, or4 = o4<<1, oi4 = or4 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+    float z00, z01, z10, z11, z20, z21, z30, z31, z40, z41, z50, z51, z60, z61, z70, z71, z80, z81, z90, z91, z100, z101;
+    z00 = x[ir1] + x[ir4]; z01 = x[ii1] + x[ii4];
+    z10 = x[ir2] + x[ir3]; z11 = x[ii2] + x[ii3];
+    z20 = x[ir1] - x[ir4]; z21 = x[ii1] - x[ii4];
+    z30 = x[ir2] - x[ir3]; z31 = x[ii2] - x[ii3];
+    z40 = z00 + z10; z41 = z01 + z11;
+    z50 = 0.55901699437495f*(z00 - z10); z51 = 0.55901699437495f*(z01 - z11);
+    z60 = x[ir0] - 0.25f*z40; z61 = x[ii0] - 0.25f*z41;
+    z70 = z50 + z60; z71 = z51 + z61;
+    z80 = z60 - z50; z81 = z61 - z51;
+    z90 = 0.95105651629515f*z20 + 0.58778525229247f*z30; z91 = 0.95105651629515f*z21 + 0.58778525229247f*z31;
+    z100 = 0.58778525229247f*z20 - 0.95105651629515f*z30; z101 = 0.58778525229247f*z21 - 0.95105651629515f*z31;
+    y[or0] = x[ir0] + z40; y[oi0] = x[ii0] + z41;
+    if(step) {
+      int step2 = step + step;
+      FloatTwiddle<N,dir>::twiddle(step,_y+o1,z70 - z91,z71 + z90);
+      FloatTwiddle<N,dir>::twiddle(step2,_y+o2,z80 - z101,z81 + z100);
+      FloatTwiddle<N,dir>::twiddle(step2+step,_y+o3,z80 + z101,z81 - z100);
+      FloatTwiddle<N,dir>::twiddle(step2+step2,_y+o4,z70 + z91,z71 - z90);
+    } else {
+      y[or1] = z70 - z91; y[oi1] = z71 + z90;
+      y[or2] = z80 - z101; y[oi2] = z81 + z100;
+      y[or3] = z80 + z101; y[oi3] = z81 - z100;
+      y[or4] = z70 + z91; y[oi4] = z71 - z90;
+    }
+  }
+};
+
+template<int istride, int ostride, int dir> 
+class __fft<istride,ostride,6,dir> {
+public:
+  enum { N = istride*6,
+         i0 = 0, o0 = 0,
+         i1_ = i0 + istride, o1 = o0 + ostride,
+         i2_ = i1_ + istride, o2 = o1 + ostride,
+         i3 = i2_ + istride, o3 = o2 + ostride,
+         i4_ = i3 + istride, o4 = o3 + ostride,
+         i5_ = i4_ + istride, o5 = o4 + ostride,
+         i1 = (dir==1?i1_:i5_),
+         i2 = (dir==1?i2_:i4_),
+         i4 = (dir==1?i4_:i2_),
+         i5 = (dir==1?i5_:i1_),
+         ir0 = i0<<1, ii0 = ir0 + 1, or0 = o0<<1, oi0 = or0 + 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1,
+         ir3 = i3<<1, ii3 = ir3 + 1, or3 = o3<<1, oi3 = or3 + 1,
+         ir4 = i4<<1, ii4 = ir4 + 1, or4 = o4<<1, oi4 = or4 + 1,
+         ir5 = i5<<1, ii5 = ir5 + 1, or5 = o5<<1, oi5 = or5 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+    float za00, za01, za10, za11, za20, za21;
+    float a00, a01, a10, a11, a20, a21;
+    float zb00, zb01, zb10, zb11, zb20, zb21;
+    float b00, b01, b10, b11, b20, b21;
+    za00 = x[ir2] + x[ir4]; za01 = x[ii2] + x[ii4];
+    za10 = x[ir0] - 0.5f*za00; za11 = x[ii0] - 0.5f*za01;
+    za20 = 0.86602540378444f*(x[ir4] - x[ir2]); za21 = 0.86602540378444f*(x[ii4] - x[ii2]);
+    a00 = x[ir0] + za00; a01 = x[ii0] + za01;
+    a10 = za10 - za21; a11 = za11 + za20;
+    a20 = za10 + za21; a21 = za11 - za20;
+    zb00 = x[ir1] + x[ir5]; zb01 = x[ii1] + x[ii5];
+    zb10 = x[ir3] - 0.5f*zb00; zb11 = x[ii3] - 0.5f*zb01;
+    zb20 = 0.86602540378444f*(x[ir1] - x[ir5]); zb21 = 0.86602540378444f*(x[ii1] - x[ii5]);
+    b00 = x[ir3] + zb00; b01 = x[ii3] + zb01;
+    b10 = zb10 - zb21; b11 = zb11 + zb20;
+    b20 = zb10 + zb21; b21 = zb11 - zb20;
+    y[or0] = a00 + b00; y[oi0] = a01 + b01;
+    if(step) {
+      FloatTwiddle<N,dir>::twiddle(step,_y+o1,a10 - b10,a11 - b11);
+      int step2 = step + step;
+      FloatTwiddle<N,dir>::twiddle(step2,_y+o2,a20 + b20,a21 + b21);
+      int step3 = step2 + step;
+      FloatTwiddle<N,dir>::twiddle(step3,_y+o3,a00 - b00,a01 - b01);
+      FloatTwiddle<N,dir>::twiddle(step2+step2,_y+o4,a10 + b10,a11 + b11);
+      FloatTwiddle<N,dir>::twiddle(step3+step2,_y+o5,a20 - b20,a21 - b21);
+    } else {
+      y[or1] = a10 - b10; y[oi1] = a11 - b11;
+      y[or2] = a20 + b20; y[oi2] = a21 + b21;
+      y[or3] = a00 - b00; y[oi3] = a01 - b01;
+      y[or4] = a10 + b10; y[oi4] = a11 + b11;
+      y[or5] = a20 - b20; y[oi5] = a21 - b21;
+    }
+  }
+};
+
+template<int istride, int ostride, int dir> 
+class __fft<istride,ostride,7,dir> {
+public:
+  enum { N = istride*7,
+         i0 = 0, o0 = 0,
+         i1 = i0 + istride, o1 = o0 + ostride,
+         i2 = i1 + istride, o2 = o1 + ostride,
+         i3 = i2 + istride, o3 = o2 + ostride,
+         i4 = i3 + istride, o4 = o3 + ostride,
+         i5 = i4 + istride, o5 = o4 + ostride,
+         i6 = i5 + istride, o6 = o5 + ostride,
+         ir0 = i0<<1, ii0 = ir0 + 1, or0 = o0<<1, oi0 = or0 + 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1,
+         ir3 = i3<<1, ii3 = ir3 + 1, or3 = o3<<1, oi3 = or3 + 1,
+         ir4 = i4<<1, ii4 = ir4 + 1, or4 = o4<<1, oi4 = or4 + 1,
+         ir5 = i5<<1, ii5 = ir5 + 1, or5 = o5<<1, oi5 = or5 + 1,
+         ir6 = i6<<1, ii6 = ir6 + 1, or6 = o6<<1, oi6 = or6 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+    float u00, u01, u10, u11, u20, u21, u30, u31, u40, u41, u50, u51, u60, u61, u70, u71;
+    float b00, b01, b10, b11, b20, b21, b30, b31, b40, b41, b50, b51, b60, b61, b70, b71, b80, b81;
+    float T00, T01, T10, T11, T20, T21, T30, T31, T40, T41, T50, T51, T60, T61, T70, T71, T80, T81, T90, T91, T100, T101, T110, T111, T120, T121;
+    u00 = x[ir1] + x[ir6]; u01 = x[ii1] + x[ii6];
+    u10 = x[ir1] - x[ir6]; u11 = x[ii1] - x[ii6];
+    u20 = x[ir2] + x[ir5]; u21 = x[ii2] + x[ii5];
+    u30 = x[ir2] - x[ir5]; u31 = x[ii2] - x[ii5];
+    u40 = x[ir4] + x[ir3]; u41 = x[ii4] + x[ii3];
+    u50 = x[ir4] - x[ir3]; u51 = x[ii4] - x[ii3];
+    u60 = u20 + u00; u61 = u21 + u01;
+    u70 = u50 + u30; u71 = u51 + u31;
+    b00 = x[ir0] + u60 + u40; b01 = x[ii0] + u61 + u41;
+    b10 = -1.16666666666667f*(u60 + u40); b11 = -1.16666666666667f*(u61 + u41);
+    b20 = 0.79015646852540f*(u00 - u40); b21 = 0.79015646852540f*(u01 - u41);
+    b30 = 0.05585426728965f*(u40 - u20); b31 = 0.05585426728965f*(u41 - u21);
+    b40 = 0.73430220123575f*(u20 - u00); b41 = 0.73430220123575f*(u21 - u01);
+    if(dir==1) {
+      b50 = 0.44095855184410f*(u70 + u10);
+      b51 = 0.44095855184410f*(u71 + u11);
+      b60 = 0.34087293062393f*(u10 - u50);
+      b61 = 0.34087293062393f*(u11 - u51);
+      b70 = -0.53396936033773f*(u50 - u30);
+      b71 = -0.53396936033773f*(u51 - u31);
+      b80 = 0.87484229096166f*(u30 - u10);
+      b81 = 0.87484229096166f*(u31 - u11);
+    } else {
+      b50 = -0.44095855184410f*(u70 + u10);
+      b51 = -0.44095855184410f*(u71 + u11);
+      b60 = 0.34087293062393f*(u50 - u10);
+      b61 = 0.34087293062393f*(u51 - u11);
+      b70 = -0.53396936033773f*(u30 - u50);
+      b71 = -0.53396936033773f*(u31 - u51);
+      b80 = 0.87484229096166f*(u10 - u30);
+      b81 = 0.87484229096166f*(u11 - u31);
+    }
+    T00 = b00 + b10; T01 = b01 + b11;
+    T10 = b20 + b30; T11 = b21 + b31;
+    T20 = b40 - b30; T21 = b41 - b31;
+    T30 = -b20 - b40; T31 = -b21 - b41;
+    T40 = b60 + b70; T41 = b61 + b71;
+    T50 = b80 - b70; T51 = b81 - b71;
+    T60 = -b80 - b60; T61 = -b81 - b61;
+    T70 = T00 + T10; T71 = T01 + T11;
+    T80 = T00 + T20; T81 = T01 + T21;    
+    T90 = T00 + T30; T91 = T01 + T31;
+    T100 = T40 + b50; T101 = T41 + b51;
+    T110 = T50 + b50; T111 = T51 + b51;
+    T120 = T60 + b50; T121 = T61 + b51;
+    y[or0] = b00; y[oi0] = b01;
+    if(step) {
+      FloatTwiddle<N,dir>::twiddle(step,_y+o1,T70 + T101,T71 - T100);
+      int step2 = step + step;
+      FloatTwiddle<N,dir>::twiddle(step2,_y+o2,T90 + T121,T91 - T120);
+      int step3 = step2 + step;
+      FloatTwiddle<N,dir>::twiddle(step3,_y+o3,T80 - T111,T81 + T110);
+      FloatTwiddle<N,dir>::twiddle(step2+step2,_y+o4,T80 + T111,T81 - T110);
+      FloatTwiddle<N,dir>::twiddle(step3+step2,_y+o5,T90 - T121,T91 + T120);
+      FloatTwiddle<N,dir>::twiddle(step3+step3,_y+o6,T70 - T101,T71 + T100);
+    } else {
+       y[or1] = T70 + T101; y[oi1] = T71 - T100;
+       y[or2] = T90 + T121; y[oi2] = T91 - T120;
+       y[or3] = T80 - T111; y[oi3] = T81 + T110;
+       y[or4] = T80 + T111; y[oi4] = T81 - T110;
+       y[or5] = T90 - T121; y[oi5] = T91 + T120;
+       y[or6] = T70 - T101; y[oi6] = T71 + T100;
+    }
+  }
+};
+
+#if defined(ENABLE_SSE) && !defined(APPLE_PPC)
+
+template <int N, int dir> 
+class SSETwiddles {
+public:
+  simd_vector cs[N];
+  SSETwiddles() {
+    for(int k=0; k<N; k++) {
+      float c = cos(TWOPI * (float)k / (float)N);
+      float s = sin(TWOPI * (float)(-dir*k) / (float)N);
+      simd_vector v = {c,s,c,-s};
+      cs[k] = v;
+    }
+  }
+};
+
+template <int N, int dir> 
+class SSETwiddle {
+public:
+  static const SSETwiddles<N,dir> t;
+  static const simd_vector *cs;
+  static inline simd_vector twiddle(int k, const simd_vector &v) {
+    return VMUL(cs[k],v);
+  }
+  static inline void twiddle(int k, t_fft *x, const simd_vector &v) {
+    simd_vector y = twiddle(k,v);
+    simd_vector z = VADD(SHUFFLE(y,y,0,1,0,1),SHUFFLE(y,y,3,2,3,2));
+    STOREL(z,x);
+  }
+  static inline void twiddle2(int k1, int k2, t_fft *x1, t_fft *x2, const simd_vector &y1, const simd_vector &y2) {
+    simd_vector v1 = VMUL(cs[k1],y1);
+    simd_vector v2 = VMUL(cs[k2],y2);
+    simd_vector z = VADD(SHUFFLE(v1,v2,0,1,0,1),SHUFFLE(v1,v2,3,2,3,2));
+    STOREL(z,x1);
+    STOREH(z,x2);
+  }
+};
+
+template <int N, int dir>
+  const SSETwiddles<N,dir> SSETwiddle<N,dir>::t;
+
+template <int N, int dir>
+  const simd_vector* SSETwiddle<N,dir>::cs = t.cs;
+
+template<int istride, int ostride, int dir>
+class __fft<istride,ostride,4,dir> {
+public:
+  enum { N = istride * 4,
+         ir0 = 0, or0 = 0,
+         _ir1 = ir0 + istride, or1 = or0 + ostride,
+         ir2 = _ir1 + istride, or2 = or1 + ostride,
+         _ir3 = ir2 + istride, or3 = or2 + ostride,
+         ir1 = (dir==1?_ir3:_ir1),
+         ir3 = (dir==1?_ir1:_ir3) };
+  static inline void execute(t_fft *x, t_fft *y, int step) {
+    simd_vector v1;
+    simd_vector v2;
+    simd_vector v3;
+    simd_vector v4;
+    simd_vector v5;
+    v1 = LOADH(LOADL(v1,x+ir0),x+ir1);
+    v2 = LOADH(LOADL(v2,x+ir2),x+ir3);
+    v3 = VADD(v1,v2);
+    v4 = VSUB(v1,v2);
+    v1 = SHUFFLE(v4,v3,0,1,0,1);
+    v2 = SHUFFLE(v4,v3,3,2,2,3);
+    v3 = VADD(v1,v2);
+    STOREH(v3,y+or0);
+    v4 = VSUB(v1,v2);
+    v1 = SHUFFLE(v4,v3,0,0,1,1);
+    v2 = SHUFFLE(v4,v4,2,2,3,3);
+    v5 = SHUFFLE(v3,v4,0,0,1,1);
+    if(step) {
+      v1 = SSETwiddle<N,dir>::twiddle(step,v1);
+      int step2 = step + step;
+      v2 = SSETwiddle<N,dir>::twiddle(step2,v2);
+      v3 = SSETwiddle<N,dir>::twiddle(step2+step,v5);
+      v3 = VADD(v3,SHUFFLE(v3,v3,3,2,1,0));
+      STOREL(v3,y+or3);
+      v5 = VADD(SHUFFLE(v1,v2,0,1,0,1),SHUFFLE(v1,v2,3,2,3,2));
+      STOREL(v5,y+or1);
+      STOREH(v5,y+or2);
+    } else {
+      v5 = SHUFFLE(v5,v5,0,2,0,2);
+      STOREL(v5,y+or3);
+      v3 = SHUFFLE(v1,v2,0,2,0,2);
+      STOREL(v3,y+or1);
+      STOREH(v3,y+or2);
+    }
+  }
+};
+
+template<int istride, int ostride> 
+class __fft<istride,ostride,8,1> {
+public:
+  enum { N = istride*8,
+         i0 = 0, o0 = 0,
+         i1 = i0 + istride, o1 = o0 + ostride,
+         i2 = i1 + istride, o2 = o1 + ostride,
+         i3 = i2 + istride, o3 = o2 + ostride,
+         i4 = i3 + istride, o4 = o3 + ostride,
+         i5 = i4 + istride, o5 = o4 + ostride,
+         i6 = i5 + istride, o6 = o5 + ostride,
+         i7 = i6 + istride, o7 = o6 + ostride };
+  static inline void execute(t_fft *x, t_fft *y, int step) {
+    simd_vector v1,v2,v3,v4,v5,v6,v7,v8;
+    simd_vector x02,x37,x15,x17,x53,x46;
+    simd_vector w1, w2, w3, w4;
+    w1 = LOADH(LOADL(w1,x+i0),x+i6);
+    w2 = LOADH(LOADL(w2,x+i4),x+i2);	
+    w3 = VADD(w1,w2);
+    w4 = VSUB(w1,w2);
+    v1 = LOADH(LOADL(v1,x+i1),x+i7);
+    v2 = LOADH(LOADL(v2,x+i5),x+i3);
+    v3 = VADD(v1,v2);
+    v4 = VSUB(v1,v2);
+    v5 = SHUFFLE(v3,v4,2,1,0,1); //(z10,z01,z20,z21)
+    v6 = SHUFFLE(v3,v4,0,3,3,2); //(z00,z11,z31,z30)
+    v7 = VADD(v5,v6); // (x1,y30,y11)
+    v8 = VSUB(v5,v6); // (x51,x50,y10,y31)
+    x15 = SHUFFLE(v7,v8,0,1,1,0); //(x1,x5)
+    v2 = SHUFFLE(v8,v8,3,3,3,2); //(-,-,y31,y10)
+    v3 = VADD(v7,v2);
+    v4 = VSUB(v7,v2);
+    v5 = SHUFFLE(v3,v4,2,3,2,3);
+    x37 = VMUL(SET(0.7071067811865475f),v5); //(-x71,x30,-x70,x31)
+    v5 = SHUFFLE(w3,w4,0,1,0,1); //(z00,z01,z20,z21)
+    v6 = SHUFFLE(w3,w4,2,3,3,2); //(z10,z11,z31,z30)
+    v7 = VADD(v5,v6); //(x0,y30,y11)
+    v8 = VSUB(v5,v6); //(x4,y10,y31)
+    v1 = SHUFFLE(v7,v8,0,1,0,1); //(x0,x4)
+    v2 = SHUFFLE(v8,v7,3,2,2,3); //(x61,x20,x60,x21)
+    x02 = VADD(v1,x15);
+    x46 = VSUB(v1,x15);
+    x17 = VADD(v2,x37);
+    x53 = VSUB(v2,x37);
+    STOREL(x02,y+o0);
+    if(step) {
+      simd_vector y1;
+      simd_vector y2;
+      int step2 = step + step;
+      y1 = SHUFFLE(x02,x02,2,2,3,3);
+      SSETwiddle<N,1>::twiddle(step2,y+o2,y1);
+      int step3 = step2 + step;
+      y1 = SHUFFLE(x53,x53,1,1,3,3);
+      y2 = SHUFFLE(x53,x53,2,2,0,0);
+      SSETwiddle<N,1>::twiddle2(step3+step2,step3,y+o5,y+o3,y1,y2);
+      int step4 = step2 + step2;
+      y1 = SHUFFLE(x46,x46,0,0,1,1);
+      y2 = SHUFFLE(x46,x46,2,2,3,3);
+      SSETwiddle<N,1>::twiddle2(step4,step3+step3,y+o4,y+o6,y1,y2);
+      y1 = SHUFFLE(x17,x17,1,1,3,3);
+      y2 = SHUFFLE(x17,x17,2,2,0,0);
+      SSETwiddle<N,1>::twiddle2(step,step4+step3,y+o1,y+o7,y1,y2);
+    } else {
+      simd_vector y1;
+      y1 = SHUFFLE(x02,x02,2,3,3,3);
+      STOREL(y1,y+o2);
+      y1 = SHUFFLE(x53,x53,1,3,2,0);
+      STOREL(y1,y+o5);
+      STOREH(y1,y+o3);
+      STOREL(x46,y+o4);
+      STOREH(x46,y+o6);
+      y1 = SHUFFLE(x17,x17,1,3,2,0);
+      STOREL(y1,y+o1);
+      STOREH(y1,y+o7);
+    }
+  }
+};
+
+template<int istride, int ostride> 
+class __fft<istride,ostride,8,-1> {
+public:
+  enum { N = istride*8,
+         i0 = 0, o0 = 0,
+         i1 = i0 + istride, o1 = o0 + ostride,
+         i2 = i1 + istride, o2 = o1 + ostride,
+         i3 = i2 + istride, o3 = o2 + ostride,
+         i4 = i3 + istride, o4 = o3 + ostride,
+         i5 = i4 + istride, o5 = o4 + ostride,
+         i6 = i5 + istride, o6 = o5 + ostride,
+         i7 = i6 + istride, o7 = o6 + ostride };
+  static inline void execute(t_fft *x, t_fft *y, int step) {
+    simd_vector v1,v2,v3,v4,v5,v6,v7,v8;
+    simd_vector x02,x37,x15,x17,x53,x46;    
+    simd_vector w1, w2, w3, w4;
+    w1 = LOADH(LOADL(w1,x+i0),x+i2);
+    w2 = LOADH(LOADL(w2,x+i4),x+i6);	
+    w3 = VADD(w1,w2);
+    w4 = VSUB(w1,w2);
+    v1 = LOADH(LOADL(v1,x+i1),x+i3);
+    v2 = LOADH(LOADL(v2,x+i5),x+i7);
+    v3 = VADD(v1,v2);
+    v4 = VSUB(v1,v2);
+    v5 = SHUFFLE(v3,v4,0,3,0,1);
+    v6 = SHUFFLE(v3,v4,2,1,3,2);
+    v7 = VADD(v5,v6);
+    v8 = VSUB(v5,v6);
+    x15 = SHUFFLE(v7,v8,0,1,1,0);
+    v2 = SHUFFLE(v8,v8,3,3,3,2);
+    v3 = VADD(v7,v2);
+    v4 = VSUB(v2,v7);
+    v5 = SHUFFLE(v4,v3,2,3,2,3);
+    x37 = VMUL(SET(0.7071067811865475f),v5);
+    v5 = SHUFFLE(w3,w4,0,1,0,1);
+    v6 = SHUFFLE(w3,w4,2,3,3,2);
+    v7 = VADD(v5,v6);
+    v8 = VSUB(v5,v6);
+    v1 = SHUFFLE(v7,v8,0,1,0,1);
+    v2 = SHUFFLE(v8,v7,3,2,2,3);
+    x02 = VADD(v1,x15);
+    x46 = VSUB(v1,x15);
+    x17 = VADD(v2,x37);
+    x53 = VSUB(v2,x37);
+    STOREL(x02,y+o0);
+    if(step) {
+      simd_vector y1;
+      simd_vector y2;
+      int step2 = step + step;
+      y1 = SHUFFLE(x02,x02,2,2,3,3);
+      SSETwiddle<N,-1>::twiddle(step2,y+o2,y1);
+      int step3 = step2 + step;
+      y1 = SHUFFLE(x53,x53,1,1,3,3);
+      y2 = SHUFFLE(x53,x53,2,2,0,0);
+      SSETwiddle<N,-1>::twiddle2(step3+step2,step3,y+o5,y+o3,y1,y2);
+      int step4 = step2 + step2;
+      y1 = SHUFFLE(x46,x46,0,0,1,1);
+      y2 = SHUFFLE(x46,x46,2,2,3,3);
+      SSETwiddle<N,-1>::twiddle2(step4,step3+step3,y+o4,y+o6,y1,y2);
+      y1 = SHUFFLE(x17,x17,1,1,3,3);
+      y2 = SHUFFLE(x17,x17,2,2,0,0);
+      SSETwiddle<N,-1>::twiddle2(step,step4+step3,y+o1,y+o7,y1,y2);
+    } else {
+      simd_vector y1;
+      y1 = SHUFFLE(x02,x02,2,3,3,3);
+      STOREL(y1,y+o2);
+      y1 = SHUFFLE(x53,x53,1,3,2,0);
+      STOREL(y1,y+o5);
+      STOREH(y1,y+o3);
+      STOREL(x46,y+o4);
+      STOREH(x46,y+o6);
+      y1 = SHUFFLE(x17,x17,1,3,2,0);
+      STOREL(y1,y+o1);
+      STOREH(y1,y+o7);
+    }
+  }
+};
+
+#else // !ENABLE_SSE
+
+template<int istride, int ostride, int dir> 
+  class __fft<istride,ostride,4,dir> {
+ public:
+  enum { N = istride*4,
+         i0 = 0, o0 = 0,
+         i1_ = i0 + istride, o1 = o0 + ostride,
+         i2 = i1_ + istride, o2 = o1 + ostride,
+         i3_ = i2 + istride, o3 = o2 + ostride,
+         i1 = (dir==1?i1_:i3_),
+         i3 = (dir==1?i3_:i1_),
+         ir0 = i0<<1, ii0 = ir0 + 1, or0 = o0<<1, oi0 = or0 + 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1,
+         ir3 = i3<<1, ii3 = ir3 + 1, or3 = o3<<1, oi3 = or3 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+    float z00, z01, z10, z11, z20, z21, z30, z31;
+    z20 = x[ir0] - x[ir2]; z21 = x[ii0] - x[ii2];
+    z00 = x[ir0] + x[ir2]; z01 = x[ii0] + x[ii2];
+    z10 = x[ir1] + x[ir3]; z11 = x[ii1] + x[ii3];
+    y[or0] = z00 + z10; y[oi0] = z01 + z11;
+    z30 = x[ir3] - x[ir1]; z31 = x[ii3] - x[ii1];
+    if(step) {
+      int step2 = step + step;
+      FloatTwiddle<N,dir>::twiddle(step,_y+o1,z20 - z31,z21 + z30);
+      FloatTwiddle<N,dir>::twiddle(step2,_y+o2,z00 - z10,z01 - z11);
+      FloatTwiddle<N,dir>::twiddle(step2+step,_y+o3,z20 + z31,z21 - z30);
+    } else {
+      y[or1] = z20 - z31; y[oi1] = z21 + z30;
+      y[or2] = z00 - z10; y[oi2] = z01 - z11;
+      y[or3] = z20 + z31; y[oi3] = z21 - z30;
+    }
+  }
+};
+
+template<int istride, int ostride> 
+class __fft<istride,ostride,8,1> {
+public:
+  enum { N = istride*8,
+         i0 = 0, o0 = 0,
+         i1 = i0 + istride, o1 = o0 + ostride,
+         i2 = i1 + istride, o2 = o1 + ostride,
+         i3 = i2 + istride, o3 = o2 + ostride,
+         i4 = i3 + istride, o4 = o3 + ostride,
+         i5 = i4 + istride, o5 = o4 + ostride,
+         i6 = i5 + istride, o6 = o5 + ostride,
+         i7 = i6 + istride, o7 = o6 + ostride,         
+         ir0 = i0<<1, ii0 = ir0 + 1, or0 = o0<<1, oi0 = or0 + 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1,
+         ir3 = i3<<1, ii3 = ir3 + 1, or3 = o3<<1, oi3 = or3 + 1,
+         ir4 = i4<<1, ii4 = ir4 + 1, or4 = o4<<1, oi4 = or4 + 1,
+         ir5 = i5<<1, ii5 = ir5 + 1, or5 = o5<<1, oi5 = or5 + 1,
+         ir6 = i6<<1, ii6 = ir6 + 1, or6 = o6<<1, oi6 = or6 + 1,
+         ir7 = i7<<1, ii7 = ir7 + 1, or7 = o7<<1, oi7 = or7 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+		float z00, z01, z10, z11, z20, z21, z30, z31, y10, y11, y30, y31;
+    float yr0, yi0, yr1, yi1, yr2, yi2, yr3, yi3, yr4, yi4, yr5, yi5, yr6, yi6, yr7, yi7;
+		z00 = x[ir1] + x[ir5]; z01 = x[ii1] + x[ii5];
+		z10 = x[ir7] + x[ir3]; z11 = x[ii7] + x[ii3];
+		z20 = x[ir1] - x[ir5]; z21 = x[ii1] - x[ii5];
+    z30 = x[ir7] - x[ir3]; z31 = x[ii7] - x[ii3];
+		y10 = z20 - z31; y11 = z21 + z30;
+		y30 = z20 + z31; y31 = z21 - z30;
+		yr1 = z00 + z10; yi1 = z01 + z11;
+		yr5 = z01 - z11; yi5 = z10 - z00;
+		yr3 = 0.7071067811865475f * (y10 + y11); yi3 = 0.7071067811865475f * (y11 - y10);
+		yr7 = 0.7071067811865475f * (y31 - y30); yi7 = -0.7071067811865475f * (y30 + y31);
+		z20 = x[ir0] - x[ir4]; z21 = x[ii0] - x[ii4];
+    z00 = x[ir0] + x[ir4]; z01 = x[ii0] + x[ii4];
+		z10 = x[ir6] + x[ir2]; z11 = x[ii6] + x[ii2];
+		z30 = x[ir6] - x[ir2]; z31 = x[ii6] - x[ii2];
+		yr0 = z00 + z10; yi0 = z01 + z11;
+		yr4 = z00 - z10; yi4 = z01 - z11;
+		yr2 = z20 - z31; yi2 = z21 + z30;
+		yr6 = z20 + z31; yi6 = z21 - z30;
+		y[or0] = yr0 + yr1; y[oi0] = yi0 + yi1;
+    if(step) {
+      FloatTwiddle<N,1>::twiddle(step,_y+o1,yr2 + yr3, yi2 + yi3);
+      int step2 = step + step;
+      FloatTwiddle<N,1>::twiddle(step2,_y+o2,yr4 + yr5, yi4 + yi5);
+      int step3 = step2 + step;
+      FloatTwiddle<N,1>::twiddle(step3,_y+o3,yr6 + yr7, yi6 + yi7);
+      FloatTwiddle<N,1>::twiddle(step2+step2,_y+o4,yr0 - yr1, yi0 - yi1);
+      FloatTwiddle<N,1>::twiddle(step3+step2,_y+o5,yr2 - yr3, yi2 - yi3);
+      FloatTwiddle<N,1>::twiddle(step3+step3,_y+o6,yr4 - yr5, yi4 - yi5);
+      FloatTwiddle<N,1>::twiddle(step3+step2+step2,_y+o7,yr6 - yr7, yi6 - yi7);
+    } else {
+      y[or1] = yr2 + yr3; y[oi1] = yi2 + yi3;
+      y[or2] = yr4 + yr5; y[oi2] = yi4 + yi5;
+      y[or3] = yr6 + yr7; y[oi3] = yi6 + yi7;
+      y[or4] = yr0 - yr1; y[oi4] = yi0 - yi1;
+      y[or5] = yr2 - yr3; y[oi5] = yi2 - yi3;
+      y[or6] = yr4 - yr5; y[oi6] = yi4 - yi5;
+      y[or7] = yr6 - yr7; y[oi7] = yi6 - yi7;
+    }
+  }
+};
+
+template<int istride, int ostride> 
+class __fft<istride,ostride,8,-1> {
+public:
+  enum { N = istride*8,
+         i0 = 0, o0 = 0,
+         i1 = i0 + istride, o1 = o0 + ostride,
+         i2 = i1 + istride, o2 = o1 + ostride,
+         i3 = i2 + istride, o3 = o2 + ostride,
+         i4 = i3 + istride, o4 = o3 + ostride,
+         i5 = i4 + istride, o5 = o4 + ostride,
+         i6 = i5 + istride, o6 = o5 + ostride,
+         i7 = i6 + istride, o7 = o6 + ostride,
+         ir0 = i0<<1, ii0 = ir0 + 1, or0 = o0<<1, oi0 = or0 + 1,
+         ir1 = i1<<1, ii1 = ir1 + 1, or1 = o1<<1, oi1 = or1 + 1,
+         ir2 = i2<<1, ii2 = ir2 + 1, or2 = o2<<1, oi2 = or2 + 1,
+         ir3 = i3<<1, ii3 = ir3 + 1, or3 = o3<<1, oi3 = or3 + 1,
+         ir4 = i4<<1, ii4 = ir4 + 1, or4 = o4<<1, oi4 = or4 + 1,
+         ir5 = i5<<1, ii5 = ir5 + 1, or5 = o5<<1, oi5 = or5 + 1,
+         ir6 = i6<<1, ii6 = ir6 + 1, or6 = o6<<1, oi6 = or6 + 1,
+         ir7 = i7<<1, ii7 = ir7 + 1, or7 = o7<<1, oi7 = or7 + 1 };
+  static inline void execute(t_fft *_x, t_fft *_y, int step) {
+    float *x = (float*)_x;
+    float *y = (float*)_y;
+		float z00, z01, z10, z11, z20, z21, z30, z31, y10, y11, y30, y31;
+    float yr0, yi0, yr1, yi1, yr2, yi2, yr3, yi3, yr4, yi4, yr5, yi5, yr6, yi6, yr7, yi7;
+		z00 = x[ir1] + x[ir5]; z01 = x[ii1] + x[ii5];
+		z10 = x[ir3] + x[ir7]; z11 = x[ii3] + x[ii7];
+		z20 = x[ir1] - x[ir5]; z21 = x[ii1] - x[ii5];
+		z30 = x[ir3] - x[ir7]; z31 = x[ii3] - x[ii7];
+		y10 = z20 - z31; y11 = z21 + z30;
+		y30 = z20 + z31; y31 = z21 - z30;
+		yr1 = z00 + z10; yi1 = z01 + z11;
+    yr5 = z11 - z01; yi5 = z00 - z10;
+		yr3 = 0.7071067811865475f * (y10 - y11); yi3 = 0.7071067811865475f * (y10 + y11);
+		yr7 = -0.7071067811865475f * (y30 + y31); yi7 = 0.7071067811865475f * (y30 - y31);
+		z00 = x[ir0] + x[ir4]; z01 = x[ii0] + x[ii4];
+		z10 = x[ir2] + x[ir6]; z11 = x[ii2] + x[ii6];
+		z20 = x[ir0] - x[ir4]; z21 = x[ii0] - x[ii4];
+		z30 = x[ir2] - x[ir6]; z31 = x[ii2] - x[ii6];
+		yr0 = z00 + z10; yi0 = z01 + z11;
+		yr4 = z00 - z10; yi4 = z01 - z11;
+		yr2 = z20 - z31; yi2 = z21 + z30;
+		yr6 = z20 + z31; yi6 = z21 - z30;
+		y[or0] = yr0 + yr1;
+		y[oi0] = yi0 + yi1;
+    if(step) {
+      FloatTwiddle<N,-1>::twiddle(step,_y+o1,yr2 + yr3, yi2 + yi3);
+      int step2 = step + step;
+      FloatTwiddle<N,-1>::twiddle(step2,_y+o2,yr4 + yr5, yi4 + yi5);
+      int step3 = step2 + step;
+      FloatTwiddle<N,-1>::twiddle(step3,_y+o3,yr6 + yr7, yi6 + yi7);
+      FloatTwiddle<N,-1>::twiddle(step2+step2,_y+o4,yr0 - yr1, yi0 - yi1);
+      FloatTwiddle<N,-1>::twiddle(step3+step2,_y+o5,yr2 - yr3, yi2 - yi3);
+      FloatTwiddle<N,-1>::twiddle(step3+step3,_y+o6,yr4 - yr5, yi4 - yi5);
+      FloatTwiddle<N,-1>::twiddle(step3+step2+step2,_y+o7,yr6 - yr7, yi6 - yi7);
+    } else {
+      y[or1] = yr2 + yr3; y[oi1] = yi2 + yi3;
+      y[or2] = yr4 + yr5; y[oi2] = yi4 + yi5;
+      y[or3] = yr6 + yr7; y[oi3] = yi6 + yi7;
+      y[or4] = yr0 - yr1; y[oi4] = yi0 - yi1;
+      y[or5] = yr2 - yr3; y[oi5] = yi2 - yi3;
+      y[or6] = yr4 - yr5; y[oi6] = yi4 - yi5;
+      y[or7] = yr6 - yr7; y[oi7] = yi6 - yi7;
+    }
+  }
+};
+
+#endif // ENABLE_SSE
+
+template<int k, int stride, int radix, int dir>
+class _fft {
+public:
+  enum { N = radix * stride,
+         _radix = Factor<stride>::value,
+         _stride = stride / _radix };
+  static inline void execute(t_fft *x) {
+    for(int step=0; step<stride; step++) {
+      __fft<stride,stride,radix,dir>::execute(x+step,x+step,step);
+    }
+    _fft<N,_stride,_radix,dir>::loop(x+N);
+  }
+  static inline void loop(t_fft *x) {
+    _fft<k-N,stride,radix,dir>::execute(x-N);
+    _fft<k-N,stride,radix,dir>::loop(x-N);
+  }
+};
+
+template<int stride, int radix, int dir>
+class _fft<0,stride,radix,dir> {
+public:
+  enum { N = radix * stride,
+         _radix = Factor<stride>::value,
+         _stride = stride / _radix };
+  static inline void execute(t_fft *x) {
+    for(int step=0; step<stride; step++) {
+      __fft<stride,stride,radix,dir>::execute(x+step,x+step,step);
+    }
+    _fft<N,_stride,_radix,dir>::loop(x+N);
+  }
+  static inline void loop(t_fft *x) { }
+};
+
+template <int k, int radix, int dir>
+class _fft<k,1,radix,dir> {
+public:
+  static inline void execute(t_fft *x) { }
+  static inline void loop(t_fft *x) { }
+};
+
+template <int radix, int dir>
+class _fft<0,1,radix,dir> {
+public:
+  static inline void execute(t_fft *x) { }
+  static inline void loop(t_fft *x) { }
+};
+
+template<int N>
+class fft_order_ {
+public:
+  static inline int iterate(int k) {
+    static const int N2 = Factor<N>::value;
+    static const int N1 = N/Factor<N>::value;
+    return (k%N2)*N1 + fft_order_<N1>::iterate(k/N2);
+  }
+};
+
+template<>
+class fft_order_<1> {
+public:
+  static inline int iterate(int k0) {
+    return 0;
+  }
+};
+
+template<int N>
+class fft_order {
+public:
+  fft_order<N>() {
+    for(int k=0;k<N;k++) {
+      int kr = fft_order_<N>::iterate(k);
+      order[kr] = k;
+    }
+  }
+  int order[N];
+};
+
+template<int N, int dir>
+class fft_reorder {
+public:
+  enum { radix = LastFactor<N>::value, 
+         ostride = N / radix,
+         s = N * sizeof(t_fft) };
+  static const fft_order<N> order;
+  static inline void reorder(t_fft *x) {
+    t_fft y[N];
+    int *o = (int*)order.order;
+    memcpy(y,x,s);
+    for(int r=0; r<N; r+=radix) {
+      __fft<1,ostride,radix,dir>::execute(y+r,x+o[r],0);
+    }
+  }
+};
+
+template<int N, int dir>
+const fft_order<N> fft_reorder<N,dir>::order;
+
+template<int N, int dir>
+void fft(t_fft *x) {
+  enum { radix = Factor<N>::value, 
+         stride = N / radix };
+  _fft<0,stride,radix,dir>::execute(x);
+  fft_reorder<N,dir>::reorder(x);
+}
 
 }
 
 #endif
-
diff --git a/lib-src/sbsms/src/grain.cpp b/lib-src/sbsms/src/grain.cpp
index cc2ca5ae9..900be72b0 100644
--- a/lib-src/sbsms/src/grain.cpp
+++ b/lib-src/sbsms/src/grain.cpp
@@ -11,136 +11,132 @@ using namespace std;
 
 namespace _sbsms_ {
 
-map<int, map<real, real*> > wwMap;
-map<int, map<real, audio*> > peakMap;
-
-map<int, fftplan*> fftPlanMap;
-map<int, fftplan*> ifftPlanMap;
-
-grain* grain :: create(int N,real pad)
+GrainAllocator :: GrainAllocator(int N, int N2, int type)
 {
-  grain *g = new grain(N,pad);
+  this->N = N;
+  this->N2 = N2;
+  this->type = type;
+
+  switch(N) {
+  case 128:
+    fftPlan = &fft128;
+    ifftPlan = &ifft128;
+    break;
+  case 256:
+    fftPlan = &fft256;
+    ifftPlan = &ifft256;
+    break;
+  case 384:
+    fftPlan = &fft384;
+    //ifftPlan = &ifft384;
+    break;
+  case 512:
+    fftPlan = &fft512;
+    //ifftPlan = &ifft512;
+    break;
+  default:
+    abort();
+    break;
+  }
+
+  int k1 = (N-N2)/2;
+
+  w = (float*)calloc(N,sizeof(float));
+  for(int k=0;k<N2;k++) {
+    if(type == hann) {
+      w[k+k1] = 0.5f*(1.0f - cos((float)k/(float)N2*TWOPI));
+    } else if(type == hannpoisson) {
+      w[k+k1] = 0.5f*(1.0f - cos((float)k/(float)N2*TWOPI)) * exp(-2.0f*fabs((float)(k-N2/2))/(float)N2);
+    }
+  }
+
+  W = (audio*) calloc(N,sizeof(audio));
+  for(int k=0;k<N;k++) {
+    W[k][0] = w[k] * 2.638502561913447f/(float)N2;
+  }
+
+  fftPlan(W);
+}
+
+GrainAllocator :: ~GrainAllocator()
+{
+  free(w);
+  free(W);
+}
+
+grain* GrainAllocator :: create()
+{
+  grain *g = new grain(N,N2);
+  g->refCount = 0;
+  g->fftPlan = fftPlan;
+  g->ifftPlan = ifftPlan;
+  g->w = w;
   return g;
 }
 
-void grain :: referenced(grain *g)
+void GrainAllocator :: reference(grain *g)
 {
   g->refCount++;
 }
 
-void grain :: forget(grain *g)
+void GrainAllocator :: forget(grain *g)
 {
   g->refCount--;
   if(g->refCount <= 0) {
-    destroy(g);
+    delete g;
   }
 }
 
-void grain :: destroy(grain *g)
+grain :: grain(int N, int N2)
 {
-  free_audio_buf(g->x);
-  delete g;
-}
-
-grain :: grain(int N, real pad)
-{ 
   this->N = N;
-  this->pad = pad;
-  calc_plans();
-  calc_windows();
-  refCount = 0;
-  x = (audio*) malloc(N*sizeof(audio));
+  this->synthScale = 1.0f / (float)N2;
+  x = (audio*) calloc(N,sizeof(audio));
 }
 
-void grain :: analyze() 
+grain :: ~grain()
 {
-  for(int k=0;k<N;k++) {
-    for(int c=0;c<2;c++) {
-      x[k][c] *= ww[k];
-    }
+  free(x);
+}
+
+void grain :: analyze()
+{
+  float *x = (float*)this->x;
+  float *end = x + (N<<1);
+  float *w = this->w;
+  while(x != end) {
+    *(x++) *= *w;
+    *(x++) *= *(w++);
   }
-  FFT(fftPlan,x);
+
+  fftPlan(this->x);
 }
 
 void grain :: synthesize() 
 {
-  IFFT(ifftPlan,x);
-  real f = pad/(real)N;
+  ifftPlan(x);
   for(int k=0;k<N;k++) {
     for(int c=0;c<2;c++) {
-      x[k][c] *= ww[k] * f;
+      x[k][c] *= w[k] * synthScale;
     }
   }
 }
 
-void grain :: calc_plans()
+void grain :: downsample(grain *g2)
 {
-  fftPlan = fftPlanMap[N];
-  if(fftPlan == NULL) {
-    fftPlanMap[N] = (fftPlan = planFFT(N)); 
-  }
-     
-  ifftPlan = ifftPlanMap[N];
-  if(ifftPlan == NULL) {
-    ifftPlanMap[N] = (ifftPlan = planIFFT(N)); 
-  }
-}
- 
-void grain :: calc_windows() 
-{  
-  int N2 = round2int(N/pad);
-  ww = wwMap[N][pad];
-  if(ww == NULL) {
-    wwMap[N][pad] = (ww = (real*)calloc(N,sizeof(real)));   
-    for(int k=0;k<N2;k++) {
-      ww[k+(N-N2)/2] = 0.5f*(1.0f - cos((real)k/(real)N2*TWOPI));
-    }
-  }
-
-  peak = peakMap[N][pad];
-  if(peak == NULL) {
-    peakMap[N][pad] = (peak = (audio*) calloc(N,sizeof(audio)));
-    for(int k=0;k<N;k++) {
-      peak[k][0] = ww[k]/(real)(N2/2);
-    }
-    FFT(fftPlan,peak);
-  }
-}
-
-grain* grain :: upsample()
-{
-  grain *g2 = grain::create(2*N,pad);
   grain *g = this;
 
+  int N2 = N/2;
+  int N4 = N/4;
   for(int c=0;c<2;c++) {
-    for(int k=0;k<=N/2;k++)
-      g2->x[k][c] = g->x[k][c];
-
-    for(int k=N/2+1;k<=N/2+N;k++)
-      g2->x[k][c] = 0;
-
-    for(int k=N/2+N+1;k<2*N;k++)
-      g2->x[k][c] = g->x[k-N][c];
+    for(int k=0;k<N4;k++) {
+      g2->x[k][c] = 0.5f * g->x[k][c];
+    }
+    g2->x[N4][c] = 0.25f * (g->x[N4][c] + g->x[N-N4][c]);
+    for(int k=N4+1;k<N2;k++) {
+      g2->x[k][c] = 0.5f * g->x[k+N2][c];
+    }
   }
-  return g2;
-}
-
-grain* grain :: downsample()
-{
-  grain *g2 = grain::create(N/2,pad);
-  grain *g = this;
-
-  for(int c=0;c<2;c++) {
-    for(int k=0;k<=N/4-1;k++)
-      g2->x[k][c] = g->x[k][c];
-    
-    g2->x[N/4][c] = 0.5f*(g->x[N/4][c] + g->x[N-N/4][c] );
-    
-    for(int k=N/4+1;k<N/2;k++)
-      g2->x[k][c] = g->x[k+N/2][c];
-  }
-
-  return g2;
 }
 
 }
diff --git a/lib-src/sbsms/src/grain.h b/lib-src/sbsms/src/grain.h
index 1d567a0ae..e6cea581b 100644
--- a/lib-src/sbsms/src/grain.h
+++ b/lib-src/sbsms/src/grain.h
@@ -1,37 +1,54 @@
+// -*- mode: c++ -*-
 #ifndef GRAIN_H
 #define GRAIN_H
 
 #include "fft.h"
-#include "audio.h"
 #include "sbsms.h"
 
 namespace _sbsms_ {
 
+enum windowType {
+  hann,
+  hannpoisson
+};
+
+class GrainAllocator;
+
 class grain {
  public:
-  static grain* create(int N, real pad);
-  static void destroy(grain *g);
-  static void referenced(grain *g);
-  static void forget(grain *g);
-
-  t_fft *x;
-  int N;
-  int h;
-  real pad;
-  int refCount;
-  audio *peak;
- 
+  ~grain();
   void analyze();
   void synthesize();
-  grain* upsample();
-  grain* downsample();
-  
+  void downsample(grain *gdown);
+  audio *x;
+  friend class GrainAllocator;
  protected:
-  grain(int N,real pad);
-  void calc_plans();
-  void calc_windows();
-  real *ww;
-  fftplan *fftPlan, *ifftPlan;
+  grain(int N, int N2);
+  float *w;
+  int N;
+  float synthScale;
+  int refCount;
+  fftplan fftPlan;
+  fftplan ifftPlan;
+};
+
+class GrainAllocator {
+public:
+  GrainAllocator(int N, int N2, int type);
+  ~GrainAllocator();
+  grain *create();
+  void reference(grain *g);
+  void forget(grain *g);
+  friend class grain;
+  friend class GrainBuf;
+protected:
+  int N;
+  int N2;
+  int type;
+  float *w;
+  audio *W;
+  fftplan fftPlan;
+  fftplan ifftPlan;
 };
 
 }
diff --git a/lib-src/sbsms/src/real.h b/lib-src/sbsms/src/real.h
index c121b0323..194c6a831 100644
--- a/lib-src/sbsms/src/real.h
+++ b/lib-src/sbsms/src/real.h
@@ -1,3 +1,4 @@
+// -*- mode: c++ -*-
 /*
 ** Copyright (C) 2001-2003 Erik de Castro Lopo <erikd@mega-nerd.com>
 **
@@ -203,10 +204,4 @@
 
 #endif
 
-#ifdef SBSMS_REAL_FLOAT
-#define round2int(x) lrintf(x)
-#else
-#define round2int(x) lrint(x)
-#endif
-
 #endif
diff --git a/lib-src/sbsms/src/resample.cpp b/lib-src/sbsms/src/resample.cpp
index 32af63904..51ea56f96 100644
--- a/lib-src/sbsms/src/resample.cpp
+++ b/lib-src/sbsms/src/resample.cpp
@@ -6,225 +6,244 @@
 #include "real.h"
 #include "utils.h"
 #include <algorithm>
+#include "buffer.h"
 using namespace std;
 
 namespace _sbsms_ {
 
-#define SBSMS_RESAMPLE_CHUNK_SIZE 8192L
+enum { resampleChunkSize = 8192 };
+  
+class ResamplerImp {
+ public:
+  ResamplerImp(SBSMSResampleCB func, void *data, SlideType slideType = SlideConstant);
+  ~ResamplerImp();
+  inline long read(audio *audioOut, long frames);
+  inline void writingComplete();
+  inline void reset();
+  inline void init();
+  inline long samplesInOutput();
+ protected:
+  SBSMSFrame frame;
+  SampleCountType startAbs;
+  SampleCountType midAbs;
+  float midAbsf;
+  SampleCountType endAbs;
+  SampleCountType writePosAbs;
+  bool bInput;
+  SampleBuf *out;
+  SBSMSResampleCB cb;
+  void *data;
+  long inOffset;
+  SlideType slideType;
+  Slide *slide;
+  bool bWritingComplete;
+};
 
-Resampler :: Resampler(sbsms_resample_cb cb, void *data)
+Resampler :: Resampler(SBSMSResampleCB cb, void *data, SlideType slideType)
+{
+  imp = new ResamplerImp(cb,data,slideType);
+}
+
+ResamplerImp :: ResamplerImp(SBSMSResampleCB cb, void *data, SlideType slideType)
 {
   init();
   this->cb = cb;
   this->data = data;
-  bPull = true;
   bInput = true;
+  this->slideType = slideType;
   frame.size = 0;
 }
 
-Resampler :: Resampler(SampleBuf *in, real ratio)
-{
-  init();
-  bPull = false;
-  this->in = in;
-  bInput = true;
-  frame.ratio0 = ratio;
-  frame.ratio1 = ratio;
-}
-
-void Resampler :: init()
+void ResamplerImp :: init()
 {
   inOffset = 0;
   startAbs = 0;
   midAbs = 0;
   endAbs = 0;
   writePosAbs = 0;
-  midAbsf = 0.0;
+  midAbsf = 0.0f;
   out = new SampleBuf(0);
+  slide = NULL;
   bWritingComplete = false;
-  sincZeros = SBSMS_SINC_SAMPLES;
 }
 
-void Resampler :: reset()
+void Resampler :: reset() {  imp->reset(); }
+void ResamplerImp :: reset()
 {
+  if(slide) delete slide;
   delete out;
   init();
   frame.size = 0;
   bInput = true;
 }
 
-long Resampler :: read(audio *audioOut, long samples)
+Resampler :: ~Resampler() { delete imp; }
+ResamplerImp :: ~ResamplerImp()
 {
-  if(!bPull) {
-    frame.in = in->getReadBuf();
-    frame.size = in->n_readable();
-    if(frame.size) bInput = true;
-  }
+  if(slide) delete slide;
+  delete out;
+}
 
-  long nRead = out->n_readable();
+void updateSlide(Slide *slide, float *f, float *scale, int *maxDist, float *ratio)
+{
+  float stretch = slide->getStretch();
+  slide->step();
+  if(stretch <= 1.0f) {
+    *f = resampleSincRes;
+    *scale = stretch;
+    *maxDist = lrintf(resampleSincSamples);
+  } else {
+    *f = resampleSincRes / stretch;
+    *scale = 1.0f;
+    *maxDist = lrintf(resampleSincSamples * stretch);
+  }
+  *ratio = stretch;
+}
+
+long Resampler :: read(audio *audioOut, long samples) { return imp->read(audioOut,samples); }
+long ResamplerImp :: read(audio *audioOut, long samples)
+{  
+  long nRead = out->nReadable();
   while(nRead < samples && bInput) {
     if(bInput && inOffset == frame.size) {
-      if(!bPull) {
-	in->advance(frame.size);
-	bInput = false;
+      cb(data,&frame);
+      if(frame.size) {
+        if(slide) delete slide;
+        slide = new Slide(slideType,1.0f/frame.ratio0,1.0f/frame.ratio1,frame.size);
       } else {
-	cb(data,&frame);
-	if(!frame.size) 
-	  bWritingComplete = true;
+        bWritingComplete = true;
       }
       if(bWritingComplete) {
-	bInput = false;
-	out->grow(midAbs - writePosAbs);
-	out->writePos += midAbs - writePosAbs;
-	out->delay = 0;
+        bInput = false;
+        long n = (long)(midAbs - writePosAbs);
+        out->grow(n);
+        out->writePos += n;
       }
       inOffset = 0;
     }
     if(frame.size) {
-      real dratio = 1.0f/(real)frame.size*(frame.ratio1-frame.ratio0);
-
-      real ratio = frame.ratio0 + (real)inOffset*dratio;
-      real ratiorec = ratio<1.0f?1.0f:1.0f/ratio;
-      real f = ratiorec*SBSMS_SINC_RES;
-      int fi = round2int(f-0.5f);
-      real ff = f - fi;
-      if(ff<0.0f) {
-	ff += 1.0f;
-	fi--;
-      }
-      real scale = ratio<1.0f?ratio:1.0f;
-      int maxDist = round2int(sincZeros*ratio-0.5f);
-      // absolute start position
-      startAbs = max((long)0,midAbs-maxDist);
-      // samples to advance
-      long advance = max((long)0,startAbs - maxDist - writePosAbs);
-      writePosAbs += advance;
-      // absolute end position
-      endAbs = midAbs + maxDist;
-      // starting position in output
-      int start = startAbs - writePosAbs;
-      assert(start>=0);
-      // zero point in output
-      int mid = midAbs - writePosAbs;
-      // ending position in output
-      int end = endAbs - writePosAbs;
-      // provide extra delay for variable rate ratio
-      out->delay = maxDist<<1;
-      out->writePos += advance;
-
-      if(fabs(ratio-1.0f) < 1e-6f && fabs(dratio) < 1e-8f ) {
-	// how far ahead to write
-	int nAhead = mid+frame.size;
-	out->N = nAhead;
-	out->grow(nAhead);
-	long nWrite = min(SBSMS_RESAMPLE_CHUNK_SIZE,frame.size-inOffset);
-	for(int j=0;j<nWrite;j++) {
-	  out->buf[out->writePos+mid+j][0] += frame.in[j+inOffset][0];
-	  out->buf[out->writePos+mid+j][1] += frame.in[j+inOffset][1];
-	}
-	inOffset += nWrite;
-	midAbsf += ratio*nWrite;
-	int nWritten = round2int(midAbsf);
-	midAbsf -= nWritten;
-	midAbs += nWritten;
+      if(slideType == SlideIdentity) {
+        out->write(frame.buf,frame.size);
+        inOffset = frame.size;
       } else {
-	long nWrite = min(SBSMS_RESAMPLE_CHUNK_SIZE,frame.size-inOffset);
-	audio *i = &(frame.in[inOffset]);
-	for(int j=0;j<nWrite;j++) {
-	  // how far ahead to write
-	  int nAhead = end;
-	  out->N = nAhead;
-	  out->grow(nAhead);
-	  audio *o = &(out->buf[out->writePos+start]);
-	  real d = (start-mid-midAbsf)*f;
-	  int di = round2int(d-0.5f);
-	  real df = d-di;
-	  if(df<0.0f) {
-	    df += 1.0f;
-	    di--;
-	  }
-	  real i0 = (*i)[0];
-	  real i1 = (*i)[1];
-	  for(int k=start;k<end;k++) {
-	    int k0 = (di<0)?-di:di; 
-	    int k1 = (di<0)?k0-1:k0+1;
-	    real sinc;
-	    if(k1>=SBSMS_SINC_SIZE) {
-	      if(k0>=SBSMS_SINC_SIZE) {
-		sinc = 0.0f;
-	      } else {
-		sinc = scale*sincTable[k0];
-	      }
-	    } else if(k0>=SBSMS_SINC_SIZE) {
-	      sinc = scale*sincTable[k1];
-	    } else {
-	      sinc = scale*((1.0f-df)*sincTable[k0] + df*sincTable[k1]);
-	    }
-	    (*o)[0] += i0 * sinc;
-	    (*o)[1] += i1 * sinc;
-	    di += fi;
-	    df += ff;
-	    if(!(df<1.0f)) {
-	      df -= 1.0f;
-	      di++;
-	    }
-	    o++;
-	  }
-	  i++;
-	  midAbsf += ratio;
-	
-	  if(dratio != 0.0f) {
-	    ratio += dratio;
-	    ratiorec = ratio<1.0f?1.0f:1.0f/ratio;
-	    f = ratiorec*SBSMS_SINC_RES;
-	    fi = round2int(f-0.5f);
-	    ff = f - fi;
-	    if(ff<0.0f) {
-	      ff += 1.0f;
-	      fi--;
-	    }
-	    scale = ratio<1.0f?ratio:1.0f;
-	    maxDist = round2int(sincZeros*ratio-0.5f);
-	  }
-
-	  int nWritten = round2int(midAbsf);
-	  midAbsf -= nWritten;
-	  midAbs += nWritten;
-	  startAbs = max((long)0,midAbs-maxDist);
-	  endAbs = midAbs + maxDist;
-	  start = startAbs - writePosAbs;
-	  mid = midAbs - writePosAbs;
-	  end = endAbs - writePosAbs;
-	}
-	inOffset += nWrite;
+        bool bNoSinc = false;
+        if(fabs(frame.ratio0-1.0f) < 1e-6f && 
+           fabs((float)(frame.ratio1 - frame.ratio0)/(float)frame.size) < 1e-9f) {
+          bNoSinc = true;
+        }
+        float f;
+        float scale;
+        int maxDist;
+        float ratio;
+        updateSlide(slide,&f,&scale,&maxDist,&ratio);
+        int fi = lrintf(f);
+        float ff = f - fi;
+        if(ff<0.0f) {
+          ff += 1.0f;
+          fi--;
+        }
+        startAbs = max((SampleCountType)0,midAbs-maxDist);
+        long advance = max(0L,(long)(startAbs - maxDist - writePosAbs));
+        writePosAbs += advance;
+        endAbs = midAbs + maxDist;
+        long start = (long)(startAbs - writePosAbs);
+        long mid = (long)(midAbs - writePosAbs);
+        long end = (long)(endAbs - writePosAbs);
+        out->writePos += advance;
+        if(bNoSinc) {
+          int nAhead = mid+frame.size;
+          out->N = nAhead;
+          out->grow(nAhead);
+          long nWrite = min((long)resampleChunkSize,frame.size-inOffset);
+          for(int j=0;j<nWrite;j++) {
+            out->buf[out->writePos+mid+j][0] += frame.buf[j+inOffset][0];
+            out->buf[out->writePos+mid+j][1] += frame.buf[j+inOffset][1];
+          }
+          inOffset += nWrite;
+          midAbsf += nWrite;
+          int nWritten = lrintf(midAbsf);
+          midAbsf -= nWritten;
+          midAbs += nWritten;
+        } else {
+          long nWrite = min((long)resampleChunkSize,frame.size-inOffset);
+          audio *i = &(frame.buf[inOffset]);
+          for(int j=0;j<nWrite;j++) {
+            int nAhead = end;
+            out->N = nAhead;
+            out->grow(nAhead);
+            audio *o = &(out->buf[out->writePos+start]);
+            float d = (start-mid-midAbsf)*f;
+            int di = lrintf(d);
+            float df = d-di;
+            if(df<0.0f) {
+              df += 1.0f;
+              di--;
+            }
+            float i0 = (*i)[0];
+            float i1 = (*i)[1];
+            for(int k=start;k<end;k++) {
+              int k0 = (di<0)?-di:di; 
+              int k1 = (di<0)?k0-1:k0+1;
+              float sinc;
+              if(k1>=resampleSincSize) {
+                if(k0>=resampleSincSize) {
+                  sinc = 0.0f;
+                } else {
+                  sinc = scale*sincTable[k0];
+                }
+              } else if(k0>=resampleSincSize) {
+                sinc = scale*sincTable[k1];
+              } else {
+                sinc = scale*((1.0f-df)*sincTable[k0] + df*sincTable[k1]);
+              }
+              (*o)[0] += i0 * sinc;
+              (*o)[1] += i1 * sinc;
+              di += fi;
+              df += ff;
+              if(!(df<1.0f)) {
+                df -= 1.0f;
+                di++;
+              }
+              o++;
+            }
+            i++;
+            updateSlide(slide,&f,&scale,&maxDist,&ratio);
+            fi = lrintf(f);
+            ff = f - fi;
+            if(ff<0.0f) {
+              ff += 1.0f;
+              fi--;
+            }
+            midAbsf += ratio;          
+            int nWritten = lrintf(midAbsf);
+            midAbsf -= nWritten;
+            midAbs += nWritten;
+            startAbs = max((SampleCountType)0,midAbs-maxDist);
+            endAbs = midAbs + maxDist;
+            start = (long)(startAbs - writePosAbs);
+            mid = (long)(midAbs - writePosAbs);
+            end = (long)(endAbs - writePosAbs);
+          }
+          inOffset += nWrite;
+        }
       }
+      nRead = out->nReadable();
     }
-    nRead = out->n_readable();
   }
-
-  nRead = min(samples,out->n_readable());
-  if(nRead) {
-    out->read(audioOut,nRead);
-    out->advance(nRead);
-  }
-
-  return nRead;
+  out->read(audioOut,samples);
+  return samples;
 }
 
-long Resampler :: samplesInOutput()
+long Resampler :: samplesInOutput() { return imp->samplesInOutput(); }
+long ResamplerImp :: samplesInOutput()
 {
-  long samplesFromBuffer = round2int(0.5f*(frame.ratio0+frame.ratio1)*(frame.size-inOffset));
-  return out->writePos + midAbs - writePosAbs - out->readPos + samplesFromBuffer;
+  long samplesFromBuffer = lrintf(0.5f*(frame.ratio0+frame.ratio1)*(frame.size-inOffset));
+  return (long)(out->writePos + (midAbs - writePosAbs) - out->readPos + samplesFromBuffer);
 }
 
-void Resampler :: writingComplete()
+void ResamplerImp :: writingComplete()
 {
   bWritingComplete = true;
 }
 
-Resampler :: ~Resampler()
-{
-  delete out;
-}
-
 }
diff --git a/lib-src/sbsms/src/sbsms.cpp b/lib-src/sbsms/src/sbsms.cpp
index 7b3f0e5c8..6a8cf0632 100644
--- a/lib-src/sbsms/src/sbsms.cpp
+++ b/lib-src/sbsms/src/sbsms.cpp
@@ -1,147 +1,190 @@
+#include "config.h"
 #include "sbsms.h"
 #include "real.h"
 #include "subband.h"
-#include "track.h"
-#include "utils.h"
-#include <stdlib.h>
-#include <string.h>
-#include "config.h"
 #ifdef MULTITHREADED
-#ifdef _WIN32
-#include <windows.h>
-#include <winbase.h>
-#else
-#include <unistd.h>
-#endif
 #include <pthread.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+using namespace std;
 
 namespace _sbsms_ {
 
-const sbsms_quality sbsms_quality_standard = {
-  512,6400,0.08f,12.5f,7,64,
-  {6,8,8,8,12},
-  {384,384,576,480,384,288,336,NULL},
-  {4,4,4,4,4,4,4,NULL},
-  {1,1,2,2,1,2,1,NULL},
-  {2.00f,2.00f,4.00f,4.00f,4.00f,4.00f,6.00f,NULL},
-  {2.00f,2.00f,2.00f,2.00f,2.00f,2.00f,2.00f,NULL},
-  {0.75f,0.75f,0.75f,0.75f,0.75f,0.75f,0.75f,NULL}
+const SBSMSQualityParams SBSMSQualityStandard = {
+  8,3,
+  {512,512,384,384,384,384,384,384,0,0},
+  {168,144,128,96,64,36,24,14,0,0},
+  {384,288,256,168,128,84,52,28,0,0},
+  {512,448,360,288,192,128,84,44,0,0},
+  {1,1,2,1,1,2,1,1,0,0}
 };
 
-const sbsms_quality sbsms_quality_fast = {
-  512,6400,0.08f,12.5f,7,64,
-  {6,8,8,8,12},
-  {192,192,288,240,192,144,168,NULL},
-  {4,4,4,4,4,4,4,NULL},
-  {1,1,2,2,1,2,1,NULL},
-  {2.00f,2.00f,2.00f,2.00f,2.00f,2.00f,3.00f,NULL},
-  {2.00f,2.00f,2.00f,2.00f,2.00f,2.00f,2.00f,NULL},
-  {0.50f,0.50f,0.75f,0.75f,0.75f,0.75f,0.75f,NULL}
+
+SBSMSQuality :: SBSMSQuality(const SBSMSQualityParams *params)
+{
+  this->params = *params;
+}
+
+long SBSMSQuality :: getFrameSize()
+{
+  return (1<<(params.bands-1)) * params.H;
+}
+
+long SBSMSQuality :: getMaxPresamples()
+{
+  long prepad = 0;
+  for(int i=0; i<params.bands; i++) {
+    prepad = max(prepad,(long)((1<<i) * (params.N2[i]>>1)));
+  }
+  prepad += ((1<<(params.bands-1)) - 1) * (NDownSample>>1);
+  long framesize = (1<<(params.bands-1)) * params.H;
+  long frames = prepad / framesize;
+  if(prepad%framesize) frames++;
+  frames++;
+  prepad = frames * framesize;
+  return prepad;
+}
+
+#ifdef MULTITHREADED
+class ThreadInterface;
+#endif
+
+class SBSMSImp {
+public:
+  SBSMSImp(int channels, SBSMSQuality *quality, bool bSynthesize);
+  ~SBSMSImp();
+  inline long read(SBSMSInterface *iface, audio *buf, long n);
+  inline void addRenderer(SBSMSRenderer *renderer);
+  inline void removeRenderer(SBSMSRenderer *renderer);
+  inline long renderFrame(SBSMSInterface *iface);
+  SubBand *top;  
+#ifdef MULTITHREADED
+  friend class ThreadInterface;
+  ThreadInterface *threadInterface;
+#endif
+  friend class SBSMS;
+protected:
+  inline void reset();
+  float getInputTime(SBSMSInterface *iface);
+  long write(SBSMSInterface *);
+  FILE *fpIn;  
+  FILE *fpOut;
+  SBSMSError error;
+  long nPrepad;
+  long nPrepadDone;
+  long nPresamplesDone;
+  SampleCountType nSamplesInputed;
+  SampleCountType nSamplesOutputed;
+  int channels;
+  SBSMSQuality *quality;
+  audio *ina;
 };
 
 #ifdef MULTITHREADED
 
-struct assign_data {
-  sbsms *sbsmser;
+struct channel_thread_data {
   int c;
-  bool bFirst;
-  bool bLast;
+  ThreadInterface *threadInterface;
 };
 
-struct thread_data {
-  pthread_mutex_t writeMutex;
-  pthread_cond_t writeCond;
-
-  pthread_t addThread;
-  pthread_mutex_t addMutex;
-  pthread_cond_t addCond;
-  bool bAddThread;
+struct analyze_thread_data {
+  int i;
+  ThreadInterface *threadInterface;
+};
 
+class ThreadInterface {
+public:
+  friend class SBSMSImp;
+  ThreadInterface(SBSMSImp *sbsms, bool bSynthesize);  
+  ~ThreadInterface();
+  void signalReadWrite();
+  void signalAnalyze();
+  void signalExtract(int c);
+  void signalMark(int c);
+  void signalAssign(int c);
+  void signalTrial2(int c);
+  void signalAdjust2();
+  void signalTrial1(int c);
+  void signalAdjust1();
+  void signalRender(int c);
+  void waitReadWrite();
+  void waitAnalyze(int i);
+  void waitExtract(int c);
+  void waitAssign(int c);
+  void waitTrial2(int c);
+  void waitAdjust2();
+  void waitTrial1(int c);
+  void waitAdjust1();
+  void waitRender(int c);
+  SubBand *top;
+  int channels;
+  pthread_mutex_t readWriteMutex;
+  pthread_cond_t readWriteCond;
+  pthread_t analyzeThread[3];
+  pthread_mutex_t analyzeMutex[3];
+  pthread_cond_t analyzeCond[3];
+  pthread_t extractThread[2];
+  pthread_mutex_t extractMutex[2];
+  pthread_cond_t extractCond[2];
   pthread_t assignThread[2];
-  pthread_mutex_t assignMutex;
-  pthread_cond_t assignCond;
-  bool bAssignThread;
-  assign_data assignData[2];
-
-  pthread_t synthThread;
-  pthread_mutex_t synthMutex;
-  pthread_cond_t synthCond;
-  bool bSynthThread;
-
-  // hack to break out of possible (but very rare) deadlocks caused by checking 
-  // condition predicates after broadcasting conditions
-  pthread_t pollThread;
-  
+  pthread_mutex_t assignMutex[2];
+  pthread_cond_t assignCond[2];
+  pthread_t trial2Thread[2];
+  pthread_mutex_t trial2Mutex[2];
+  pthread_cond_t trial2Cond[2];
+  pthread_t adjust2Thread;
+  pthread_mutex_t adjust2Mutex;
+  pthread_cond_t adjust2Cond;
+  pthread_t trial1Thread[2];
+  pthread_mutex_t trial1Mutex[2];
+  pthread_cond_t trial1Cond[2];
+  pthread_t adjust1Thread;
+  pthread_mutex_t adjust1Mutex;
+  pthread_cond_t adjust1Cond;
+  bool bRenderThread;
+  pthread_t renderThread[2];
+  pthread_mutex_t renderMutex[2];
+  pthread_cond_t renderCond[2];
+  channel_thread_data channelData[2];
+  analyze_thread_data analyzeData[3];
   bool bActive;
 };
 
-void *pollThreadCB(void *data) {
-  sbsms *sbsmser = (sbsms*)data;
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-  subband *top = sbsmser->top;
-  
-  while(threadData->bActive) {
-    if(top->isWriteReady()) {
-      pthread_mutex_lock(&threadData->writeMutex);
-      pthread_cond_broadcast(&threadData->writeCond);    
-      pthread_mutex_unlock(&threadData->writeMutex);
-    }
-    if(top->isAddReady()) {
-      pthread_mutex_lock(&threadData->addMutex);
-      pthread_cond_broadcast(&threadData->addCond);
-      pthread_mutex_unlock(&threadData->addMutex);
-    } 
-    if(top->isMarkReady()) {
-      pthread_mutex_lock(&threadData->assignMutex);
-      pthread_cond_broadcast(&threadData->assignCond);
-      pthread_mutex_unlock(&threadData->assignMutex);
-    }
-    if(top->isSynthReady()) {
-      if(threadData->bSynthThread) {
-	pthread_mutex_lock(&threadData->synthMutex);
-	pthread_cond_broadcast(&threadData->synthCond);
-	pthread_mutex_unlock(&threadData->synthMutex);
+void *analyzeThreadCB(void *data) {
+  analyze_thread_data *analyzeData = (analyze_thread_data*)data;
+  ThreadInterface *threadInterface = analyzeData->threadInterface;
+  SubBand *top = threadInterface->top;
+  int i = analyzeData->i;
+  int channels = threadInterface->channels;
+  while(threadInterface->bActive) {
+    threadInterface->waitAnalyze(i);
+    if(top->analyzeInit(i,true)) {
+      top->analyze(i);
+      top->stepAnalyzeFrame(i);
+      threadInterface->signalReadWrite();
+      for(int c=0; c<channels; c++) {
+        threadInterface->signalExtract(c);
       }
-      pthread_mutex_lock(&threadData->writeMutex);
-      pthread_cond_broadcast(&threadData->writeCond);
-      pthread_mutex_unlock(&threadData->writeMutex);
     }
-#ifdef _WIN32
-    Sleep(100);
-#else
-    usleep(100000);
-#endif
   }
-  
   pthread_exit(NULL);
   return NULL;
 }
 
-void *addThreadCB(void *data) {
-  sbsms *sbsmser = (sbsms*)data;
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-  subband *top = sbsmser->top;
-
-  while(threadData->bActive) {
-    if(!top->isAddReady()) {
-      pthread_mutex_lock(&threadData->addMutex);
-      pthread_cond_wait(&threadData->addCond,&threadData->addMutex);
-      pthread_mutex_unlock(&threadData->addMutex);
-    }
-    while(top->addInit(true)) {
-      top->addTrackPoints();
-      top->stepAddFrame();
-      if(top->isMarkReady()) {
-	pthread_mutex_lock(&threadData->assignMutex);
-	pthread_cond_broadcast(&threadData->assignCond);
-	pthread_mutex_unlock(&threadData->assignMutex);
-      }
-      if(top->isWriteReady()) {
-	pthread_mutex_lock(&threadData->writeMutex);
-	pthread_cond_broadcast(&threadData->writeCond);
-	pthread_mutex_unlock(&threadData->writeMutex);
-      }
+void *extractThreadCB(void *data) {
+  channel_thread_data *channelData = (channel_thread_data*)data;
+  ThreadInterface *threadInterface = channelData->threadInterface;
+  SubBand *top = threadInterface->top;
+  int c = channelData->c;
+  while(threadInterface->bActive) {
+    threadInterface->waitExtract(c);
+    if(top->extractInit(c,true)) {
+      top->extract(c);
+      top->stepExtractFrame(c);
+      threadInterface->signalAnalyze();
+      threadInterface->signalMark(c);        
     }
   }
   pthread_exit(NULL);
@@ -149,67 +192,60 @@ void *addThreadCB(void *data) {
 }
 
 void *assignThreadCB(void *data) {
-  assign_data *assignData = (assign_data*)data;
-  sbsms *sbsmser = assignData->sbsmser;
-  int c = assignData->c;
-  bool bFirst = assignData->bFirst;
-  bool bLast = assignData->bLast;
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-  subband *top = sbsmser->top;
-
-  while(threadData->bActive) {
-    if(!top->markInit(false,c)) {
-      pthread_mutex_lock(&threadData->assignMutex);
-      pthread_cond_wait(&threadData->assignCond,&threadData->assignMutex);
-      pthread_mutex_unlock(&threadData->assignMutex);
-    }
-    while(top->markInit(true,c)) {
-      top->markDuplicates(c);
+  channel_thread_data *channelData = (channel_thread_data*)data;
+  ThreadInterface *threadInterface = channelData->threadInterface;
+  SubBand *top = threadInterface->top;
+  int c = channelData->c;
+  while(threadInterface->bActive) {
+    threadInterface->waitAssign(c);
+    if(top->markInit(c,true)) {
+      top->mark(c);
       top->stepMarkFrame(c);      
-      if(top->isAddReady()) {
-	pthread_mutex_lock(&threadData->addMutex);
-	pthread_cond_broadcast(&threadData->addCond);
-	pthread_mutex_unlock(&threadData->addMutex);
-      }
-    }      
-    while(top->assignInit(true,c)) {
-      top->assignTrackPoints(c);
-      top->advanceTrackPoints(c);
+      threadInterface->signalExtract(c);
+    }
+    if(top->assignInit(c,true)) {
+      top->assign(c);
+      top->advance(c);
       top->stepAssignFrame(c);
-      if(top->isSynthReady()) {
-	if(threadData->bSynthThread) {
-	  pthread_mutex_lock(&threadData->synthMutex);
-	  pthread_cond_broadcast(&threadData->synthCond);
-	  pthread_mutex_unlock(&threadData->synthMutex);
-	}
-	pthread_mutex_lock(&threadData->writeMutex);
-	pthread_cond_broadcast(&threadData->writeCond);
-	pthread_mutex_unlock(&threadData->writeMutex);
-      }
-    }	
+      threadInterface->signalTrial2(c);
+    }
   }
   pthread_exit(NULL);
   return NULL;
 }
 
-void *synthThreadCB(void *data) {
-  sbsms *sbsmser = (sbsms*)data;
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-  subband *top = sbsmser->top;
-
-  while(threadData->bActive) {
-    if(!top->isSynthReady()) {
-      pthread_mutex_lock(&threadData->synthMutex);
-      pthread_cond_wait(&threadData->synthCond,&threadData->synthMutex);
-      pthread_mutex_unlock(&threadData->synthMutex);
+void *trial2ThreadCB(void *data) {
+  channel_thread_data *channelData = (channel_thread_data*)data;
+  ThreadInterface *threadInterface = channelData->threadInterface;
+  SubBand *top = threadInterface->top;
+  int c = channelData->c;
+  while(threadInterface->bActive) {
+    threadInterface->waitTrial2(c);
+    if(top->trial2Init(c,true)) {
+      top->trial2(c);
+      top->stepTrial2Frame(c);
+      threadInterface->signalAssign(c);
+      threadInterface->signalAdjust2();
     }
-    while(top->synthInit(true)) {
-      top->synthTracks();
-      top->stepSynthFrame();
-      if(top->isAssignReady()) {
-	pthread_mutex_lock(&threadData->assignMutex);
-	pthread_cond_wait(&threadData->assignCond,&threadData->assignMutex);
-	pthread_mutex_unlock(&threadData->assignMutex);		
+  }
+  pthread_exit(NULL);
+  return NULL;
+}
+
+void *adjust2ThreadCB(void *data) {
+  ThreadInterface *threadInterface = (ThreadInterface*)data;
+  int channels = threadInterface->channels;
+  SubBand *top = threadInterface->top;
+  while(threadInterface->bActive) {
+    threadInterface->waitAdjust2();
+    if(top->adjust2Init(true)) {
+      top->adjust2();
+      top->stepAdjust2Frame();
+      for(int c=0; c<channels; c++) {
+        threadInterface->signalTrial2(c);
+      }
+      for(int c=0; c<channels; c++) {
+        threadInterface->signalTrial1(c);
       }
     }
   }
@@ -217,530 +253,535 @@ void *synthThreadCB(void *data) {
   return NULL;
 }
 
-void sbsms_init_threads(sbsms *sbsmser, bool bAnalyze, bool bSynthesize)
-{
-  thread_data *threadData = (thread_data*)calloc(1,sizeof(thread_data));
-  sbsmser->threadData = threadData;
-  threadData->bActive = true;
-
-  pthread_cond_init(&threadData->writeCond, NULL);
-  pthread_mutex_init(&threadData->writeMutex, NULL);
-
-  if(bAnalyze) {
-    pthread_cond_init(&threadData->addCond, NULL);
-    pthread_mutex_init(&threadData->addMutex, NULL);
-    threadData->bAddThread = true;
-
-    pthread_cond_init(&threadData->assignCond, NULL);    
-    pthread_mutex_init(&threadData->assignMutex, NULL);
-    threadData->bAssignThread = true;
-
-    for(int c=0;c<sbsmser->channels;c++) {
-      threadData->assignData[c].sbsmser = sbsmser;
-      threadData->assignData[c].c = c;
-      threadData->assignData[c].bFirst = (c==0);
-      threadData->assignData[c].bLast = (c==sbsmser->channels-1);
-    }
-  } else {
-    threadData->bAddThread = false;
-    threadData->bAssignThread = false;
-  }
-
-  if(!bAnalyze) bSynthesize = false;
-
-  if(bSynthesize) {
-    pthread_cond_init(&threadData->synthCond, NULL);
-    pthread_mutex_init(&threadData->synthMutex, NULL);
-    threadData->bSynthThread = true;
-  } else {
-    threadData->bSynthThread = false;
-  }
-
-  if(bAnalyze) {
-    pthread_create(&threadData->addThread, NULL, addThreadCB, (void*)sbsmser);
-    for(int c=0;c<sbsmser->channels;c++) {
-      pthread_create(&threadData->assignThread[c], NULL, assignThreadCB, (void*)(&threadData->assignData[c]));
+void *trial1ThreadCB(void *data) {
+  channel_thread_data *channelData = (channel_thread_data*)data;
+  ThreadInterface *threadInterface = channelData->threadInterface;
+  SubBand *top = threadInterface->top;
+  int c = channelData->c;
+  while(threadInterface->bActive) {
+    threadInterface->waitTrial1(c);
+    if(top->trial1Init(c,true)) {
+      top->trial1(c);
+      top->stepTrial1Frame(c);
+      threadInterface->signalAdjust2();
+      threadInterface->signalAdjust1();
     }
   }
-  if(bSynthesize) {
-    pthread_create(&threadData->synthThread, NULL, synthThreadCB, (void*)sbsmser);
-  }
-
-  pthread_create(&threadData->pollThread, NULL, pollThreadCB, (void*)sbsmser);
+  pthread_exit(NULL);
+  return NULL;
 }
 
-void sbsms_destroy_threads(sbsms *sbsmser)
-{
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-  threadData->bActive = false;
-  if(threadData->bAddThread) {
-    pthread_mutex_lock(&threadData->addMutex);
-    pthread_cond_broadcast(&threadData->addCond);
-    pthread_mutex_unlock(&threadData->addMutex);
-    pthread_join(threadData->addThread,NULL);
-  }
-  if(threadData->bAssignThread) {
-    pthread_mutex_lock(&threadData->assignMutex);
-    pthread_cond_broadcast(&threadData->assignCond);
-    pthread_mutex_unlock(&threadData->assignMutex);
-    for(int c=0;c<sbsmser->channels;c++) {
-      pthread_join(threadData->assignThread[c],NULL);
-    }
-  }
-  if(threadData->bSynthThread) {
-    pthread_mutex_lock(&threadData->synthMutex);
-    pthread_cond_broadcast(&threadData->synthCond);
-    pthread_mutex_unlock(&threadData->synthMutex);
-    pthread_join(threadData->synthThread,NULL);
-  }
-  pthread_join(threadData->pollThread,NULL);
-}
-#else
-void sbsms_init_threads(sbsms *sbsmser, bool bAnalyze, bool bSynthesize)
-{
-  sbsmser->threadData = NULL;
-}
-void sbsms_destroy_threads(sbsms *sbsmser)
-{
-}
-#endif
-
-void sbsms_init(int n) {
-  cosinit(n);
-}
-
-void sbsms_private_init(sbsms *sbsmser, bool bAnalyze, bool bSynthesize)
-{
-  sbsmser->ina = make_audio_buf(sbsmser->quality.maxoutframesize);
-  sbsms_init_threads(sbsmser,bAnalyze,bSynthesize);
-}
-
-void sbsms_reset(sbsms *sbsmser)
-{
-  sbsmser->ta->init();
-  sbsmser->n_processed = 0;
-  sbsmser->bWritingComplete = false;
-  
-  if(sbsmser->getSamplesCB) {
-    sbsmser->n_prepad = sbsmser->quality.N[sbsmser->quality.bands-1] * sbsmser->quality.M_MAX;
-    sbsmser->n_prespent = sbsmser->quality.N[sbsmser->quality.bands-1] / sbsmser->quality.H[2] / 2;
-  } else {
-    sbsmser->n_prepad = 0;
-    sbsmser->n_prespent = 0;
-  }
-  sbsmser->top->reset();
-}
-
-void sbsms_seek(sbsms *sbsmser, long framePos, long samplePos)
-{
-  sbsmser->n_processed = samplePos;
-  sbsmser->top->seek(framePos);
-}
-
-sbsms* sbsms_create(FILE *fp, sbsms_rate_cb getRateCB, sbsms_pitch_cb getPitchCB)
-{
-  sbsms *sbsmser = (sbsms*) calloc(1,sizeof(sbsms));
-  // samples, frames
-  fseek(fp,0,SEEK_SET);
-  long samples, frames;
-  fread(&samples,sizeof(long),1,fp);
-  fread(&frames,sizeof(long),1,fp);
-  fread(&(sbsmser->channels),sizeof(int),1,fp);
-  fread(&(sbsmser->quality),sizeof(sbsms_quality),1,fp);
-  unsigned short maxtrackindex;
-  fread(&maxtrackindex,sizeof(unsigned short),1,fp);
-  sbsmser->fp = fp;
-  sbsmser->getSamplesCB = NULL;
-  sbsmser->getRateCB = getRateCB;
-  sbsmser->getPitchCB = getPitchCB;
-  sbsmser->ta = new TrackAllocator(false,maxtrackindex);
-  sbsmser->pa = new PeakAllocator();
-  sbsmser->top = new subband(NULL,1,sbsmser->channels,&sbsmser->quality,2,false,sbsmser->ta,sbsmser->pa);
-  sbsmser->top->setFramesInFile(frames);
-  sbsms_private_init(sbsmser,false,false);
-  sbsms_reset(sbsmser);
-  return sbsmser;
-}
-
-sbsms* sbsms_create(sbsms_cb getSamplesCB, sbsms_rate_cb getRateCB, sbsms_pitch_cb getPitchCB, int channels, sbsms_quality *quality, bool bPreAnalyze, bool bSynthesize)
-{
-  sbsms *sbsmser = (sbsms*) calloc(1,sizeof(sbsms));
-  sbsmser->channels = channels;
-  sbsmser->quality = *quality;
-  sbsmser->getSamplesCB = getSamplesCB;
-  sbsmser->getRateCB = getRateCB;
-  sbsmser->getPitchCB = getPitchCB;
-  sbsmser->ta = new TrackAllocator(true);
-  sbsmser->pa = new PeakAllocator();
-  sbsmser->top = new subband(NULL,1,sbsmser->channels,&sbsmser->quality,6,bPreAnalyze,sbsmser->ta,sbsmser->pa);
-  sbsms_private_init(sbsmser,true,bSynthesize);
-  sbsms_reset(sbsmser);
-  return sbsmser;
-}
-
-void sbsms_destroy(sbsms* sbsmser)
-{
-  free_audio_buf((audio*)sbsmser->ina);
-  sbsms_destroy_threads(sbsmser);
-  if(sbsmser->threadData)
-    free(sbsmser->threadData);
-  delete sbsmser->top;
-  delete sbsmser->ta;
-  delete sbsmser->pa;
-  free(sbsmser);
-}
-
-void sbsms_pre_analyze_complete(sbsms *sbsmser) 
-{
-  sbsmser->top->preAnalyzeComplete();
-}
-
-long sbsms_pre_analyze(sbsms_cb getSamplesCB, void *data, sbsms *sbsmser)
-{
-  long n_towrite = 0;
-  real rate = (sbsmser->getRateCB)(sbsmser->n_processed,data);
-  real pitch = (sbsmser->getPitchCB)(sbsmser->n_processed,data);
-  real a = 1.0f/rate;
-
-  if(sbsmser->n_prepad) {
-    a = 1.0;
-    n_towrite = min(sbsmser->quality.inframesize,sbsmser->n_prepad);
-    memset(sbsmser->ina,0,n_towrite*sizeof(audio));
-    sbsmser->n_prepad -= n_towrite;
-  } else {
-    n_towrite = getSamplesCB(sbsmser->ina,sbsmser->quality.inframesize,data);
-    sbsmser->n_processed += n_towrite;
-    if(n_towrite == 0) {
-      n_towrite = sbsmser->quality.inframesize;
-      memset(sbsmser->ina,0,n_towrite*sizeof(audio));
-    }
-  }
-  return sbsmser->top->preAnalyze(sbsmser->ina, n_towrite, a, pitch);
-}
-
-long sbsms_read_frame(audio *buf, void *data, sbsms *sbsmser, real *pitch0, real *pitch1)
-{
-  long n_read = 0;
-  long n_write = 0;
-#ifdef MULTITHREADED
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-#endif
-
-  do {
-    real rate = (sbsmser->getRateCB)(sbsmser->n_processed,data);
-    real pitch = (sbsmser->getPitchCB)(sbsmser->n_processed,data);
-    real a = 1.0f/rate;    
-
-    if(sbsmser->n_prespent) {
-      n_read = sbsmser->top->read(NULL, pitch0, pitch1);
-      if(n_read) sbsmser->n_prespent--;
-      n_read = 0;
-    } else {
-      n_read = sbsmser->top->read(buf, pitch0, pitch1);
-    }
-
-    n_write = 0;    
-#ifdef MULTITHREADED
-    if(threadData->bAddThread && sbsmser->top->isAddReady()) {
-      pthread_mutex_lock(&threadData->addMutex);
-      pthread_cond_broadcast(&threadData->addCond);
-      pthread_mutex_unlock(&threadData->addMutex);
-    }
-#endif
-    if(n_read == 0) {
-#ifdef MULTITHREADED
-      if(!sbsmser->top->isWriteReady()) {
-        pthread_mutex_lock(&threadData->writeMutex);
-        pthread_cond_wait(&threadData->writeCond,&threadData->writeMutex);
-        pthread_mutex_unlock(&threadData->writeMutex);
+void *adjust1ThreadCB(void *data) {
+  ThreadInterface *threadInterface = (ThreadInterface*)data;
+  int channels = threadInterface->channels;
+  SubBand *top = threadInterface->top;
+  while(threadInterface->bActive) {
+    threadInterface->waitAdjust1();
+    if(top->adjust1Init(true)) {
+      top->adjust1();
+      top->stepAdjust1Frame();
+      for(int c=0; c<channels; c++) {
+        threadInterface->signalTrial1(c);
       }
-#endif
-      long n_towrite = 0;
-      if(sbsmser->getSamplesCB) {
-        if(sbsmser->n_prepad) {
-          a = 1.0;
-          n_towrite = min(sbsmser->quality.inframesize,sbsmser->n_prepad);
-          memset(sbsmser->ina,0,n_towrite*sizeof(audio));
-          sbsmser->n_prepad -= n_towrite;
-        } else {
-          n_towrite = (sbsmser->getSamplesCB)(sbsmser->ina,sbsmser->quality.inframesize,data);
-          sbsmser->n_processed += n_towrite;
-          if(n_towrite == 0) {
-            n_towrite = sbsmser->quality.inframesize;
-            memset(sbsmser->ina,0,n_towrite*sizeof(audio));
-          }
+      if(threadInterface->bRenderThread) {
+        for(int c=0; c<channels; c++) {
+          threadInterface->signalRender(c);
         }
-        n_write = sbsmser->top->write(sbsmser->ina, n_towrite, a, pitch);
       } else {
-        n_write = sbsmser->top->readFromFile(sbsmser->fp, a, pitch);
-        sbsmser->n_processed += n_write;
-        if(n_write == 0) {
-          sbsmser->bWritingComplete = true;
-          sbsmser->top->writingComplete();
-        }
+        threadInterface->signalReadWrite();
       }
     }
-#ifdef MULTITHREADED
-    if(threadData->bSynthThread && sbsmser->top->isSynthReady()) {
-      pthread_mutex_lock(&threadData->synthMutex);
-      pthread_cond_broadcast(&threadData->synthCond);
-      pthread_mutex_unlock(&threadData->synthMutex);
-    }
-#endif
-    bool bProcess = true;
-    bool bSynth = true;
-#ifdef MULTITHREADED
-    if(threadData->bAddThread && threadData->bAssignThread) bProcess = false;
-    if(threadData->bSynthThread) bSynth = false;
-#endif
-    if(bProcess) sbsmser->top->process();
-    if(bSynth) sbsmser->top->synth();
-#ifdef MULTITHREADED
-    if(threadData->bAssignThread && sbsmser->top->isAssignReady()) {
-      pthread_mutex_lock(&threadData->assignMutex);
-      pthread_cond_broadcast(&threadData->assignCond);
-      pthread_mutex_unlock(&threadData->assignMutex);
-    }
-#endif
-    
-    if(sbsmser->bWritingComplete && 
-       !sbsmser->top->isframe_readable() && 
-       sbsmser->top->getFramesAtBack() == 0) {
-      n_write = sbsmser->top->zeroPad();
-    }
-  } while(!n_read);
-  return n_read;
-}
-
-long sbsms_write_frame(FILE *fp, void *data, sbsms *sbsmser)
-{
-  long n_tofile = 0;
-  long n_write = 0;
-#ifdef MULTITHREADED
-  thread_data *threadData = (thread_data*)sbsmser->threadData;
-#endif
-
-  do {
-    real rate = (sbsmser->getRateCB)(sbsmser->n_processed,data);
-    real pitch = (sbsmser->getPitchCB)(sbsmser->n_processed,data);
-    real a = 1.0f/rate;
-
-    n_tofile = sbsmser->top->getFramesWrittenToFile();
-
-    n_write = 0;
-#ifdef MULTITHREADED
-    if(threadData->bAddThread && sbsmser->top->isAddReady()) {
-      pthread_mutex_lock(&threadData->addMutex);
-      pthread_cond_broadcast(&threadData->addCond);
-      pthread_mutex_unlock(&threadData->addMutex);
-    }
-#endif
-    if(n_tofile == 0) {
-#ifdef MULTITHREADED
-      if(!sbsmser->top->isWriteReady()) {
-        pthread_mutex_lock(&threadData->writeMutex);
-        pthread_cond_wait(&threadData->writeCond,&threadData->writeMutex);
-        pthread_mutex_unlock(&threadData->writeMutex);
-      }
-#endif
-      if(sbsmser->top->isWriteReady()) {
-        long n_towrite = 0;
-        if(sbsmser->n_prepad) {
-          a = 1.0;
-          n_towrite = min(sbsmser->quality.inframesize,sbsmser->n_prepad);
-          memset(sbsmser->ina,0,n_towrite*sizeof(audio));
-          sbsmser->n_prepad -= n_towrite;
-        } else {
-          n_towrite = (sbsmser->getSamplesCB)(sbsmser->ina,sbsmser->quality.inframesize,data);
-          sbsmser->n_processed += n_towrite;
-          if(n_towrite == 0) {
-            n_towrite = sbsmser->quality.inframesize;
-            memset(sbsmser->ina,0,n_towrite*sizeof(audio));
-          }
-        }
-        n_write = sbsmser->top->write(sbsmser->ina, n_towrite, a, pitch);
-      }
-    }
-#ifdef MULTITHREADED
-    if(threadData->bAddThread && sbsmser->top->isAddReady()) {
-      pthread_mutex_lock(&threadData->addMutex);
-      pthread_cond_broadcast(&threadData->addCond);
-      pthread_mutex_unlock(&threadData->addMutex);
-    }
-#endif    
-#ifndef MULTITHREADED
-    sbsmser->top->process();	
-#endif
-    long n_written = 0;
-    if(sbsmser->n_prespent) {
-      n_written = sbsmser->top->writeToFile(NULL);
-      if(n_written) sbsmser->n_prespent--;
-      n_written = 0;
-    } else {
-      n_written = sbsmser->top->writeToFile(fp);
-    }
-#ifdef MULTITHREADED
-    if(threadData->bAssignThread && sbsmser->top->isAssignReady()) {
-      pthread_mutex_lock(&threadData->assignMutex);
-      pthread_cond_broadcast(&threadData->assignCond);
-      pthread_mutex_unlock(&threadData->assignMutex);
-    }
-#endif
-  } while(!n_tofile);
-  return n_tofile;
-}
-
-FILE *sbsms_open_read(const char *fileName)
-{
-  FILE *fp = fopen(fileName,"rb");
-  return fp;
-}
-
-void sbsms_close_read(FILE *fp)
-{
-  fclose(fp);
-}
-
-FILE *sbsms_open_write(const char *fileName, sbsms *sbsmser, long samples_to_process)
-{
-  FILE *fp = fopen(fileName,"wb");
-  if(!fp)
-    return NULL;
-  fwrite(&samples_to_process,sizeof(long),1,fp);
-  long nframes = 0;
-  fwrite(&nframes,sizeof(long),1,fp);
-  fwrite(&(sbsmser->channels),sizeof(int),1,fp);
-  fwrite(&(sbsmser->quality),sizeof(sbsms_quality),1,fp);
-  unsigned short maxtrackindex = 0;
-  fwrite(&maxtrackindex,sizeof(unsigned short),1,fp);
-  return fp;
-}
-
-void sbsms_close_write(FILE *fp, sbsms *sbsmser)
-{
-  sbsmser->top->writeFramePositionsToFile(fp);
-  fclose(fp);
-}
-
-long sbsms_get_samples_to_process(FILE *fp)
-{
-  fseek(fp,0,SEEK_SET);
-  long samples;
-  fread(&samples,sizeof(long),1,fp);
-  return samples;
-}
-
-long sbsms_get_frames_to_process(FILE *fp)
-{
-  // samples
-  long offset = sizeof(long);
-  fseek(fp,offset,SEEK_SET);
-  long frames;
-  fread(&frames,sizeof(long),1,fp);
-  return frames;
-}
-
-long sbsms_get_channels(FILE *fp)
-{
-  //samples, frames
-  long offset = 2*sizeof(long);
-  fseek(fp,offset,SEEK_SET);
-  int channels;
-  fread(&channels,sizeof(int),1,fp);
-  return channels;
-}
-
-
-void sbsms_get_quality(FILE *fp, sbsms_quality *quality)
-{
-  //samples, frames, channels
-  long offset = 2*sizeof(long) + sizeof(int);
-  fseek(fp,offset,SEEK_SET);
-  fread(quality,sizeof(sbsms_quality),1,fp);
-}
-
-void sbsms_seek_start_data(FILE *fp)
-{
-  // samples, frames, channels, quality, maxtrackindex
-  long offset = 2*sizeof(long) + sizeof(int) + sizeof(sbsms_quality) + sizeof(unsigned short);
-  fseek(fp,offset,SEEK_SET);
-}
-
-long sbsms_samples_processed(sbsms *sbsmser)
-{
-  return sbsmser->n_processed;
-}
-
-long sbsms_get_samples_queued(sbsms *sbsmser)
-{
-  return sbsmser->top->getSamplesQueued();
-}
-
-long sbsms_get_frames_queued(sbsms *sbsmser)
-{
-  return sbsmser->top->getFramesQueued();
-}
-
-long sbsms_get_last_input_frame_size(sbsms *sbsmser)
-{
-  return sbsmser->top->getLastInputFrameSize();
-}
-
-long sbsms_get_frame_pos(sbsms *sbsmser)
-{
-  return sbsmser->top->getFramePos();
-}
-
-real rateCBLinear(long nProcessed, void *userData)
-{
-  sbsmsInfo *si = (sbsmsInfo*) userData;
-  real t0 = (real)nProcessed/(real)si->samplesToProcess;
-  if(t0 > 1.0) t0 = 1.0;
-  real rate = si->rate0 + (si->rate1-si->rate0)*t0;
-  return rate;
-}
-
-real rateCBConstant(long nProcessed, void *userData)
-{
-  sbsmsInfo *si = (sbsmsInfo*) userData;
-  return si->rate0;
-}
-
-long getLinearOutputSamples(sbsmsInfo *si)
-{
-  real s;
-  if(si->rate0 == si->rate1) {
-    s = 1.0f / si->rate0;
-  } else {
-    s = log(si->rate1/si->rate0)/(si->rate1-si->rate0);
   }
-  return (long) (s * si->samplesToProcess);
+  pthread_exit(NULL);
+  return NULL;
 }
 
-real pitchCBLinear(long nProcessed, void *userData)
+void *renderThreadCB(void *data) {
+  channel_thread_data *channelData = (channel_thread_data*)data;
+  ThreadInterface *threadInterface = channelData->threadInterface;
+  SubBand *top = threadInterface->top;
+  int c = channelData->c;
+  while(threadInterface->bActive) {
+    threadInterface->waitRender(c);
+    if(top->renderInit(c,true)) {
+      top->render(c);
+      top->stepRenderFrame(c);
+      threadInterface->signalAdjust1();
+      threadInterface->signalReadWrite();
+    }
+  }
+  pthread_exit(NULL);
+  return NULL;
+}
+
+ThreadInterface :: ThreadInterface(SBSMSImp *sbsms, bool bSynthesize) 
 {
-  sbsmsInfo *si = (sbsmsInfo*) userData;
-
-  real t0 = (real)nProcessed/(real)si->samplesToProcess;
-  if(t0 > 1.0f) t0 = 1.0f;
-
-  real rate = si->rate0 + (si->rate1-si->rate0)*t0;
-  real stretch;
-  if(rate == si->rate0)
-    stretch = 1.0f/rate;
-  else
-    stretch = log(rate/si->rate0)/(rate-si->rate0);
-  real t1 = stretch * (real)nProcessed/(real)si->samplesToGenerate;
-  if(t1 > 1.0f) t1 = 1.0f;
-
-  real pitch = si->pitch0 + (si->pitch1-si->pitch0)*t1;
-  return pitch;
+  this->top = sbsms->top;
+  this->channels = sbsms->channels;
+  bActive = true;
+  pthread_cond_init(&readWriteCond, NULL);
+  pthread_mutex_init(&readWriteMutex, NULL);
+  if(bSynthesize) {
+    bRenderThread = true;
+  } else {
+    bRenderThread = false;
+  }
+  for(int i=0; i<3; i++) {
+    analyzeData[i].i = i;
+    analyzeData[i].threadInterface = this;
+    pthread_cond_init(&analyzeCond[i], NULL);
+    pthread_mutex_init(&analyzeMutex[i], NULL);
+  }
+  for(int c=0; c<channels; c++) {
+    channelData[c].c = c;
+    channelData[c].threadInterface = this;
+    pthread_cond_init(&extractCond[c], NULL);
+    pthread_mutex_init(&extractMutex[c], NULL);
+    pthread_cond_init(&assignCond[c], NULL);    
+    pthread_mutex_init(&assignMutex[c], NULL);
+    pthread_cond_init(&trial2Cond[c], NULL);    
+    pthread_mutex_init(&trial2Mutex[c], NULL);
+    pthread_cond_init(&trial1Cond[c], NULL);    
+    pthread_mutex_init(&trial1Mutex[c], NULL);
+    if(bRenderThread) {
+      pthread_cond_init(&renderCond[c], NULL);
+      pthread_mutex_init(&renderMutex[c], NULL);
+    }
+  }
+  for(int i=0; i<3; i++) {
+    pthread_create(&analyzeThread[i], NULL, analyzeThreadCB, (void*)&analyzeData[i]);
+  }
+  for(int c=0; c<channels; c++) {
+    pthread_create(&extractThread[c], NULL, extractThreadCB, (void*)&channelData[c]);
+    pthread_create(&assignThread[c], NULL, assignThreadCB, (void*)&channelData[c]);
+    pthread_create(&trial2Thread[c], NULL, trial2ThreadCB, (void*)&channelData[c]);
+    pthread_create(&trial1Thread[c], NULL, trial1ThreadCB, (void*)&channelData[c]);
+    if(bRenderThread) {
+      pthread_create(&renderThread[c], NULL, renderThreadCB, (void*)&channelData[c]);
+    }
+  }
+  pthread_cond_init(&adjust2Cond, NULL);    
+  pthread_mutex_init(&adjust2Mutex, NULL);
+  pthread_create(&adjust2Thread, NULL, adjust2ThreadCB, this);
+  pthread_cond_init(&adjust1Cond, NULL);    
+  pthread_mutex_init(&adjust1Mutex, NULL);
+  pthread_create(&adjust1Thread, NULL, adjust1ThreadCB, this);
 }
 
-real pitchCBConstant(long nProcessed, void *userData)
+ThreadInterface :: ~ThreadInterface() 
 {
-  sbsmsInfo *si = (sbsmsInfo*) userData;
-  return si->pitch0;
+  bActive = false;
+  for(int i=0; i<3; i++) {
+    pthread_mutex_lock(&analyzeMutex[i]);
+    pthread_cond_broadcast(&analyzeCond[i]);
+    pthread_mutex_unlock(&analyzeMutex[i]);
+    pthread_join(analyzeThread[i],NULL);
+  }
+  for(int c=0; c<channels; c++) {
+    pthread_mutex_lock(&extractMutex[c]);
+    pthread_cond_broadcast(&extractCond[c]);
+    pthread_mutex_unlock(&extractMutex[c]);
+    pthread_join(extractThread[c],NULL);
+    pthread_mutex_lock(&assignMutex[c]);
+    pthread_cond_broadcast(&assignCond[c]);
+    pthread_mutex_unlock(&assignMutex[c]);
+    pthread_join(assignThread[c],NULL);
+    pthread_mutex_lock(&trial2Mutex[c]);
+    pthread_cond_broadcast(&trial2Cond[c]);
+    pthread_mutex_unlock(&trial2Mutex[c]);
+    pthread_join(trial2Thread[c],NULL);
+    pthread_mutex_lock(&adjust2Mutex);
+    pthread_cond_broadcast(&adjust2Cond);
+    pthread_mutex_unlock(&adjust2Mutex);
+    pthread_join(adjust2Thread,NULL);
+    pthread_mutex_lock(&trial1Mutex[c]);
+    pthread_cond_broadcast(&trial1Cond[c]);
+    pthread_mutex_unlock(&trial1Mutex[c]);
+    pthread_join(trial1Thread[c],NULL);
+    pthread_mutex_lock(&adjust1Mutex);
+    pthread_cond_broadcast(&adjust1Cond);
+    pthread_mutex_unlock(&adjust1Mutex);
+    pthread_join(adjust1Thread,NULL);
+    if(bRenderThread) {
+      pthread_mutex_lock(&renderMutex[c]);
+      pthread_cond_broadcast(&renderCond[c]);
+      pthread_mutex_unlock(&renderMutex[c]);
+      pthread_join(renderThread[c],NULL);
+    }
+  }
+}
+
+void ThreadInterface :: signalReadWrite() 
+{
+  pthread_mutex_lock(&readWriteMutex);
+  bool bReady;
+  if(bRenderThread) {
+    bReady = (top->writeInit() || top->readInit());
+  } else {
+    if(top->writeInit()) {
+      bReady = true;  
+    } else {
+      bReady = true;
+      for(int c=0; c<channels; c++) {
+        if(!top->renderInit(c,false)) {
+          bReady = false;
+          break;
+        }
+      }
+    }
+  }
+  if(bReady) {
+    pthread_cond_broadcast(&readWriteCond);
+  }
+  pthread_mutex_unlock(&readWriteMutex);
+}
+
+void ThreadInterface :: signalAnalyze() 
+{
+  for(int i=0; i<3; i++) {
+    pthread_mutex_lock(&analyzeMutex[i]);
+    if(top->analyzeInit(i,false)) {
+      pthread_cond_broadcast(&analyzeCond[i]);
+    }
+    pthread_mutex_unlock(&analyzeMutex[i]);
+  }
+}
+
+void ThreadInterface :: signalExtract(int c) {
+  pthread_mutex_lock(&extractMutex[c]);
+  if(top->extractInit(c,false)) {
+    pthread_cond_broadcast(&extractCond[c]);
+  }
+  pthread_mutex_unlock(&extractMutex[c]);
+}
+
+void ThreadInterface :: signalMark(int c) {
+  pthread_mutex_lock(&assignMutex[c]);
+  if(top->markInit(c,false)) {
+    pthread_cond_broadcast(&assignCond[c]);
+  }
+  pthread_mutex_unlock(&assignMutex[c]);
+}
+
+void ThreadInterface :: signalAssign(int c) {
+  pthread_mutex_lock(&assignMutex[c]);
+  if(top->assignInit(c,false)) {
+    pthread_cond_broadcast(&assignCond[c]);
+  }
+  pthread_mutex_unlock(&assignMutex[c]);
+}
+
+void ThreadInterface :: signalTrial2(int c) {
+  pthread_mutex_lock(&trial2Mutex[c]);
+  if(top->trial2Init(c,false)) {
+    pthread_cond_broadcast(&trial2Cond[c]);
+  }
+  pthread_mutex_unlock(&trial2Mutex[c]);
+}
+
+void ThreadInterface :: signalAdjust2() {
+  pthread_mutex_lock(&adjust2Mutex);
+  if(top->adjust2Init(false)) {
+    pthread_cond_broadcast(&adjust2Cond);
+  }
+  pthread_mutex_unlock(&adjust2Mutex);
+}
+
+void ThreadInterface :: signalTrial1(int c) {
+  pthread_mutex_lock(&trial1Mutex[c]);
+  if(top->trial1Init(c,false)) {
+    pthread_cond_broadcast(&trial1Cond[c]);
+  }
+  pthread_mutex_unlock(&trial1Mutex[c]);
+}
+
+void ThreadInterface :: signalAdjust1() {
+  pthread_mutex_lock(&adjust1Mutex);
+  if(top->adjust1Init(false)) {
+    pthread_cond_broadcast(&adjust1Cond);
+  }
+  pthread_mutex_unlock(&adjust1Mutex);
+}
+
+void ThreadInterface :: signalRender(int c) {
+  pthread_mutex_lock(&renderMutex[c]);
+  if(top->renderInit(c,false)) {
+    pthread_cond_broadcast(&renderCond[c]);
+  }
+  pthread_mutex_unlock(&renderMutex[c]);
+}
+
+void ThreadInterface :: waitReadWrite() {
+  pthread_mutex_lock(&readWriteMutex);
+  bool bReady;
+  if(bRenderThread) {
+    bReady = (top->writeInit() || top->readInit());
+  } else {
+    if(top->writeInit()) {
+      bReady = true;  
+    } else {
+      bReady = true;
+      for(int c=0; c<channels; c++) {
+        if(!top->renderInit(c,false)) {
+          bReady = false;
+          break;
+        }
+      }
+    }
+  }
+  if(!bReady) {
+    pthread_cond_wait(&readWriteCond,&readWriteMutex);
+  }
+  pthread_mutex_unlock(&readWriteMutex);
+}
+
+void ThreadInterface :: waitAnalyze(int i) {
+  pthread_mutex_lock(&analyzeMutex[i]);
+  if(!top->analyzeInit(i,false)) {
+    pthread_cond_wait(&analyzeCond[i],&analyzeMutex[i]);
+  }
+  pthread_mutex_unlock(&analyzeMutex[i]);
+}
+
+void ThreadInterface :: waitExtract(int c) {
+  pthread_mutex_lock(&extractMutex[c]);
+  if(!top->extractInit(c,false)) {
+    pthread_cond_wait(&extractCond[c],&extractMutex[c]);
+  }
+  pthread_mutex_unlock(&extractMutex[c]);
+}
+
+void ThreadInterface :: waitAssign(int c) {
+  pthread_mutex_lock(&assignMutex[c]);
+  if(!top->markInit(c,false) && !top->assignInit(c,false)) {
+    pthread_cond_wait(&assignCond[c],&assignMutex[c]);
+  }
+  pthread_mutex_unlock(&assignMutex[c]);
+}
+
+void ThreadInterface :: waitTrial2(int c) {
+  pthread_mutex_lock(&trial2Mutex[c]);
+  if(!top->trial2Init(c,false)) {
+    pthread_cond_wait(&trial2Cond[c],&trial2Mutex[c]);
+  }
+  pthread_mutex_unlock(&trial2Mutex[c]);
+}
+
+void ThreadInterface :: waitAdjust2() {
+  pthread_mutex_lock(&adjust2Mutex);
+  if(!top->adjust2Init(false)) {
+    pthread_cond_wait(&adjust2Cond,&adjust2Mutex);
+  }
+  pthread_mutex_unlock(&adjust2Mutex);
+}
+
+void ThreadInterface :: waitTrial1(int c) {
+  pthread_mutex_lock(&trial1Mutex[c]);
+  if(!top->trial1Init(c,false)) {
+    pthread_cond_wait(&trial1Cond[c],&trial1Mutex[c]);
+  }
+  pthread_mutex_unlock(&trial1Mutex[c]);
+}
+
+void ThreadInterface :: waitAdjust1() {
+  pthread_mutex_lock(&adjust1Mutex);
+  if(!top->adjust1Init(false)) {
+    pthread_cond_wait(&adjust1Cond,&adjust1Mutex);
+  }
+  pthread_mutex_unlock(&adjust1Mutex);
+}
+
+void ThreadInterface :: waitRender(int c) {
+  pthread_mutex_lock(&renderMutex[c]);
+  if(!top->renderInit(c,false)) {
+    pthread_cond_wait(&renderCond[c],&renderMutex[c]);
+  }
+  pthread_mutex_unlock(&renderMutex[c]);
+}
+
+#endif
+
+void SBSMSImp :: reset()
+{
+  nSamplesInputed = 0;
+  nSamplesOutputed = 0;
+  nPrepadDone = 0;
+  nPresamplesDone = 0;
+}
+
+SBSMS :: SBSMS(int channels, SBSMSQuality *quality, bool bSynthesize)
+{ imp = new SBSMSImp(channels,quality,bSynthesize); }
+SBSMSImp :: SBSMSImp(int channels, SBSMSQuality *quality, bool bSynthesize)
+{
+  this->channels = channels;
+  this->quality = new SBSMSQuality(&quality->params);
+  error = SBSMSErrorNone;
+  top = new SubBand(NULL,0,channels,quality,bSynthesize);
+  ina = (audio*)malloc(quality->getFrameSize()*sizeof(audio));
+  nPrepad = quality->getMaxPresamples();
+  reset();
+#ifdef MULTITHREADED
+  threadInterface = new ThreadInterface(this,bSynthesize);
+#endif
+}
+
+SBSMS :: ~SBSMS() { delete imp; }
+SBSMSImp :: ~SBSMSImp()
+{
+#ifdef MULTITHREADED
+  if(threadInterface) delete threadInterface;
+#endif
+  if(top) delete top;
+  if(ina) free(ina);
+  if(quality) delete quality;
+}
+
+void SBSMS :: addRenderer(SBSMSRenderer *renderer) { imp->addRenderer(renderer); }
+void SBSMSImp :: addRenderer(SBSMSRenderer *renderer)
+{
+  top->addRenderer(renderer);
+}
+
+void SBSMS :: removeRenderer(SBSMSRenderer *renderer) { imp->removeRenderer(renderer); }
+void SBSMSImp :: removeRenderer(SBSMSRenderer *renderer)
+{
+  top->removeRenderer(renderer);
+}
+
+SBSMSError SBSMS :: getError()
+{
+  return imp->error;
+}
+
+float SBSMSImp :: getInputTime(SBSMSInterface *iface)
+{
+  return (float)nSamplesInputed / (float)iface->getSamplesToInput();
+}
+
+long SBSMSImp :: write(SBSMSInterface *iface)
+{
+  long nWrite = 0;
+
+  float t = getInputTime(iface);
+  float stretch = iface->getStretch(t);
+  float pitch = iface->getPitch(t);
+
+  long nPresamples = iface->getPresamples();
+  if(nPrepadDone < nPrepad - nPresamples) {
+    stretch = 1.0f;
+    nWrite = min(quality->getFrameSize(),nPrepad - nPresamples - nPrepadDone);
+    memset(ina,0,nWrite*sizeof(audio));
+    nPrepadDone += nWrite;
+  } else if(nPresamplesDone < nPresamples) {
+    stretch = 1.0f;
+    nWrite = min(quality->getFrameSize(),nPresamples - nPresamplesDone);
+    nWrite = iface->samples(ina,nWrite);
+    if(nWrite == 0) {
+      nWrite = quality->getFrameSize();
+      memset(ina,0,nWrite*sizeof(audio));
+    } else {
+      nPresamplesDone += nWrite;
+    }
+  } else {
+    nWrite = iface->samples(ina,quality->getFrameSize());
+    nSamplesInputed += nWrite;
+    if(nWrite == 0) {
+      nWrite = quality->getFrameSize();
+      memset(ina,0,nWrite*sizeof(audio));
+    }
+  }
+  nWrite = top->write(ina, nWrite, stretch, pitch);
+  return nWrite;
+}
+
+long SBSMS :: read(SBSMSInterface *iface, audio *buf, long n) { return imp->read(iface,buf,n); }
+long SBSMSImp :: read(SBSMSInterface *iface, audio *buf, long n)
+{
+  long nReadTotal = 0;
+  while(nReadTotal < n) {
+    long nRead;
+    nRead = n - nReadTotal;
+    nRead = top->read(buf+nReadTotal,nRead);
+    nReadTotal += nRead;
+    if(nRead) {
+#ifdef MULTITHREADED
+      if(threadInterface->bRenderThread) {
+        for(int c=0; c<channels; c++) {
+          threadInterface->signalRender(c);
+        }
+      }
+#endif
+    } else {
+#ifdef MULTITHREADED
+      threadInterface->waitReadWrite();
+#endif
+      if(top->writeInit()) {
+        write(iface);
+#ifdef MULTITHREADED
+        threadInterface->signalAnalyze();
+#endif
+      }
+    }
+#ifdef MULTITHREADED
+    if(!threadInterface->bRenderThread) {
+      for(int c=0; c<channels; c++) {     
+        threadInterface->signalRender(c);
+      }
+    }
+#else
+    top->process(true);
+#endif
+    nSamplesOutputed += nRead;
+  }
+  return nReadTotal;
+}
+
+long SBSMS :: renderFrame(SBSMSInterface *iface) { return imp->renderFrame(iface); }
+long SBSMSImp :: renderFrame(SBSMSInterface *iface)
+{
+  long nRendered = 0;
+  while(!nRendered) {
+    bool bReady = true;
+    for(int c=0; c<channels; c++) {
+      if(!top->renderInit(c,false)) {
+        bReady = false;
+        break;
+      }
+    }
+    if(bReady) {
+      nRendered = top->renderSynchronous();
+    }
+    if(nRendered) {
+#ifdef MULTITHREADED
+      threadInterface->signalAdjust1();
+#endif
+    } else {
+#ifdef MULTITHREADED
+      threadInterface->waitReadWrite();  
+#endif      
+      if(top->writeInit()) {
+        write(iface);
+      }
+      
+#ifdef MULTITHREADED
+      threadInterface->signalAnalyze();
+#endif
+    }
+#ifdef MULTITHREADED
+#else
+    top->process(false);
+#endif
+    if(nSamplesOutputed >= iface->getSamplesToOutput()) {
+      top->renderComplete(iface->getSamplesToOutput());
+    }
+    nSamplesOutputed += nRendered;
+  }
+  return nRendered;
+}
+
+long SBSMS :: getInputFrameSize()
+{
+  return imp->top->getInputFrameSize();
 }
 
 }
diff --git a/lib-src/sbsms/src/sincCoeffs.h b/lib-src/sbsms/src/sincCoeffs.h
index 0d0e6dcf3..8d286e83b 100644
--- a/lib-src/sbsms/src/sincCoeffs.h
+++ b/lib-src/sbsms/src/sincCoeffs.h
@@ -1,18 +1,14 @@
-#ifndef SBSMS_SINCCOEFFS_H
-#define SBSMS_SINCCOEFFS_H
+// -*- mode: c++ -*-
+#ifndef SINCCOEFFS_H
+#define SINCCOEFFS_H
 
-#include "sbsms.h"
-#define SBSMS_SINC_SIZE 5286
-#ifdef SBSMS_REAL_FLOAT
-#define SBSMS_SINC_RES 128.0f
-#define SBSMS_SINC_SAMPLES 41.0f
-#else
-#define SBSMS_SINC_RES 128.0
-#define SBSMS_SINC_SAMPLES 41.0
-#endif
+enum { 
+  resampleSincSize = 5286,
+  resampleSincRes = 128,
+  resampleSincSamples = 41 };
 
 namespace _sbsms_ {
-real sincTable[SBSMS_SINC_SIZE] = 
+float sincTable[resampleSincSize] = 
 {
 0.920381425342433f,
 0.920302993473145f,
diff --git a/lib-src/sbsms/src/sms.cpp b/lib-src/sbsms/src/sms.cpp
index 434889d1e..249a58f07 100644
--- a/lib-src/sbsms/src/sms.cpp
+++ b/lib-src/sbsms/src/sms.cpp
@@ -1,1779 +1,1913 @@
+#include "sms.h"
 #include "real.h"
 #include "utils.h"
+#include "dBTable.h"
+#include <stdlib.h>
 #include <math.h>
-#include "sms.h"
-#include "buffer.h"
-#include <limits.h>
-
+#include <set>
 using namespace std;
+
 namespace _sbsms_ {
 
-#define SMS_BUF_SIZE 4096
-
-sms :: sms(int N, unsigned short M, unsigned short  M_MAX, int res, int latency, real p, real q, real pad, int Nlo, int channels, TrackAllocator *ta, PeakAllocator *pa) 
+SMS :: SMS(SMS *lo, int N, int band, int bandMax, int h, int res, int N0, int N1, int N2, int channels, audio *peak2)
 {
-  this->N = N;
-  this->M = M;
-  Nover2 = N/2;
-  this->p = p;
-  this->q = q;
+  this->lo = lo;
+  if(lo) lo->hi = this;
+  hi = NULL;
+  this->band = band;
+  this->h = h;
+  this->h1 = (double)(h<<band);
   this->res = res;
-  this->m = (real)M/(real)M_MAX;
+  this->resMask = res - 1;
   this->channels = channels;
-  this->ta = ta;
-  this->pa = pa;
-  terminal = (M == M_MAX);
+  this->N = N;
+  this->Nover2 = N/2;
+  float pad2 = (float)N/(float)N2;
+  float pad1 = (float)N/(float)N1;
+  float pad0 = (float)N/(float)N0;
+  M = (float)(1<<band);
+  peakThresh = 1e-8f;
 
-  datasize = sizeof(char) + 6*sizeof(unsigned short);
-  pData = (char*)calloc(datasize,sizeof(char));
+  float maxDF2 = square(0.005f * (float)h) / M;
+  maxDF = sqrt(maxDF2);
+  maxCost2 = 0.5f * maxDF2;
+  dMCoeff2 = 0.002f * maxDF2;
+  
+  float maxDF2SplitMerge = square(0.001f * (float)h) / M;
+  maxDFSplitMerge = sqrt(maxDF2SplitMerge);
+  maxCost2SplitMerge = 1.0f * maxDF2SplitMerge;
+  dMCoeff2SplitMerge = 0.006f * maxDF2SplitMerge;
 
-  // Threshold (relative to max magnitude) for finding peaks
-  peakThresh = .000005f;
-  // Threshold (in trackpoint units) for starting a track
-  startThresh = 8.0f*sqrt(pad/(real)N) * peakThresh;
-  // Max figure of merit for continuing a track (see merit)
-  maxMerit2 = square(.11f);
-  // Max differency in frequency for continuing a track
-  maxDF2 = square(.08f);
-  // Coefficient for dB magnitude changes in figure of merit for continuing a track
-  dMCoeff = 0.01f;
-  // Max increase in dB for continuing a track
-  maxdBIncr = (12.0f - 6.0f*m);
-  // Max difference in dB for stitching two subband tracks together
-  maxdBIncrStitch = (12.0f - 6.0f*m);
-  // Max figure of merit for matching peaks for band stitching
-  maxMerit2Match = square(.08f);
-  // Max difference in frequency for matching peaks for band stitching
-  maxDF2Match = square(.04f);
-  // Coefficient for dB magnitude changes in figure of merit for band stitching
-  dMCoeffMatch = 0.02f;
-    // Min number of trackpoints in a track for synthesis
-  minNpts = 4;
-  // Max width of a peak for determining spectral energy
-  peakWidth = 2*((round2int(pad*(real)N/96.0f)+1)/2);
-  // Beginning and end of band
-  if(terminal) kStart = 1; 
-  else kStart = N/4-(int)(0.5*round2int((real)peakWidth*(real)N/(real)Nlo)+6);
-  if(M==1) kEnd = N/2;
-  else kEnd = N/2-peakWidth;
-  // Max frequency for matching peaks for band stitching
-  maxFMatch = (0.5f*kEnd+5.0f)*TWOPI/(real)N;
-  // Min frequency for matching peaks for band stitching
-  minFMatch = (2.0f*kStart-10.0f)*TWOPI/(real)N;
-  // Min ratio of peak "top" to total peak energy
-  minPeakTopRatio = 0.05f;
-  // Min ratio of low frequency resolution/high frequency resolution peaks for determining peaks
-  // Ratio for favoring continuing a track in local band over stitching to another band
+  maxDFMatch = .06f / M;
+  float maxDF2Match = square(maxDFMatch);
+  dMCoeff2Match = 0.0075f * maxDF2Match;
+  maxCost2Match = 0.8f * maxDF2Match;
+
+  maxDFStereo = .04f / (float)M;
+  float maxDF2Stereo = square(maxDFStereo);
+  dMCoeff2Stereo = 0.005f * maxDF2Stereo;
+  maxCost2Stereo = 1.0f*maxDF2Stereo;
+
+  peakWidth0 = lrintf(pad0*(float)N*0.0055f) + 1;
+  peakWidth1 = lrintf(pad1*(float)N*0.0055f) + 1;
+  peakWidth2 = lrintf(pad2*(float)N*0.0055f) + 1;
+  minTrackSize = max(384/(h<<band),N2/h/2);
+  minCutSep2 = max((int)lrintf(0.008f * (float)N),peakWidth1);
+  minCutSep1 = max((int)lrintf(0.011f * (float)N),peakWidth0);
+  if(band==bandMax) kLo = 1;
+  else kLo = max(1L,lrintf(floor(0.5f*(float)N/(float)lo->N*(float)lo->kHi-maxDFMatch*M/TWOPI*(float)N)));
+  if(band==0) kHi = Nover2;
+  else kHi = max(1L,lrintf(0.4785f * N)-peakWidth0*2);
+  kStart = max(1,kLo-peakWidth0);
+  kEnd = min(Nover2-1,kHi+peakWidth0*2);
+  float kNorm = TWOPI / (float)(M * N);
+  maxFHi = (float)kHi * kNorm + maxDF;
+  minFLo = (float)kLo * kNorm - maxDF;
+  if(lo) maxFMatchM = (float)lo->kHi * TWOPI / (float)(lo->N * M * 2) + maxDFMatch;
+  else maxFMatchM = 0.0f;
+  minFMatchL = (float)kLo * kNorm - maxDFMatch;
+  if(lo) maxFMid = (float)lo->kHi * TWOPI / (float)(lo->N * M * 2) + maxDF;
+  else maxFMid = 0.0f;
+  if(lo) lo->minFMid = (float)kLo * kNorm - lo->maxDF;
+  if(lo && lo->lo) {
+    minK = max(1L,(lrintf(0.25f * (float)N / (float)lo->lo->N * (float)lo->lo->kHi + peakWidth0)));
+  } else {
+    minK = 1;
+  }
+  maxK = min(kEnd,kHi + peakWidth0);
   localFavorRatio = 1.1f;
-  // Max ratio of (peak energy given to other peaks) to (peak energy)
-  maxDecRatio = 1.5f;
-
-  // Normalization from spectrum energy to peak amplitude
-  mNorm = 1.0f/6.0f * pad * square(8.0f / (real)(N));
-
-  // max magnitude (for determining peaks)
-  magmax = 0;
-
-  assigntime[0] = 0;
-  assigntime[1] = 0;
-  marktime[0] = 0;
-  marktime[1] = 0;
-  currtime = 0;
-  synthtime = 0;
-
-  trax = (list<track*>**)calloc(2,sizeof(list<track*>*));
-  trax[0] = new list<track*>;
-  trax[1] = new list<track*>;
-  peak1 = (real*)calloc(2*N,sizeof(real));
-  dec = (real*)calloc(N,sizeof(real));
-  mag0[0] = (real*)calloc(N,sizeof(real));
-  mag0[1] = (real*)calloc(N,sizeof(real));
-  mag1[0] = (real*)calloc(N,sizeof(real));
-  mag1[1] = (real*)calloc(N,sizeof(real));
-  mag2[0] = (real*)calloc(N,sizeof(real));
-  mag2[1] = (real*)calloc(N,sizeof(real));
-  trackPointListBuffer[0] = new TrackPointListBuffer();
-  trackPointListBuffer[1] = new TrackPointListBuffer();
-
-  h2cum = 0.0f;
-  sines2 = new SampleBuf(0);
-  outMixer = sines2;
-  
-  x0[0] = grain :: create(N,1);
-  x0[1] = grain :: create(N,1);
-
-  x1[0] = grain :: create(N,1);
-  x1[1] = grain :: create(N,1);
-
-  x2[0] = grain :: create(N,1);
-  x2[1] = grain :: create(N,1);
-
-  bPeakSet = false;
-
+  mNorm = MScale * MScale * 16.061113032124002f * pad2 / square((float)N);
+  for(int c=0; c<channels; c++) {
+    bAssignDone[c] = false;
+    addtime[c] = 0;
+    assigntime[c] = 0;
+    trial2time[c] = 0;
+    trial1time[c] = 0;
+    synthtime[c] = 0;
+    for(int k=1; k<256; k++) {
+      trackIndex[c].push(k);
+    }
+    trial2Buf[c] = (float*)malloc(h*res*sizeof(float));
+    trial2RingBuf[c] = new ArrayRingBuffer<float>(0);
+    dmag1[c] = (float*)malloc(N*sizeof(float));
+    mag11[c] = (float*)malloc((Nover2+1)*sizeof(float));
+    x10[c] = (audio*)malloc(N*sizeof(audio));
+    x11[c] = (audio*)malloc(N*sizeof(audio));
+    trial1Buf[c] = (float*)malloc(h*res*sizeof(float));
+    trial1RingBuf[c] = new ArrayRingBuffer<float>(0);
+    dmag0[c] = (float*)malloc(N*sizeof(float));
+    mag01[c] = (float*)malloc((Nover2+1)*sizeof(float));
+    x00[c] = (audio*)malloc(N*sizeof(audio));
+    x01[c] = (audio*)malloc(N*sizeof(audio));
+    mag2[c] = (float*)malloc((Nover2+1)*sizeof(float));
+    dec2[c] = (float*)malloc(N*sizeof(float));
+    x2[c] = (audio*)malloc(N*sizeof(audio));
 #ifdef MULTITHREADED
-  pthread_mutex_init(&dataMutex,NULL);
-  pthread_mutex_init(&tplbMutex[0],NULL);
-  pthread_mutex_init(&tplbMutex[1],NULL);
-  pthread_mutex_init(&bufferMutex,NULL);
-  pthread_mutex_init(&trackMutex[0],NULL);
-  pthread_mutex_init(&trackMutex[1],NULL);
+    pthread_mutex_init(&renderMutex[c],NULL);
+    pthread_mutex_init(&trackMutex[c],NULL);
+    pthread_mutex_init(&sliceMutex[c],NULL);
+    pthread_mutex_init(&trial2Mutex[c],NULL);
+    pthread_mutex_init(&trial1Mutex[c],NULL);
+    pthread_mutex_init(&magMutex[c],NULL);
 #endif
+  }
+  h2cum = 0.0;
+  adjust2time = 0;
+  adjust1time = 0;
+  trial2GrainBuf = new GrainBuf(N,h,N1,hannpoisson);
+  trial1GrainBuf = new GrainBuf(N,h,N0,hannpoisson);
+  peak20 = (float*)calloc(2*N,sizeof(float));
+  peak2N = peak20 + N;
+  for(int k=-Nover2;k<=Nover2;k++) {
+    peak2N[k] = norm2(peak2[(k+N)%N]);
+  }
 }
 
-sms :: ~sms()
+SMS :: ~SMS()
 {
-  reset();
-  free(pData);
-  free(mag0[0]);
-  free(mag0[1]);
-  free(mag1[0]);
-  free(mag1[1]);
-  free(mag2[0]);
-  free(mag2[1]);
-  free(dec);
-  free(peak1);
-  grain :: destroy(x0[0]);
-  grain :: destroy(x0[1]);
-  grain :: destroy(x1[0]);
-  grain :: destroy(x1[1]);
-  grain :: destroy(x2[0]);
-  grain :: destroy(x2[1]);
-  delete sines2;
   for(int c=0;c<channels;c++) {
-    for(long k=trackPointListBuffer[c]->readPos; k<trackPointListBuffer[c]->writePos; k++) {
-      tplist *tpl = trackPointListBuffer[c]->read(k);
-      for(tplist::iterator tpi = tpl->begin();
-	  tpi != tpl->end();
-	  tpi++) {
-	delete (*tpi);
+    while(!mag1Queue[c].empty()) {
+      delete mag1Queue[c].front();
+      mag1Queue[c].pop();
+    }
+    while(!mag0Queue[c].empty()) {
+      delete mag0Queue[c].front();
+      mag0Queue[c].pop();
+    }
+    set<Track*> tracks;
+    for(list<Track*>::iterator i=assignTracks[c].begin(); 
+        i != assignTracks[c].end(); 
+        ++i ) {
+      tracks.insert(*i);
+    }
+    for(list<Track*>::iterator i=renderTracks[c].begin(); 
+        i != renderTracks[c].end(); 
+        ++i ) {
+      tracks.insert(*i);
+    }
+    for(set<Track*>::iterator i=tracks.begin(); 
+        i != tracks.end(); 
+        ++i ) {
+      delete *i;
+    }
+    set<Slice*> slices;
+    while(!adjust2SliceQueue[c].empty()) {
+      slices.insert(adjust2SliceQueue[c].front());
+      adjust2SliceQueue[c].pop();
+    }
+    while(!adjust1SliceQueue[c].empty()) {
+      slices.insert(adjust1SliceQueue[c].front());
+      adjust1SliceQueue[c].pop();
+    }
+    for(long k=sliceBuffer[c].readPos; k<sliceBuffer[c].writePos; k++) {
+      slices.insert(sliceBuffer[c].read(k));
+    }
+    for(set<Slice*>::iterator i = slices.begin();
+        i != slices.end();
+        ++i) {
+      Slice *s = *i;
+      TrackPoint *tp = s->bottom;
+      delete s;
+      while(tp) {
+        TrackPoint *tpn = tp->pn;
+        if(!tp->owner) tp->destroy();
+        tp = tpn;
       }
     }
+    free(trial2Buf[c]);
+    delete trial2RingBuf[c];
+    free(trial1Buf[c]);
+    delete trial1RingBuf[c];
+    free(dmag1[c]);
+    free(mag11[c]);
+    free(x10[c]);
+    free(x11[c]);
+    free(dmag0[c]);
+    free(mag01[c]);
+    free(x00[c]);
+    free(x01[c]);
+    free(mag2[c]);
+    free(x2[c]);
+    free(dec2[c]);
   }
-  delete trackPointListBuffer[0];
-  delete trackPointListBuffer[1];
-  delete trax[0];
-  delete trax[1];
-  free(trax);
+  free(peak20);
+  delete trial2GrainBuf;
+  delete trial1GrainBuf;
 }
 
-void sms :: reset()
+void SMS :: trial2Start(int c)
 {
-  assigntime[0] = 0;
-  assigntime[1] = 0;
-  marktime[0] = 0;
-  marktime[1] = 0;
-  currtime = 0;
-  synthtime = 0;
-  h2cum = 0.0f;
-  samplePos = 0;
-
-  for(int c=0;c<channels;c++) {
-    for(list<track*>::iterator tt=trax[c]->begin(); 
-	tt != trax[c]->end(); 
-	) {
-      track *t = (*tt);      
-      list<track*>::iterator eraseMe = tt;
-      tt++;
-      trax[c]->erase(eraseMe);
-      ta->destroy(t);
-    }
-  }
-  
-  hSynth.clear();
-  sines2->clear();
-}
-
-#define LOG_MIN (-16.0f)
-#define LOG_MAX (0.0f)
-
-unsigned short sms :: encodeRealLog(real x)
-{
-  x = log(x);
-  if(x<LOG_MIN) return 0;
-  else if(x>LOG_MAX) return USHRT_MAX;
-  else return (unsigned short)round2int((real)USHRT_MAX*(x-LOG_MIN)/(LOG_MAX-LOG_MIN));
-}
-
-real sms :: decodeRealLog(unsigned short x)
-{
-  return exp(LOG_MIN + (LOG_MAX-LOG_MIN)*(real)x/(real)USHRT_MAX);
-}
-
-unsigned short sms :: encodeReal(real x, real min, real max)
-{
-  if(x<min) return 0;
-  else if(x>max) return USHRT_MAX;
-  else return (unsigned short)round2int((real)USHRT_MAX*(x-min)/(max-min));
-}
-
-real sms :: decodeReal(unsigned short x, real min, real max)
-{
-  return min + (max-min)*(real)x/(real)USHRT_MAX;
-}
-
-void sms :: readTrackPointsFromFile(FILE *fp)
-{
-  unsigned short h1;
-  char *data = pData;
-  fread(data,sizeof(unsigned short)+sizeof(char),1,fp);
-  h1 = *((unsigned short*)data); data += sizeof(unsigned short);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  hSynth.write(h1);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  char ch = *((char*)data);
-  channels = ch;
-  for(int c=0;c<channels;c++) {
-    unsigned short nTracks = 0;
-    fread(&nTracks,sizeof(unsigned short),1,fp);
-    for(int k=0;k<nTracks;k++) {
-      unsigned short index;
-      unsigned short precursorIndex;
-      char flags;
-      bool tailStart;
-      bool tailEnd;
-      bool bStart;
-      bool bEnd;
-      tpoint *tp = new tpoint();
-      
-      char *data = pData;
-      fread(data,datasize,1,fp);
-      flags = *((char*)data); data += sizeof(char);
-      index = *((unsigned short*)data); data += sizeof(unsigned short);
-      precursorIndex = *((unsigned short*)data); data += sizeof(unsigned short);
-      unsigned short f;
-      unsigned short y;
-      unsigned short y0;
-      unsigned short ph;
-      f = *((unsigned short*)data); data += sizeof(unsigned short);
-      y = *((unsigned short*)data); data += sizeof(unsigned short);
-      y0 = *((unsigned short*)data); data += sizeof(unsigned short);
-      ph = *((unsigned short*)data);
-      tp->f = decodeReal(f,0.0f,PI);
-      tp->y = decodeRealLog(y)*(real)M;
-      tp->y0 = decodeRealLog(y0)*(real)M;
-      tp->ph = decodeReal(ph,-PI,PI);
-      
-      bStart = (flags & 1)?true:false;
-      tailStart = (flags & 2)?true:false;
-      bEnd = (flags & 4)?true:false;
-      tailEnd = (flags & 8)?true:false;
-      tp->h = h1;
-      tp->M = M;
-      
-      track *t = ta->getTrack(index);
-      if(t && !bStart) {
-	t->push_back_tpoint(tp);
-	if(bEnd) {
-	  t->end = assigntime[c];
-	}
-	if(tailEnd) {
-	  t->tailEnd = true;
-	}
-      } else {
-	track *t1;
-	if(precursorIndex != USHRT_MAX) {
-	  track *precursor = ta->getTrack(precursorIndex);
-	  t1 = ta->create(precursor,this,res,index);
-	  if(precursor) precursor->descendant = t1;
-	} else {
-	  t1 = ta->create(NULL,this,res,index);
-	}
-	if(tailStart)
-	  t1->tailStart = true;
-	t1->push_back_tpoint(tp);
-	t1->m_p = tp->ph;
-	t1->m_pDescendant = tp->ph;
-	t1->currtime = assigntime[c];
-	t1->start = assigntime[c];
-	addTrack(c,t1);
-      }
-    }
-    assigntime[c]++;
+  if(band >= minTrial2Band) {
+    memset(trial2Buf[c],0,h*res*sizeof(float));
   }
 }
 
-void sms :: zeroPad(long n)
+void SMS :: trial2End(int c)
 {
-  sines2->grow(n);
-  sines2->writePos += n;
-}
-
-int sms :: writeTrackPointsToFile(FILE *fp)
-{
-  int bytes = 0;
+  if(band < minTrial2Band) return;
 #ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
+  pthread_mutex_lock(&trial2Mutex[c]);
 #endif
-  unsigned short h1 = hSynth.read(hSynth.readPos);
+  trial2RingBuf[c]->write(trial2Buf[c],h*res);
 #ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  if(fp) {
-    fwrite(&h1,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-    char c = channels;
-    fwrite(&c,sizeof(char),1,fp); bytes += sizeof(char);
-    for(int c=0;c<channels;c++) {
-      unsigned short nTracks = 0;
-      long start = ftell(fp);
-      fwrite(&nTracks,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-#ifdef MULTITHREADED
-      pthread_mutex_lock(&trackMutex[c]);
-#endif
-      for(list<track*>::iterator tt=trax[c]->begin(); 
-	  tt != trax[c]->end(); 
-	  ) {
-	track *t = (*tt);      
-	if(t->end < synthtime) {
-	  if(!t->descendant||t->descendant->isDone()) {
-	    list<track*>::iterator eraseMe = tt;
-	    tt++;
-	    trax[c]->erase(eraseMe);
-	    ta->destroy(t);
-	  } else {
-	    tt++;
-	  }
-	} else if(synthtime >= t->start) {
-	  track *t = (*tt);      
-	  t->currtime = synthtime;
-	  trackpoint *tp = t->getTrackPoint(synthtime);
-	  if(tp) {
-	    char flags = 0;
-	    bool bStart;
-	    bool bEnd;
-	    bool tailStart;
-	    bool tailEnd;
-	    if(t->isStart(synthtime))
-	      bStart = true;
-	    else
-	      bStart = false;
-	    if(t->tailStart && t->isStart(synthtime))
-	      tailStart = true;
-	    else
-	      tailStart = false;
-	    if(t->isEnd(synthtime))
-	      bEnd = true;
-	    else
-	      bEnd = false;
-	    if(t->tailEnd && t->isEnd(synthtime))
-	      tailEnd = true;
-	    else
-	      tailEnd = false;
-	    
-	    if(bStart)
-	      flags += 1;
-	    if(tailStart)
-	      flags += 2;
-	    if(bEnd)
-	      flags += 4;
-	    if(tailEnd)
-	      flags += 8;
-	    
-	    fwrite(&flags,sizeof(char),1,fp); bytes += sizeof(char);
-	    fwrite(&(t->index),sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    if(t->precursor) {
-	      fwrite(&(t->precursor->index),sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    } else {
-	      unsigned short none = USHRT_MAX;
-	      fwrite(&none,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    }
-	    unsigned short f = encodeReal(tp->f,0.0f,PI);
-	    unsigned short y = encodeRealLog(tp->y/(real)M);
-	    unsigned short y0 = encodeRealLog(tp->y0/(real)M);
-	    unsigned short ph = encodeReal(tp->ph,-PI,PI);
-	    fwrite(&f,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    fwrite(&y,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    fwrite(&y0,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    fwrite(&ph,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
-	    nTracks++;
-	  }
-	  tt++;
-	} else {
-	  break;
-	}
-      }
-#ifdef MULTITHREADED
-      pthread_mutex_unlock(&trackMutex[c]);
-#endif
-      long end = ftell(fp);
-      fseek(fp,start,SEEK_SET);
-      fwrite(&nTracks,sizeof(unsigned short),1,fp);
-      fseek(fp,end,SEEK_SET);    
-    }
-  }
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  hSynth.advance(1);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  synthtime++;
-  return bytes;
-}
-
-void sms :: setH(unsigned short h)
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  hSynth.write(h);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
+  pthread_mutex_unlock(&trial2Mutex[c]);
 #endif
 }
 
-long sms :: addTrackPoints(grain *g0, grain *g1, grain *g2)
-{
-  // set magnitude profile of signel constant frequency peak
-  if(!bPeakSet) {
-    for(int k=-Nover2;k<=Nover2;k++) {
-      peak1[k+N] = norm2(g1->peak[(k+N)%N]);
-    }
-    bPeakSet = true;
-  }
-
-  setH(g1->h);
-  // split channels
-  c2evenodd(g0, x0[0], x0[1]);
-  c2evenodd(g1, x1[0], x1[1]);
-  c2evenodd(g2, x2[0], x2[1]);
-
-  for(int c=0;c<channels;c++) {
-    calcmags(mag0[c], x0[c],p);
-    calcmags(mag1[c], x1[c],1);
-    calcmags(mag2[c], x2[c],q);
-    extractTrackPoints(x1[c],mag0[c],mag1[c],mag2[c],currtime,trackPointListBuffer[c],g1->h,c);
-  }
-  currtime++;
-  return 1;
-}
-
-inline real sms :: merit(trackpoint *tp0, trackpoint *tp1, real m0, real m1, real dti2, real dMCoeff, real *df, real maxDF2)
-{
-  (*df) = m1*tp1->f - m0*tp0->f;
-  real df2 = square(*df);
-  if(df2 > maxDF2) return df2;
-  if(tp0->y==0.0f || tp1->y==0.0f) return df2;
-  real dM = dBApprox((m1*tp1->y)/(m0*tp0->y));
-  return (df2+square(dMCoeff*dM));
-}
-
-bool sms :: nearestTrackPoint(tplist *tpl, trackpoint *tp0, real m0, real m1, real dti2, tplist::iterator *minpos, real *minMerit2, real maxMerit2, real maxDF2) 
-{
-  (*minMerit2) = 1e9;
-  if(tpl == NULL) return false;
-  bool bSet = false;
-
-  for(tplist::iterator tpi=tpl->begin(); 
-      tpi!=tpl->end();
-      ++tpi) {
-
-    trackpoint *tp1 = (*tpi);
-    real df;
-    real Merit2 = merit(tp0,tp1,m0,m1,dti2,dMCoeff,&df,maxDF2);
-    if(m0!=m1) Merit2*=localFavorRatio;
-    if(Merit2 < (*minMerit2) && Merit2 < maxMerit2 && square(df) < maxDF2) {
-      (*minMerit2) = Merit2;
-      (*minpos) = tpi;
-      bSet = true;
-    }
-  }
-  return bSet;
-}
-
-bool sms :: contTrack(track *t, trackpoint *tp, int c)
+void SMS :: trial2(int c)
 {
 #ifdef MULTITHREADED
   pthread_mutex_lock(&trackMutex[c]);
 #endif
-  t->push_back(tp);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&trackMutex[c]);
-#endif
-  return true;
-}      
-
-bool sms :: adoptTrack(track *precursor, 
-		       sms *lender,
-		       trackpoint *tp,
-		       real m,
-		       real dt,
-		       int c)
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&lender->trackMutex[c]);
-#endif
-  trackpoint *last = precursor->back();
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&lender->trackMutex[c]);
-#endif
-  if(tp->M>last->M) {
-    if(dt==1.0) {
-      if(lender->res==2) {
-        trackpoint *tp0 = new trackpoint();
-        tp0->h = tp->h*2/lender->res;
-        tp0->y = 0.5f*tp->y;
-        tp0->y0 = tp0->y;
-        tp0->f = 0.5f*tp->f;
-        tp0->ph = tp->ph;
-        tp0->time = last->time+1;
-        tp0->M = last->M;
-#ifdef MULTITHREADED
-        pthread_mutex_lock(&lender->trackMutex[c]);
-#endif
-        precursor->push_back(tp0);
-#ifdef MULTITHREADED
-        pthread_mutex_unlock(&lender->trackMutex[c]);
-#endif
-        if(!tp->owner) 
-          tp->bDelete = true;
-      } else {
-        trackpoint *tpend = new trackpoint();
-        tpend->h = tp->h*2/lender->res;
-        tpend->y = 0;
-        tpend->y0 = 0;
-        tpend->f = 0.5f*tp->f;
-        tpend->ph = tp->ph;
-        tpend->time = last->time+1;
-        tpend->M = last->M;
-        
-        trackpoint *tp0 = new trackpoint();
-        tp0->h = last->h*lender->res/2;
-        tp0->y = 0;
-        tp0->y0 = 0;
-        tp0->f = last->f*2.0f;
-        tp0->ph = last->ph;
-        tp0->time = last->time/lender->res;
-        tp0->M = M;
-        track *t = ta->create(precursor,this,res);
-#ifdef MULTITHREADED
-        pthread_mutex_lock(&lender->trackMutex[c]);
-#endif
-        precursor->push_back(tpend);
-        precursor->endTrack(false);
-        precursor->descendant = t;
-#ifdef MULTITHREADED
-        pthread_mutex_unlock(&lender->trackMutex[c]);
-#endif
-        t->startTrack(tp0,false);
-        t->push_back(tp);
-        addTrack(c,t);
+  for(list<Track*>::iterator tt = renderTracks[c].begin(); 
+      tt != renderTracks[c].end();
+      ++tt) {
+    Track *t = (*tt);
+    if(trial2time[c] >= t->start) {
+      if(trial2time[c] > t->last) continue;
+      t->updateM(trial2time[c],synthModeTrial2);
+      if(hi && hi->band >= minTrial2Band) {
+        float f = 0.5f*M;
+        t->updateFPH(trial2time[c],synthModeTrial2,h<<1,f,f);
+        t->synth(hi->trial2Buf[c],trial2time[c],h<<1,synthModeTrial2,c);
+      }
+      if(lo && lo->band >= minTrial2Band) {
+        float f = 2.0f*M;
+        t->updateFPH(trial2time[c],synthModeTrial2,h>>1,f,f);
+        t->synth(lo->trial2Buf[c]+(trial2time[c]&(res*lo->res-1))*(h>>1),trial2time[c],h>>1,synthModeTrial2,c);
+      }
+      if(band >= minTrial2Band) {
+        float f = M;
+        t->updateFPH(trial2time[c],synthModeTrial2,h,f,f);
       }
-    } else if(dt==2.0) {
-      track *t = ta->create(precursor,this,res);
-      trackpoint *tpend0 = new trackpoint();
-      trackpoint *tpend1 = new trackpoint();
-      trackpoint *tp0 = new trackpoint();
-      tp0->h = (last->h*lender->res)/2;
-      tp0->y = 0;
-      tp0->y0 = 0;
-      tp0->f = last->f*2.0f;
-      tp0->ph = last->ph;
-      tp0->M = M;
-      tp0->time = last->time/lender->res;
-      
-      tpend0->h = last->h;
-      tpend0->y = 0.5f*last->y;
-      tpend0->y0 = tpend0->y;
-      tpend0->f = 0.5f*(last->f+0.5f*tp->f);
-      tpend0->ph = canon(last->ph + 0.5f*(last->f+tpend0->f)*last->h);
-      tpend0->time = last->time+1;
-      tpend0->M = last->M;
-      
-      tpend1->h = (tp->h*2)/lender->res;
-      tpend1->y = 0;
-      tpend1->y0 = 0;
-      tpend1->f = 0.5f*tp->f;
-      tpend1->ph = tp->ph;
-      tpend1->time = last->time+2;
-      tpend1->M = last->M;
-      
-      t->startTrack(tp0,false);
-      t->push_back(tp);
-#ifdef MULTITHREADED
-      pthread_mutex_lock(&lender->trackMutex[c]);
-#endif
-      precursor->push_back(tpend0);
-      precursor->push_back(tpend1);
-      precursor->endTrack(false);
-      precursor->descendant = t;
-#ifdef MULTITHREADED
-      pthread_mutex_unlock(&lender->trackMutex[c]);
-#endif
-      addTrack(c,t);
     } else {
-      abort();
-    }
-  } else {
-    track *t = ta->create(precursor,this,res);
-
-    trackpoint *tp0 = new trackpoint();
-    trackpoint *tpend = new trackpoint();
-    
-    tp0->h = (last->h*2)/res;
-    tp0->y = 0;
-    tp0->y0 = 0;
-    tp0->f = 0.5f*last->f;
-    tp0->ph = last->ph;
-    tp0->time = last->time*res;
-    tp0->M = M;
-    
-    tpend->h = (tp->h*res)/2;
-    tpend->y = 0;
-    tpend->y0 = 0;
-    tpend->f = tp->f*2.0f;
-    tpend->time = last->time+1;
-    tpend->ph = tp->ph;
-    tpend->M = last->M;
-    
-    t->startTrack(tp0,false);
-    if(res==2) {
-      trackpoint *tp1 = new trackpoint();
-      tp1->h = (last->h*2)/res;
-      tp1->y = 0.5f*tp->y0;
-      tp1->y0 = tp1->y;
-      tp1->f = 0.5f*(0.5f*last->f+tp->f);
-      tp1->ph = canon(tp0->ph + 0.5f*(tp0->f + tp1->f)*last->h);
-      tp1->time = last->time*res+1;
-      tp1->M = M;
-      t->push_back(tp1);
-    }
-    t->push_back(tp);
-#ifdef MULTITHREADED
-    pthread_mutex_lock(&lender->trackMutex[c]);
-#endif
-    precursor->push_back(tpend);
-    precursor->endTrack(false);
-    precursor->descendant = t;
-#ifdef MULTITHREADED
-    pthread_mutex_unlock(&lender->trackMutex[c]);
-#endif
-    addTrack(c,t);
-  }
-  return true;
-}
-
-void sms :: markDuplicatesLo(long offset, sms *lo, long offsetlo, int c)
-{
-  if(!lo) return;
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&lo->tplbMutex[c]);
-#endif
-  tplist *trackPointsL1 = 
-    lo->trackPointListBuffer[c]->read(lo->trackPointListBuffer[c]->readPos+offset/res+offsetlo);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&lo->tplbMutex[c]);
-#endif
-#ifdef MULTITHREADED
-    pthread_mutex_lock(&tplbMutex[c]);
-#endif
-  tplist *trackPointsM1 = 
-    trackPointListBuffer[c]->read(trackPointListBuffer[c]->readPos+offset);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&tplbMutex[c]);
-#endif
-  
-  tplist trackPoints0;
-  
-  for(tplist::iterator tpi=trackPointsM1->begin(); 
-      tpi!=trackPointsM1->end();
-      tpi++) {
-    
-    if((*tpi)->f > maxFMatch) break;
-    trackPoints0.push_back((*tpi));
-  }
-  
-  bool bDone = false;
-  bool bLastDitch = false;
-  
-  while(!bDone) {      
-    int nToCont = 0;
-    int nCont = 0;
-    
-    for(tplist::iterator tpi = trackPoints0.begin(); 
-	tpi!=trackPoints0.end();
-	tpi++) {
-      real F;
-      tplist::iterator minL0; bool minL0Set = nearestTrackPoint(trackPointsL1,*tpi,1.0,0.5,1.0,&minL0,&F,maxMerit2Match, maxDF2Match);
-      if(minL0Set) {
-	nToCont++;
-	(*tpi)->cont = (*minL0);
-      } else {
-	(*tpi)->cont = NULL;
-      }
-    }
-      
-    if(trackPointsL1) {
-      for(tplist::reverse_iterator tpi = trackPointsL1->rbegin(); 
-	  tpi!=trackPointsL1->rend();
-	  tpi++) {      
-	real F;
-	(*tpi)->cont = NULL;
-	if((*tpi)->f < minFMatch) break;
-	tplist::iterator minL1; bool minL1Set = nearestTrackPoint(&trackPoints0,*tpi,0.5,1.0,1.0,&minL1,&F,maxMerit2Match, maxDF2Match);
-	if(minL1Set) (*tpi)->cont = *minL1;
-      }
-    }
-    
-    for(tplist::iterator tpi = trackPoints0.begin(); 
-	tpi!=trackPoints0.end();
-	) {
-      trackpoint *tp0 = (*tpi);
-      trackpoint *tp1 = tp0->cont;
-      if(tp1 != NULL) {
-	if(bLastDitch || tp1->cont == tp0) {
-	  nCont++;
-	  bool bAlreadyMarked = false;
-	  if(offset%res == 0) {
-	    if(tp1->dup[1] != NULL || tp0->dup[1] != NULL)
-	      bAlreadyMarked = true;
-	  } else {
-	    if(tp1->dup[2-2*offsetlo] != NULL || tp0->dup[2*offsetlo] != NULL)
-	      bAlreadyMarked = true;
-	  }
-	  if(!bAlreadyMarked) {
-	    if(offset%res == 0) {
-	      tp1->dup[1] = tp0;
-	      tp0->dup[1] = tp1;
-	    } else {
-	      tp1->dup[2-2*offsetlo] = tp0;
-	      tp0->dup[2*offsetlo] = tp1;
-	    }
-	  }
-	  tplist::iterator eraseMe = tpi;
-	  tpi++;
-	  trackPoints0.erase(eraseMe);	    
-	  continue;
-	}
-      }
-      tpi++;
-    }
-    
-    bDone = (nToCont-nCont == 0);
-    bLastDitch = (!bDone && nCont==0);
-  }
-  marktime[c]++;
-}
-
-void sms :: markDuplicates(long offset, sms *hi, sms *lo, int c)
-{
-  if(offset%res==0) {
-    markDuplicatesLo(offset,lo,offset%res,c);
-  } else {
-    markDuplicatesLo(offset,lo,0,c);
-    markDuplicatesLo(offset,lo,1,c);
-  }
-}
-
-void sms :: addTrack(int c, track *t)
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&trackMutex[c]);
-#endif
-  list<track*>::reverse_iterator i=trax[c]->rbegin();
-  while(i!=trax[c]->rend()) {
-    track *t0 = *i;
-    if(t->start >= t0->start) {
       break;
     }
-    i++;
   }
-  trax[c]->insert(i.base(),t);
 #ifdef MULTITHREADED
   pthread_mutex_unlock(&trackMutex[c]);
 #endif
+  trial2time[c]++;
 }
 
-void sms :: deleteTrackPoint(trackpoint *tp)
+void SMS :: trial1Start(int c)
 {
-  delete tp;
-}
-
-bool sms :: connectTrackPoints(trackpoint *tp0, trackpoint *tp1, sms *hi, sms *lo, real dtlo, int c)
-{
-  bool isConn;
-  bool allowCont;
-  if(tp0->M == tp1->M) {
-    allowCont = contTrack(tp0->owner, tp1, c);
-    isConn = allowCont;
-  } else if(tp0->M < tp1->M) {
-    isConn = true;
-    allowCont = lo->adoptTrack(tp0->owner, this, tp1, 0.5, dtlo, c);
-  } else {
-    isConn = true;
-    allowCont = hi->adoptTrack(tp0->owner, this, tp1, 2.0, 1.0, c);
+  if(band >= minTrial1Band) {
+    memset(trial1Buf[c],0,h*res*sizeof(float));
   }
-  tp0->bConnected = true;
-  if(isConn) {
-    tp1->bConnected = true;
-    if(tp0->dupcont != NULL) {
-      trackpoint *dup = tp0->dupcont;
-      dup->bConnected = true;
-      if(!dup->owner)
-	dup->bDelete = true;
-    }
-    
-    trackpoint *dup2 = tp0->dup[2];
-    if(dup2 && dup2 != tp1 && !dup2->owner) {
-      dup2->bDelete = true;
-    }
-
-    for(int d=0;d<3;d++) {
-      if(tp1->dup[d] && !tp1->dup[d]->owner && (d<2 || tp1->dup[d]->M < tp1->M)) {
-	tp1->dup[d]->bDelete = true;
-      }
-    }
-  }
-  return allowCont;
 }
 
-void sms :: advanceTrackPoints(int c)
+void SMS :: trial1End(int c)
 {
+  if(band < minTrial1Band) return;
 #ifdef MULTITHREADED
-    pthread_mutex_lock(&tplbMutex[c]);
+  pthread_mutex_lock(&trial1Mutex[c]);
 #endif
-    trackPointListBuffer[c]->advance(1);
+  trial1RingBuf[c]->write(trial1Buf[c],h*res);
 #ifdef MULTITHREADED
-    pthread_mutex_unlock(&tplbMutex[c]);
+  pthread_mutex_unlock(&trial1Mutex[c]);
 #endif
 }
 
-long sms :: assignTrackPoints(long offset, sms *hi, sms *lo, int c)
-{  
-  if(offset%res == 0)
-    return assignTrackPoints_(offset,hi,lo,1.0,0,c);
-  else
-    return assignTrackPoints_(offset,hi,lo,2.0,1,c);
-}
-
-long sms :: assignTrackPoints_(long offset, sms *hi, sms *lo, real dtlo, long offsetlo, int c)
+void SMS :: trial1(int c)
 {
-#ifdef MULTITHREADED
-  if(hi) pthread_mutex_lock(&hi->tplbMutex[c]);
-#endif
-  tplist *trackPointsH1 = 
-    hi?hi->trackPointListBuffer[c]->read(hi->trackPointListBuffer[c]->readPos+hi->res*offset):NULL;  
-#ifdef MULTITHREADED 
-  if(hi) pthread_mutex_unlock(&hi->tplbMutex[c]);
-#endif
-
-#ifdef MULTITHREADED
-  if(lo) pthread_mutex_lock(&lo->tplbMutex[c]);
-#endif
-    tplist *trackPointsL1 = 
-    lo?lo->trackPointListBuffer[c]->read(lo->trackPointListBuffer[c]->readPos+offset/res+offsetlo):NULL;
-#ifdef MULTITHREADED
-	if(lo) pthread_mutex_unlock(&lo->tplbMutex[c]);
-#endif
-
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&tplbMutex[c]);
-#endif
-  tplist *trackPointsM1 = 
-    trackPointListBuffer[c]->read(trackPointListBuffer[c]->readPos+offset);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&tplbMutex[c]);	
-#endif
-  
-  tplist trackPoints0;
-  
 #ifdef MULTITHREADED
   pthread_mutex_lock(&trackMutex[c]);
 #endif
-  for(list<track*>::iterator tt=trax[c]->begin(); 
-      tt != trax[c]->end(); ) {
-    track *t = (*tt);
-    t->bEnd = true;
-    if(t->isEnded() || t->back()->time+1 != assigntime[c]) { t->bEnd = false; tt++; continue; }
-    trackPoints0.push_back(t->back());
-    tt++;
+  for(list<Track*>::iterator tt = renderTracks[c].begin(); 
+      tt != renderTracks[c].end();
+      ++tt) {
+    Track *t = (*tt);
+    if(trial1time[c] >= t->start) {
+      if(trial1time[c] > t->last) continue;
+      t->updateM(trial1time[c],synthModeTrial1);
+      if(hi && hi->band >= minTrial1Band) {
+        float f = 0.5f*M;
+        t->updateFPH(trial1time[c],synthModeTrial1,h<<1,f,f);
+        t->synth(hi->trial1Buf[c],trial1time[c],h<<1,synthModeTrial1,c);
+      }
+      if(lo && lo->band >= minTrial1Band) {
+        float f = 2.0f*M;
+        t->updateFPH(trial1time[c],synthModeTrial1,h>>1,f,f);
+        t->synth(lo->trial1Buf[c]+(trial1time[c]&(res*lo->res-1))*(h>>1),trial1time[c],h>>1,synthModeTrial1,c);
+      }
+      if(band >= minTrial1Band) {
+        float f = M;
+        t->updateFPH(trial1time[c],synthModeTrial1,h,f,f);
+        t->synth(trial1Buf[c]+(trial1time[c]&resMask)*h,trial1time[c],h,synthModeTrial1,c);
+      }
+    } else {
+      break;
+    }
   }
 #ifdef MULTITHREADED
   pthread_mutex_unlock(&trackMutex[c]);
 #endif
-
-  for(tplist::iterator tpi=trackPointsM1->begin(); 
-      tpi!=trackPointsM1->end();
-      ) {
-    trackpoint *tp = (*tpi);
-    if(tp->bDelete) {
-      tplist::iterator eraseMe = tpi;
-      tpi++;
-      trackPointsM1->erase(eraseMe);
-      deleteTrackPoint(tp);
-    } else {
-      tpi++;
-    }
-  }
-  
-  if(trackPointsL1) {
-    for(tplist::iterator tpi=trackPointsL1->begin(); 
-	tpi!=trackPointsL1->end();
-	) {
-      trackpoint *tp = (*tpi);
-      if(tp->bDelete) {
-	tplist::iterator eraseMe = tpi;
-	tpi++;
-	trackPointsL1->erase(eraseMe);
-	deleteTrackPoint(tp);
-      } else {
-	tpi++;
-      }
-    }
-  }
-
-  if(trackPointsH1) {
-    for(tplist::iterator tpi=trackPointsH1->begin(); 
-	tpi!=trackPointsH1->end();
-	) {
-      trackpoint *tp = (*tpi);
-      if(tp->bDelete) {
-	tplist::iterator eraseMe = tpi;
-	tpi++;
-	trackPointsH1->erase(eraseMe);
-	deleteTrackPoint(tp);
-      } else {
-	tpi++;
-	}
-    }
-  }
-
-  bool bDone = false;
-  bool bLastDitch = false;
-  
-  while(!bDone) {
-    int nToCont = 0;
-    int nCont = 0;
-    
-    for(tplist::iterator tpi=trackPointsM1->begin(); 
-	tpi!=trackPointsM1->end();
-	tpi++) {
-      real F;	
-      (*tpi)->bConnect = false;
-      (*tpi)->bConnected = false;
-      tplist::iterator minM1; bool minM1Set = nearestTrackPoint(&trackPoints0,*tpi,1.0,1.0,1.0,&minM1,&F,maxMerit2,maxDF2);
-      if(minM1Set) (*tpi)->cont = *minM1;
-      else (*tpi)->cont = NULL;
-    }
-    
-    if(trackPointsL1) {
-      for(tplist::reverse_iterator tpi = trackPointsL1->rbegin(); 
-	  tpi!=trackPointsL1->rend();
-	  tpi++) {      
-	(*tpi)->cont = NULL;
-	(*tpi)->bConnect = false;
-	(*tpi)->bConnected = false;
-	if((*tpi)->f < minFMatch) break;
-	real F;
-	tplist::iterator minL1; bool minL1Set = nearestTrackPoint(&trackPoints0,*tpi,0.5f,1.0f,square(1.0f/dtlo),&minL1,&F,maxMerit2,maxDF2);
-	if(minL1Set) (*tpi)->cont = *minL1;
-      }
-    }
-    
-    if(trackPointsH1) {
-      for(tplist::iterator tpi = trackPointsH1->begin(); 
-	  tpi!=trackPointsH1->end();
-	  tpi++) {      
-	(*tpi)->cont = NULL;
-	(*tpi)->bConnect = false;
-	(*tpi)->bConnected = false;
-	real F;
-	if((*tpi)->f < maxFMatch) {
-	  tplist::iterator minH1; bool minH1Set = nearestTrackPoint(&trackPoints0,*tpi,2.0f,1.0f,1.0f,&minH1,&F,maxMerit2,maxDF2);
-	  if(minH1Set) (*tpi)->cont = *minH1;
-	}
-      }
-    }
-    
-    for(tplist::iterator tpi = trackPoints0.begin(); 
-	tpi!=trackPoints0.end();
-	tpi++) {
-      
-      (*tpi)->dupcont = NULL;
-      (*tpi)->bConnected = false;
-      real FM0, FL0, FH0;
-      tplist::iterator minM0; bool minM0Set = nearestTrackPoint(trackPointsM1,*tpi,1.0f,1.0f,1.0f,&minM0,&FM0,maxMerit2,maxDF2);
-      tplist::iterator minL0; bool minL0Set = nearestTrackPoint(trackPointsL1,*tpi,1.0f,0.5f,square(1.0f/dtlo),&minL0,&FL0,maxMerit2,maxDF2);
-      tplist::iterator minH0; bool minH0Set = nearestTrackPoint(trackPointsH1,*tpi,1.0f,2.0f,1.0f,&minH0,&FH0,maxMerit2,maxDF2);
-      
-      if(minM0Set &&
-	 ((FM0<=FH0 && FM0<=FL0)
-	  ||(minL0Set && FL0<=FH0 && FL0<=FM0 && (*minL0)->dup[1-offsetlo] == (*minM0))
-	  ||(minH0Set && FH0<=FL0 && FH0<=FM0 && (*minH0)->dup[1] == (*minM0)))
-	 ) {
-	if(offsetlo == 0 && minL0Set && (*minL0)->dup[1] == (*minM0)) {	    
-	  (*tpi)->dupcont = *minL0;
-	} else if(minH0Set && (*minH0)->dup[1] == (*minM0)) {
-	  (*tpi)->dupcont = *minH0;
-	}
-	(*tpi)->contF = FM0;
-	(*tpi)->cont = *minM0;
-	nToCont++;
-      } else if(minL0Set && FL0<=FM0 && FL0<=FH0) {
-	if(minM0Set && (*minL0)->dup[1-offsetlo] == (*minM0)) {
-	  (*tpi)->dupcont = *minM0;
-	}
-	(*tpi)->contF = FL0;
-	(*tpi)->cont = *minL0;
-	nToCont++;
-      } else if(minH0Set && FH0<=FM0 && FH0<=FL0) {
-	if(minM0Set && (*minH0)->dup[1] == (*minM0)) {
-	  (*tpi)->dupcont = *minM0;
-	}
-	(*tpi)->contF = FH0;
-	(*tpi)->cont = *minH0;
-	nToCont++;
-      } else {
-	(*tpi)->cont = NULL;
-      }
-    }
-
-    // Nominal connections - may be conflicts to be resolved
-    for(tplist::iterator tpi = trackPoints0.begin(); 
-	tpi!=trackPoints0.end();
-	tpi++
-	) {
-      trackpoint *tp0 = (*tpi);
-      trackpoint *tp1 = tp0->cont;
-      if(tp1 != NULL) {
-	if(bLastDitch || (tp1->cont == tp0)) {
-	  tp1->bConnect = true;
-	}
-      }
-    }
-    
-    // Make connections and resolve conflicts between duplicates and between last ditch connections
-    for(tplist::iterator tpi = trackPoints0.begin(); 
-	tpi!=trackPoints0.end();
-	) {
-      
-      trackpoint *tp0 = (*tpi);
-      trackpoint *tp1 = tp0->cont;
-      
-      if(tp0->bDelete) { 
-	tplist::iterator eraseMe = tpi;
-	tpi++;
-	trackPoints0.erase(eraseMe);
-	continue;
-      }
-      if(tp1 != NULL && tp1->bConnect) {
-	if(tp0->dupcont != NULL && tp0->dupcont->bConnect) {
-	  if(!tp1->bConnected && !tp0->dupcont->bConnected) {
-	    if(!tp0->bConnected && !tp1->bDelete && (tp0->dupcont->cont == NULL || tp0->contF <= tp0->dupcont->cont->contF)) {
-	      nCont++;
-	      if(connectTrackPoints(tp0,tp1,hi,lo,dtlo,c))
-		tp0->owner->bEnd = false;
-	      tp0->dupcont->bConnect = false;
-	    } else if(tp0->dupcont->cont != NULL && !tp0->dupcont->cont->bConnected && !tp0->dupcont->bDelete && !tp0->dupcont->cont->bDelete) {
-	      nCont++;
-	      if(connectTrackPoints(tp0->dupcont->cont,tp0->dupcont,hi,lo,dtlo,c))
-		tp0->dupcont->cont->owner->bEnd = false;
-	      tp1->bConnect = false;
-	    }
-	  }
-	} else if(!tp0->bConnected && !tp1->bConnected && !tp1->bDelete) {
-	  nCont++;
-	  if(connectTrackPoints(tp0,tp1,hi,lo,dtlo,c)) {
-	    tp0->owner->bEnd = false;
-	  }
-	}
-      }
-      if(tp0->bConnected || tp0->bDelete) {
-	tplist::iterator eraseMe = tpi;
-	tpi++;
-	trackPoints0.erase(eraseMe);
-      } else {
-	tpi++;
-      }
-    }
-    
-    for(tplist::iterator tpi=trackPointsM1->begin(); 
-	tpi!=trackPointsM1->end();
-	) {
-      trackpoint *tp = (*tpi);
-      if(tp->bConnected ||tp->bDelete) {
-	tplist::iterator eraseMe = tpi;
-	tpi++;
-	trackPointsM1->erase(eraseMe);
-      } else {
-	tpi++;
-      }
-      if(tp->bDelete) {
-	deleteTrackPoint(tp);
-      }
-    }
-    
-    if(trackPointsL1) {
-      for(tplist::iterator tpi=trackPointsL1->begin(); 
-	  tpi!=trackPointsL1->end();
-	  ) {      
-	trackpoint *tp = (*tpi);
-	if(tp->bConnected||tp->bDelete) {
-	  tplist::iterator eraseMe = tpi;
-	  tpi++;
-	  trackPointsL1->erase(eraseMe);
-	} else {
-	  tpi++;
-	}
-	if(tp->bDelete) {
-	  deleteTrackPoint(tp);
-	}
-      }
-    }
-    
-    if(trackPointsH1) {
-      for(tplist::iterator tpi=trackPointsH1->begin(); 
-	  tpi!=trackPointsH1->end();
-	  ) {    
-	trackpoint *tp = (*tpi);
-	if(tp->bConnected || tp->bDelete) {
-	  tplist::iterator eraseMe = tpi;
-	  tpi++;
-	  trackPointsH1->erase(eraseMe);
-	} else {
-	  tpi++;
-	}
-	if(tp->bDelete) {
-	  deleteTrackPoint(tp);
-	}
-      }
-    }
-    
-    bDone = (nToCont-nCont == 0);
-    bLastDitch = (!bDone && nCont==0);
-  }
-  
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&trackMutex[c]);
-#endif
-  for(list<track*>::iterator tt=trax[c]->begin(); 
-      tt != trax[c]->end(); ) {
-    track *t = (*tt);      
-    if(t->bEnd) {
-      t->endTrack(true);
-    }
-    if(t->size() < minNpts && !t->descendant) {
-      list<track*>::iterator eraseMe = tt;
-      tt++;
-      trax[c]->erase(eraseMe);
-      ta->destroy(t);  
-    } else {
-      tt++;
-    }
-  }
-
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&trackMutex[c]);
-#endif
-  
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  assigntime[c]++;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-
-  return 1;
+  trial1time[c]++;
 }
 
-long sms :: startNewTracks(long offset, int c)
+void SMS :: adjust2()
 {
+  Slice* slice[2];
+  for(int c=0; c<channels; c++) {
 #ifdef MULTITHREADED
-  pthread_mutex_lock(&tplbMutex[c]);
+    pthread_mutex_lock(&sliceMutex[c]);
 #endif
-  tplist *trackPoints = trackPointListBuffer[c]->read(trackPointListBuffer[c]->readPos+offset);
+    slice[c] = adjust2SliceQueue[c].front(); adjust2SliceQueue[c].pop();
 #ifdef MULTITHREADED
-  pthread_mutex_unlock(&tplbMutex[c]);
+    pthread_mutex_unlock(&sliceMutex[c]);
 #endif
-
-  for(tplist::iterator tpi=trackPoints->begin(); 
-      tpi!=trackPoints->end();
-      ) {
-    trackpoint *tp = (*tpi);
-    
-    if(!tp->bDelete
-       &&
-       tp->y > startThresh*sqrtmagmax) {
-      track *t = ta->create(NULL,this,res);
-      t->startTrack(tp,true);
-      addTrack(c,t);	
-      for(int d=0;d<2;d++) {
-	if(tp->dup[d])
-	  if(!tp->dup[d]->owner)
-	    tp->dup[d]->bDelete = true;
-      }
-    } else {
-      deleteTrackPoint(tp);
-    }                 
-    tplist::iterator eraseMe = tpi;
-    tpi++;
-    trackPoints->erase(eraseMe);
   }
-  return 1;
+  if(band >= minTrial2Band) {
+#ifdef MULTITHREADED
+    for(int c=0; c<channels; c++) {
+      pthread_mutex_lock(&trial2Mutex[c]);
+    }
+#endif
+    adjustInit(trial2RingBuf,trial2GrainBuf);
+#ifdef MULTITHREADED
+    for(int c=channels-1; c>=0; c--) {
+      pthread_mutex_unlock(&trial2Mutex[c]);
+    }
+#endif
+    adjust(trial2GrainBuf,mag1Queue,minCutSep1,mag11,dmag1,x11,adjust2time,slice);
+  }
+  if(channels == 2) {
+    for(int c=0; c<2; c++) {
+      for(TrackPoint *pc = slice[c]->bottom;
+          pc;
+          pc = pc->pn) {
+        pc->bOwned = false;
+        pc->cont = NULL;
+      }
+    }
+    for(int c=0; c<2; c++) {
+      int c2 = (c==0?1:0);
+      TrackPoint *begin = slice[c2]->bottom;
+      for(TrackPoint *pc = slice[c]->bottom;
+          pc;
+          pc = pc->pn) {
+        float F;
+        pc->cont = nearestForward(&begin,pc,&F,maxCost2Stereo,maxDFStereo,dMCoeff2Stereo);
+      }
+    }
+    for(TrackPoint *p0 = slice[0]->bottom;
+        p0;
+        p0 = p0->pn) {
+      TrackPoint *p1 = p0->cont;
+      if(p1 && p1->cont == p0) {
+        p0->dupStereo = p1;
+        p1->dupStereo = p0;
+      }
+    }
+  }
+  adjust2time++;
 }
 
-void sms :: synthTracks(real a, real f0, real f1)
+void SMS :: adjust1(float stretch, float pitch0, float pitch1)
 {
+  Slice* slice[2];
+  for(int c=0; c<channels; c++) {
 #ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
+    pthread_mutex_lock(&sliceMutex[c]);
 #endif
-  unsigned short h1 = hSynth.read(hSynth.readPos);
+    slice[c] = adjust1SliceQueue[c].front(); adjust1SliceQueue[c].pop();
 #ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
+    pthread_mutex_unlock(&sliceMutex[c]);
 #endif
-  real h2 = (a*(real)h1);			  
-  real fScale0, fScale1;
-  real mScale;
-  h2 *= (real)M;
-  mScale = 1.0f / (real)M;
-  fScale0 = f0 * mScale;
-  fScale1 = f1 * mScale;    
+  }
+  if(band >= minTrial1Band) {
+#ifdef MULTITHREADED
+    for(int c=0; c<channels; c++) {
+      pthread_mutex_lock(&trial1Mutex[c]);
+    }
+#endif
+    adjustInit(trial1RingBuf,trial1GrainBuf);
+#ifdef MULTITHREADED
+    for(int c=channels-1; c>=0; c--) {
+      pthread_mutex_unlock(&trial1Mutex[c]);
+    }
+#endif
+    adjust(trial1GrainBuf,mag0Queue,minCutSep1,mag01,dmag0,x01,adjust1time,slice);
+  }
+  for(int c=0; c<channels; c++) {
+    delete slice[c];
+  }
+  double h2 = stretch * h1;
   h2cum += h2;
-  int h2i = round2int(h2cum);
-  h2cum -= h2i;
+  int h2i = lrint(h2cum);
+  h2cum -= h2i; 
+  for(int c=0; c<channels; c++) {
 #ifdef MULTITHREADED
-  pthread_mutex_lock(&bufferMutex);
+    pthread_mutex_lock(&renderMutex[c]);
 #endif
-  // extra slack for long fall times
-  int grow = h2i<<1;
-  sines2->N = grow;
-  sines2->grow(grow);
+    nRender[c].push(h2i);
 #ifdef MULTITHREADED
-  pthread_mutex_unlock(&bufferMutex);
+    pthread_mutex_unlock(&renderMutex[c]);
 #endif
-
-  for(int c=0;c<channels;c++) {
-    list<track*> tracks;
+  }
+  list<TrackPoint*> dupStereoPostponed;
+  for(int c=0; c<channels; c++) {
 #ifdef MULTITHREADED
     pthread_mutex_lock(&trackMutex[c]);
 #endif
-    for(list<track*>::iterator tt=trax[c]->begin();
-        tt!=trax[c]->end(); ) {  
-      track *t = (*tt);
-      if(t->end <= synthtime) {
-        if(!t->descendant||t->descendant->isDone()) {
-          list<track*>::iterator eraseMe = tt;
-          tt++;
-          trax[c]->erase(eraseMe);
-          ta->destroy(t);
-        } else {
-          tt++;
+    for(list<Track*>::iterator tt = renderTracks[c].begin(); 
+        tt != renderTracks[c].end();
+        ++tt) {
+      Track *t = (*tt);
+      if(adjust1time >= t->start) {
+        if(adjust1time <= t->last) {
+          TrackPoint *tp = t->updateFPH(adjust1time,synthModeOutput,h2i,pitch0,pitch1);
+          if(tp) dupStereoPostponed.push_back(tp);
         }
-      } else if(synthtime >= t->start) {
-        t->synth(sines2,sines2->writePos,c,synthtime,h2i,fScale0,fScale1,mScale);
-        tt++;
       } else {
         break;
       }
     }
 #ifdef MULTITHREADED
     pthread_mutex_unlock(&trackMutex[c]);
-#endif   
+#endif  
   }
-
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&bufferMutex);
-#endif
-  sines2->writePos += h2i;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&bufferMutex);
-#endif
-  samplePos += h2i;
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  hSynth.advance(1);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  synthtime++;
+  for(list<TrackPoint*>::iterator tpi = dupStereoPostponed.begin();
+      tpi != dupStereoPostponed.end();
+      tpi++) {
+    TrackPoint *tp = (*tpi);
+    tp->phSynth = canon2PI(tp->dupStereo->phSynth + tp->ph - tp->dupStereo->ph);
+  }
+  adjust1time++;
 }
 
-long sms :: n_readable()
+int SMS :: findCut(float *dmag, int k0, int maxK) 
+{
+  int k;
+  for(k = max(1,k0); k <= maxK; k++) {
+    float dd0 = dmag[k+1] - dmag[k];
+    if(dd0 > 0.0f) {
+      float d02 = square(dmag[k+1] + dmag[k]);
+      if(dd0 * square(dmag[k] + dmag[k-1]) > (dmag[k] - dmag[k-1]) * d02
+         &&
+         dd0 * square(dmag[k+2] + dmag[k+1]) > (dmag[k+2] - dmag[k+1]) * d02) {
+        break;
+      }
+    }
+  }
+  return k;
+}
+
+void SMS :: adjustInit(ArrayRingBuffer<float> **trialRingBuf,
+                       GrainBuf *trialGrainBuf)
+{
+  long n = trialRingBuf[0]->nReadable();
+  for(int c=1; c<channels; c++) {
+    n = min(n,trialRingBuf[c]->nReadable());
+  }
+  long ndone = 0;
+  while(n) {
+    audio abuf[512];
+    long ntodo = min(512L,n);
+    for(int c=0; c<channels; c++) {
+      float *fbuf = trialRingBuf[c]->getReadBuf();
+      for(int k=0; k<ntodo; k++) {
+        abuf[k][c] = fbuf[ndone+k];
+      }
+    }
+    for(int c=channels; c<2; c++) {
+      for(int k=0; k<ntodo; k++) {
+        abuf[k][c] = 0.0f;
+      }
+    }
+    trialGrainBuf->write(abuf,ntodo);
+    ndone += ntodo;
+    n -= ntodo;
+  }
+  for(int c=0; c<channels; c++) {
+    trialRingBuf[c]->advance(ndone);
+  }
+}
+
+void SMS :: adjust(GrainBuf *trialGrainBuf,
+                   queue<float*> *magQueue,
+                   int minCutSep,
+                   float **_mag1,
+                   float **_dmag1,
+                   audio **x1,
+                   const TimeType &time,
+                   Slice **slices)
+{
+  grain *g = trialGrainBuf->read(trialGrainBuf->readPos);
+  g->analyze();
+  for(int c=0; c<channels; c++) {    
+    Slice *slice = slices[c];
+    TrackPoint *p = slice->bottom;
+    if(c == 0) {
+      c2even(g->x, x1[0], N);
+    } else {
+      c2odd(g->x, x1[1], N);
+    }
+    float *mag1 = _mag1[c];
+    calcmags(mag1, x1[c]);
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&magMutex[c]);
+#endif
+    float *mag0 = magQueue[c].front(); magQueue[c].pop();
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&magMutex[c]);
+#endif
+    if(p) {
+      float *dmag = _dmag1[c];
+      list<int> cuts;
+      int k3 = min(Nover2,maxK+2);
+      dmag[0] = mag1[0];
+      for(int k=max(1,minK-2); k<k3; k++) {
+        dmag[k] = mag1[k] - mag1[k-1];
+      }
+      int k = minK;
+      while(true) {
+        k = findCut(dmag,k+1,maxK);
+        if(k >= maxK) {
+          break;
+        } else  {
+          cuts.push_back(k);
+        }
+      }
+      bool bDone = false;
+      while(!bDone) {
+        bDone = true;
+        for(list<int>::iterator i = cuts.begin();
+            i != cuts.end();
+            ++i) {
+          int k0 = *i;
+          list<int>::iterator ibad = cuts.end();
+          list<int>::iterator i2 = i;
+          ++i2;
+          float maxY = 0.0f;
+          for(;
+              i2 != cuts.end();
+              ++i2) {
+            int k2 = *i2;
+            if(k2 - k0 >= minCutSep) break;
+            float y = mag0[k2] * mag1[k2];
+            if(y >= maxY) {
+              maxY = y;
+              ibad = i2;
+            }
+            k0 = k2;
+          }
+          if(ibad != cuts.end()) {
+            if(mag0[*i] * mag1[*i] > maxY) {
+              ibad = i;
+            }
+            cuts.erase(ibad);
+            bDone = false;
+            break;
+          }
+        }
+      }
+      cuts.push_front(minK);
+      cuts.push_back(maxK);
+      list<int>::iterator i = cuts.begin();
+      while(p) {
+        int k0 = *i;
+        ++i;
+        if(i == cuts.end()) break;
+        int k2 = *i;
+        if(p->x > k2) continue;
+        float m0 = 0.0f;
+        float m1 = 0.0f;
+        for(int k=k0;k<=k2;k++) {
+          m0 += mag0[k];
+          m1 += mag1[k];
+        }
+        float s = (m1>m0?sqrt(m0/m1):1.0f);
+        while(p && p->x <= k2) {
+          p->m *= s;
+          p = p->pn;
+        }
+      }
+    }
+    free(mag0);
+  }
+  trialGrainBuf->advance(1);
+}
+
+void SMS :: render(int c, list<SBSMSRenderer*> &renderers)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&renderMutex[c]);
+#endif
+  int n = nRender[c].front(); nRender[c].pop();
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&renderMutex[c]);
+#endif
+  TimeType time = synthtime[c];
+  for(list<SBSMSRenderer*>::iterator i = renderers.begin(); i != renderers.end(); ++i) {
+    SBSMSRenderer *renderer = *i;
+    renderer->startTime(c,time,n);
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  for(list<Track*>::iterator tt = renderTracks[c].begin(); 
+      tt != renderTracks[c].end();) {
+    Track *t = (*tt);
+    if(t->bEnded && time > t->last) {
+      list<Track*>::iterator eraseMe = tt;
+      ++tt;
+      renderTracks[c].erase(eraseMe);
+      delete t;
+    } else if(time >= t->start) {
+      if(time <= t->last) {
+        t->updateM(time,synthModeOutput);
+        if(band == 4 || band != 4) {
+        for(list<SBSMSRenderer*>::iterator i = renderers.begin(); i != renderers.end(); ++i) {
+          SBSMSRenderer *renderer = *i;
+          renderer->render(c,t);
+        }
+        }
+        t->step(time);
+      }
+      ++tt;
+    } else {
+      break;
+    }
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif  
+  for(list<SBSMSRenderer*>::iterator i = renderers.begin(); i != renderers.end(); ++i) {
+    SBSMSRenderer *renderer = *i;  
+    renderer->endTime(c);
+  }
+  synthtime[c]++;
+}
+
+TrackPoint *SMS :: nearestForward(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF, float dMCoeff2, float dNCoeff2) 
+{
+  *minCost2 = TrackPointNoCont;
+  float minF = tp0->f - maxDF;
+  float maxF = tp0->f + maxDF;
+  float maxDF2 = square(maxDF);
+  while((*begin) && (*begin)->f < minF) {
+    (*begin) = (*begin)->pn;
+  }
+  TrackPoint *mintp1 = NULL;
+  for(TrackPoint *tp1 = (*begin);
+      tp1;
+      tp1 = tp1->pn) {
+    if(tp1->bOwned) continue;
+    float df2 = square(tp1->f - tp0->f);
+    if(df2 > maxDF2) break;
+    float dM2 = dBApprox(tp1->m2,tp0->m2);
+    float cost2 = (df2+dMCoeff2*dM2);
+    if(0 && dNCoeff2 != 0.0f) {
+      if(tp0->owner) {
+        cost2 += dNCoeff2 * (tp0->owner->size()<minTrackSize?1.0f:0.0f);
+      } else {
+        cost2 += dNCoeff2 * (tp1->owner->size()<minTrackSize?1.0f:0.0f);
+      }
+    }
+    if(cost2 > maxCost2) continue;
+    if(cost2 < (*minCost2)) {
+      (*minCost2) = cost2;
+      mintp1 = tp1;
+    }
+  }
+  return mintp1;
+}
+
+TrackPoint *SMS :: nearestReverse(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF, float dMCoeff2, float dNCoeff2) 
+{
+  *minCost2 = TrackPointNoCont;
+  float minF = tp0->f - maxDF;
+  float maxF = tp0->f + maxDF;
+  float maxDF2 = square(maxDF);
+  while((*begin) && (*begin)->f > maxF) {
+    (*begin) = (*begin)->pp;
+  }
+  TrackPoint *mintp1 = NULL;
+  for(TrackPoint *tp1 = (*begin);
+      tp1;
+      tp1 = tp1->pp) {
+    if(tp1->bOwned) continue;
+    float df2 = square(tp1->f - tp0->f);
+    if(df2 > maxDF2) break;
+    float dM2 = dBApprox(tp1->m2,tp0->m2);
+    float cost2 = (df2+dMCoeff2*dM2);
+    if(0 &&dNCoeff2 != 0.0f) {
+      if(tp0->owner) {
+        cost2 += dNCoeff2 * (tp0->owner->size()<minTrackSize?1.0f:0.0f);
+      } else {
+        cost2 += dNCoeff2 * (tp1->owner->size()<minTrackSize?1.0f:0.0f);
+      }
+    }
+    if(cost2 > maxCost2) continue;
+    if(cost2 < (*minCost2)) {
+      (*minCost2) = cost2;
+      mintp1 = tp1;
+    }
+  }
+  return mintp1;
+}
+
+TrackPoint *SMS :: nearestForward2(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF, float dMCoeff2, float dNCoeff2) 
+{
+  *minCost2 = TrackPointNoCont;
+  float minF = tp0->f - maxDF;
+  float maxF = tp0->f + maxDF;
+  float maxDF2 = square(maxDF);
+  while((*begin) && (*begin)->f < minF) {
+    (*begin) = (*begin)->pn;
+  }
+  TrackPoint *mintp1 = NULL;
+  for(TrackPoint *tp1 = (*begin);
+      tp1;
+      tp1 = tp1->pn) {
+    if(!tp1->owner) continue;
+    float df2 = square(tp1->f - tp0->f);
+    if(df2 > maxDF2) break;
+    float dM2 = dBApprox(0.25f*tp1->m2,tp0->m2);
+    float cost2 = (df2+dMCoeff2*dM2);
+    if(cost2 > maxCost2) continue;
+    if(cost2 < (*minCost2)) {
+      (*minCost2) = cost2;
+      mintp1 = tp1;
+    }
+  }
+  return mintp1;
+}
+
+TrackPoint *SMS :: nearestReverse2(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF, float dMCoeff2, float dNCoeff2) 
+{
+  *minCost2 = TrackPointNoCont;
+  float minF = tp0->f - maxDF;
+  float maxF = tp0->f + maxDF;
+  float maxDF2 = square(maxDF);
+  while((*begin) && (*begin)->f > maxF) {
+    (*begin) = (*begin)->pp;
+  }
+  TrackPoint *mintp1 = NULL;
+  for(TrackPoint *tp1 = (*begin);
+      tp1;
+      tp1 = tp1->pp) {
+    if(!tp1->owner) continue;
+    float df2 = square(tp1->f - tp0->f);
+    if(df2 > maxDF2) break;
+    float dM2 = dBApprox(tp1->m2,tp0->m2);
+    float cost2 = (df2+dMCoeff2*dM2);
+    if(cost2 > maxCost2) continue;
+    if(cost2 < (*minCost2)) {
+      (*minCost2) = cost2;
+      mintp1 = tp1;
+    }
+  }
+  return mintp1;
+}
+
+void SMS :: connect(TrackPoint *tp0, TrackPoint *tp1, int ilo, int c)
+{
+  TimeType time = assigntime[c];
+  if(tp0->slice->band == tp1->slice->band) {
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&trackMutex[c]);
+#endif    
+    tp0->owner->push_back(tp1);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&trackMutex[c]);
+#endif
+  } else if(tp0->slice->band < tp1->slice->band) {
+    Track *precursor = tp0->owner;
+    if(ilo == 1) {
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&trackMutex[c]);
+#endif
+      precursor->push_back(tp1);
+      precursor->endTrack(true);
+      TimeType time = precursor->end/res;
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&trackMutex[c]);
+#endif
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&lo->trackMutex[c]);
+#endif
+      lo->createTrack(c,tp1,time,true);
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&lo->trackMutex[c]);
+#endif
+    } else {
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&trackMutex[c]);
+#endif
+      TimeType time = precursor->end/res;
+      precursor->endTrack(true);
+      TrackPoint *last = precursor->back();
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&trackMutex[c]);
+#endif
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&lo->trackMutex[c]);
+#endif
+      Track *t = lo->createTrack(c,last,time,true);
+      t->push_back(tp1);
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&lo->trackMutex[c]);
+#endif
+      last->owner = precursor;
+    }
+  } else {
+    Track *precursor = tp0->owner;
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&trackMutex[c]);
+#endif
+    precursor->push_back(tp1);
+    precursor->endTrack(true);
+    TimeType time = precursor->end*hi->res;
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&trackMutex[c]);
+#endif
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&hi->trackMutex[c]);
+#endif
+    hi->createTrack(c,tp1,time,true);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&hi->trackMutex[c]);
+#endif
+  }
+  tp0->bConnected = true;
+  tp1->bConnected = true;
+  tp0->bOwned = true;
+  tp1->bOwned = true;
+  if(tp0->dupcont) {
+    TrackPoint *dup = tp0->dupcont;
+    if(!dup->owner) {
+      dup->bOwned = true;
+      dup->bDelete = true;
+    }
+  }
+  TrackPoint *dup2 = tp0->dup[2];
+  if(dup2 && dup2 != tp1 && !dup2->owner) {
+    dup2->bOwned = true;
+    dup2->bDelete = true;
+  }
+  for(int d=0;d<3;d++) {
+    TrackPoint *dup = tp1->dup[d];
+    if(dup && !dup->owner && (d<2 || dup->slice->band < tp1->slice->band)) {
+      dup->bOwned = true;
+      dup->bDelete = true;
+    }
+  }
+}
+
+void SMS :: mark(long offset, int c)
+{
+  mark(offset,0,c);
+  if(offset&resMask) {
+    mark(offset,1,c);
+  }
+}
+
+void SMS :: mark(long offset, long offsetlo, int c)
+{
+  if(!lo) return;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&lo->sliceMutex[c]);
+#endif
+  Slice *sliceL1 = lo->sliceBuffer[c].read(lo->sliceBuffer[c].readPos+offset/res+offsetlo);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&lo->sliceMutex[c]);
+#endif
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&sliceMutex[c]);
+#endif
+  Slice *sliceM1 = sliceBuffer[c].read(sliceBuffer[c].readPos+offset);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&sliceMutex[c]);
+#endif
+  bool b0 = !(offset&resMask);
+  bool bDone = false;
+  bool bLastDitch = false;
+  while(!bDone) {
+    int nToCont = 0;
+    int nCont = 0;
+    TrackPoint *rbegin = NULL;
+    TrackPoint *begin = sliceL1->bottom;
+    for(TrackPoint *tp = sliceM1->bottom;
+        tp;
+        tp = tp->pn) {
+      if(tp->bMarked) continue;
+      if(tp->f > maxFMatchM) {
+        break;
+      } else {
+        rbegin = tp;
+      }
+      float F;
+      tp->cont = nearestForward(&begin,tp,&F,maxCost2Match,maxDFMatch,dMCoeff2Match);
+      if(tp->cont) nToCont++;
+    }
+    if(sliceL1) {
+      for(TrackPoint *tp = sliceL1->top;
+          tp;
+          tp = tp->pp) {
+        if(tp->f < minFLo) break;
+        float F;
+        tp->cont = nearestReverse(&rbegin,tp,&F,maxCost2Match,maxDFMatch,dMCoeff2Match);
+      }
+    }
+    for(TrackPoint *tp0 = sliceM1->bottom;
+        tp0;
+        tp0 = tp0->pn) {
+      if(tp0->bMarked) continue;
+      if(tp0->f > maxFMatchM) {
+        break;
+      }
+      TrackPoint *tp1 = tp0->cont;
+      if(tp1) {
+        if(bLastDitch || tp1->cont == tp0) {
+          nCont++;
+          bool bAlreadyMarked = false;
+          if(b0) {
+            if(tp1->dup[1] || tp0->dup[1]) {
+              bAlreadyMarked = true;
+            }
+          } else {
+            if(tp1->dup[2-2*offsetlo] || tp0->dup[2*offsetlo]) {
+              bAlreadyMarked = true;
+            }
+          }
+          if(!bAlreadyMarked) {
+            if(b0) {
+              tp1->dup[1] = tp0;
+              tp0->dup[1] = tp1;
+            } else {
+              tp1->dup[2-2*offsetlo] = tp0;
+              tp0->dup[2*offsetlo] = tp1;
+            }
+          }
+          tp0->bMarked = true;
+        }
+      }
+    }
+    bDone = (nToCont == nCont);
+    bLastDitch = (!bDone && nCont==0);
+  }
+}
+
+void SMS :: assignStart(long offset, int c)
+{
+  bAssignDone[c] = false;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&sliceMutex[c]);
+#endif
+  sliceM0[c] = sliceBuffer[c].read(sliceBuffer[c].readPos+offset);
+  sliceM1[c] = sliceBuffer[c].read(sliceBuffer[c].readPos+offset+1);
+  if(res == 2) {
+    sliceM2[c] = sliceBuffer[c].read(sliceBuffer[c].readPos+offset+2);
+  } else {
+    sliceM2[c] = NULL;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&sliceMutex[c]);	
+#endif
+  for(TrackPoint *tp = sliceM0[c]->bottom;
+      tp;
+      tp = tp->pn) {
+    if(!tp->owner->bEnded) {
+      tp->owner->bEnd = true;
+      tp->bConnected = false;
+      tp->bOwned = false;
+    } else {
+      tp->bConnected = true;
+      tp->bOwned = true;
+    }
+  }
+#ifdef MULTITHREADED
+  if(hi) pthread_mutex_lock(&hi->sliceMutex[c]);
+#endif
+  sliceH0[c] = hi?hi->sliceBuffer[c].read(hi->sliceBuffer[c].readPos+(offset+1)*hi->res):NULL;
+  sliceH0[c] = NULL;
+  sliceH1[c] = hi?hi->sliceBuffer[c].read(hi->sliceBuffer[c].readPos+(offset+1)*hi->res):NULL;  
+#ifdef MULTITHREADED 
+  if(hi) pthread_mutex_unlock(&hi->sliceMutex[c]);
+#endif
+#ifdef MULTITHREADED
+  if(lo) pthread_mutex_lock(&lo->sliceMutex[c]);
+#endif
+  sliceL0[c] = lo?lo->sliceBuffer[c].read(lo->sliceBuffer[c].readPos+offset/res+1):NULL;
+  sliceL0[c] = NULL;
+  sliceL1[c] = lo?lo->sliceBuffer[c].read(lo->sliceBuffer[c].readPos+offset/res+1):NULL;
+#ifdef MULTITHREADED
+	if(lo) pthread_mutex_unlock(&lo->sliceMutex[c]);
+#endif
+}
+
+void SMS :: assignInit(long offset, int c)
+{
+  for(TrackPoint *tp = sliceM1[c]->bottom;
+      tp;
+      tp = tp->pn) {
+    tp->cont = NULL;
+    tp->contF = TrackPointNoCont;
+  }
+  if(sliceM2[c]) {
+    for(TrackPoint *tp = sliceM2[c]->bottom;
+        tp;
+        tp = tp->pn) {
+      tp->cont = NULL;
+      tp->contF = TrackPointNoCont;
+    }
+  }
+}
+
+void SMS :: assignFind(long offset, int c)
+{
+  if(bAssignDone[c]) return;
+  Slice *sliceM0 = this->sliceM0[c];
+  Slice *sliceM1 = this->sliceM1[c];
+  Slice *sliceM2 = this->sliceM2[c];
+  Slice *sliceL1 = this->sliceL1[c];
+  Slice *sliceH1 = this->sliceH1[c];
+  TrackPoint *begin;
+  begin = sliceM0->bottom;
+  for(TrackPoint *tp = sliceM1->bottom;
+      tp;
+      tp = tp->pn) {
+    if(tp->bOwned) continue;
+    float F;	
+    tp->bConnect = false;
+    TrackPoint *minM = nearestForward(&begin,tp,&F,maxCost2,maxDF,dMCoeff2,dNCoeff2);
+    if(minM && F < tp->contF) {
+      tp->cont = minM;
+      tp->contF = F;
+    }
+  }
+  if(sliceL1) {
+    TrackPoint *rbegin = sliceM0->top;
+    for(TrackPoint *tp = sliceL1->top;
+        tp;
+        tp = tp->pp) {
+      if(tp->bOwned) continue;
+      if(tp->f < minFLo) break;
+      float F;
+      TrackPoint *minL = nearestReverse(&rbegin,tp,&F,maxCost2,maxDF,dMCoeff2,dNCoeff2);
+      if(minL) {
+        F *= localFavorRatio;
+        if(F < tp->contF) {
+          tp->cont = minL;
+          tp->contF = F;
+        }
+      }
+    }
+  }
+  begin = sliceM0->bottom;
+  if(sliceH1) {
+    for(TrackPoint *tp = sliceH1->bottom;
+        tp;
+        tp = tp->pn) {
+      if(tp->bOwned) continue;
+      if(tp->f > maxFHi) break;
+      float F;
+      TrackPoint *minH = nearestForward(&begin,tp,&F,maxCost2,maxDF,dMCoeff2,dNCoeff2);
+      if(minH) {
+        F *= localFavorRatio;
+        if(F < tp->contF) {
+          tp->cont = minH;
+          tp->contF = F;
+        }
+      }
+    }
+  }
+  if(sliceM2 && !(offset&resMask)) {
+    begin = sliceM1->bottom;
+    for(TrackPoint *tp = sliceM2->bottom;
+        tp;
+        tp = tp->pn) {
+      if(tp->bOwned) continue;
+      float F;	
+      tp->bConnect = false;
+      TrackPoint *minM = nearestForward(&begin,tp,&F,maxCost2,maxDF,dMCoeff2);
+      if(minM) {
+        tp->cont = minM;
+        tp->contF = F;
+      }
+    }
+    if(sliceL1) {
+      for(TrackPoint *tp = sliceM2->bottom;
+          tp;
+          tp = tp->pn) {
+        if(tp->bOwned) continue;
+        if(tp->f > maxFMid) break;
+        float F;	
+        TrackPoint *rbegin = sliceL1->top;
+        TrackPoint *minL = nearestReverse(&rbegin,tp,&F,maxCost2,maxDF,dMCoeff2);
+        if(minL) {
+          F *= localFavorRatio;
+          if(F < tp->contF) {
+            tp->cont = minL;
+            tp->contF = F;
+          }
+        }
+      }
+    }
+  }
+}
+
+bool SMS :: assignConnect(long offset, int c, bool bLastDitch)
+{
+  if(bAssignDone[c]) return false;
+  Slice *sliceM0 = this->sliceM0[c];
+  Slice *sliceM1 = this->sliceM1[c];
+  Slice *sliceL1 = this->sliceL1[c];
+  Slice *sliceH1 = this->sliceH1[c];
+  int nToCont = 0;
+  int nCont = 0;
+  bool b0 = !(offset&resMask);
+  int ilo;
+  if(res == 2 && b0) {
+    ilo = 0;
+  } else {
+    ilo = 1;
+  }
+  TrackPoint *beginM1 = sliceM1->bottom;
+  TrackPoint *beginH1;
+  if(sliceH1) beginH1 = sliceH1->bottom;
+  for(TrackPoint *tp = sliceM0->bottom;
+      tp;
+      tp = tp->pn) {
+    if(tp->bOwned) continue;
+    float FM1 = TrackPointNoCont;
+    float FL1 = TrackPointNoCont;
+    float FH1 = TrackPointNoCont;
+    TrackPoint *minM1 = nearestForward(&beginM1,tp,&FM1,maxCost2,maxDF,dMCoeff2,dNCoeff2);
+    TrackPoint *minL1 = NULL;
+    if(sliceL1 && tp->f < maxFMid) {
+      TrackPoint *rbeginL1 = sliceL1->top;
+      minL1 = nearestReverse(&rbeginL1,tp,&FL1,maxCost2,maxDF,dMCoeff2,dNCoeff2);
+      FL1 *= localFavorRatio;
+    }
+    TrackPoint *minH1 = NULL;
+    if(sliceH1 && tp->f > minFMid) {
+      minH1 = nearestForward(&beginH1,tp,&FH1,maxCost2,maxDF,dMCoeff2,dNCoeff2);
+      FH1 *= localFavorRatio;
+    }
+    if(minM1 &&
+       ((FM1<=FH1 && FM1<=FL1)
+        ||(minL1 && FL1<=FH1 && FL1<=FM1 && minL1->dup[ilo] == minM1)
+        ||(minH1 && FH1<=FL1 && FH1<=FM1 && minH1->dup[1] == minM1))) {
+      if(ilo == 1 && minL1 && minL1->dup[1] == minM1) {
+        tp->dupcont = minL1;
+      } else if(minH1 && minH1->dup[1] == minM1) {
+        tp->dupcont = minH1;
+      } else {
+        tp->dupcont = NULL;
+      }
+      tp->contF = FM1;
+      tp->cont = minM1;
+      nToCont++;
+    } else if(minL1 && FL1<=FM1 && FL1<=FH1) {
+      if(minM1 && minL1->dup[ilo] == minM1) {
+        tp->dupcont = minM1;
+      } else {
+        tp->dupcont = NULL;
+      }
+      tp->contF = FL1;
+      tp->cont = minL1;
+      nToCont++;
+    } else if(minH1 && FH1<=FM1 && FH1<=FL1) {
+      if(minM1 && minH1->dup[1] == minM1) {
+        tp->dupcont = minM1;
+      } else {
+        tp->dupcont = NULL;
+      }
+      tp->contF = FH1;
+      tp->cont = minH1;
+      nToCont++;
+    } else {
+      tp->cont = NULL;
+    }
+  }
+  for(TrackPoint *tp0 = sliceM0->bottom;
+      tp0;
+      tp0 = tp0->pn) {
+    if(tp0->bOwned) continue;
+    tp0->bConnect = false;
+    TrackPoint *tp1 = tp0->cont;
+    TimeType time = assigntime[c];
+    if(tp1 && !tp1->bOwned &&
+       (bLastDitch ||
+        (tp1->cont == tp0) ||
+        ((tp1->cont && tp0->contF <= tp1->cont->contF) &&
+         ((tp1->cont->dup[0] == tp0) ||
+          (tp1->cont->dup[1] == tp0))))) {
+      tp1->cont = tp0;
+      tp0->bConnect = true;
+      tp1->bConnect = true;
+    }
+  }
+  for(TrackPoint *tp0 = sliceM0->bottom;
+      tp0;
+      tp0 = tp0->pn) {
+    if(tp0->bOwned) continue;
+    TrackPoint *tp1 = tp0->cont;
+    if(tp0->bConnect && tp1 && !tp1->bOwned && tp1->bConnect && tp1->cont == tp0) {
+      TrackPoint *dupcont = tp0->dupcont;
+      if(dupcont && dupcont->bConnect) {
+        if(!tp1->bConnected && !dupcont->bConnected) {
+          if(!tp0->bConnected && (dupcont->cont == NULL || tp0->contF <= dupcont->cont->contF)) {
+            nCont++;
+            connect(tp0,tp1,ilo,c);
+            tp0->owner->bEnd = false;
+            dupcont->bConnect = false;
+          } else if(dupcont->cont && !dupcont->cont->bConnected) {
+            nCont++;
+            connect(dupcont->cont,dupcont,ilo,c);
+            dupcont->cont->owner->bEnd = false;
+            tp1->bConnect = false;
+          }
+        }
+      } else if(!tp0->bConnected && !tp1->bConnected) {
+        nCont++;
+        connect(tp0,tp1,ilo,c);
+        tp0->owner->bEnd = false;
+      }
+    }
+  }
+  bAssignDone[c] = (nToCont == nCont || bLastDitch);
+  return !(bAssignDone[c] || nCont == 0);
+}
+
+void SMS :: start(long offset, int c)
+{
+  started[c].clear();
+  ended[c].clear();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  for(list<Track*>::iterator tt = assignTracks[c].begin(); 
+      tt != assignTracks[c].end(); ) {
+    Track *t = (*tt);
+    bool bKeep;  
+    if(t->bEnded) {
+      bKeep = ((!t->bRender) && (t->bStitch || t->size() >= minTrackSize));
+      if(assigntime[c] > t->last) {
+        returnTrackIndex(c,t);
+        list<Track*>::iterator eraseMe = tt;
+        ++tt;
+        assignTracks[c].erase(eraseMe);
+      } else {
+        ++tt;
+      }
+    } else if(t->bEnd) {
+      bKeep = (t->bStitch || t->size() >= minTrackSize);
+      if(bKeep) {
+        bKeep = !t->bRender;
+        t->endTrack(false);
+        ended[c].push_back(t->back());
+        ++tt;
+      } else {
+        list<Track*>::iterator eraseMe = tt;
+        ++tt;
+        assignTracks[c].erase(eraseMe);
+        returnTrackIndex(c,t);
+        delete t;
+        continue;
+      }
+    } else {
+      bKeep = ((!t->bRender) && (t->bStitch || t->size() >= minTrackSize));
+      ++tt;
+    }
+    if(bKeep) {
+      list<Track*>::reverse_iterator tt0 = renderTracks[c].rbegin();
+      while(tt0 != renderTracks[c].rend()) {
+        Track *t0 = *tt0;
+        if(t->start >= t0->start) {
+          break;
+        }
+        tt0++;
+      }
+      renderTracks[c].insert(tt0.base(),t);        
+      t->bRender = true;
+    }
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&sliceMutex[c]);
+#endif
+  Slice *sliceM0 = sliceBuffer[c].read(sliceBuffer[c].readPos+offset);
+  adjust2SliceQueue[c].push(sliceM0);
+  adjust1SliceQueue[c].push(sliceM0);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&sliceMutex[c]);	
+#endif
+  for(TrackPoint *tp = sliceM0->bottom;
+      tp;) {
+    TrackPoint *tpn = tp->pn;
+    if(tp->bOwned) {
+      if(tp->bDelete) {
+        tp->destroy();
+      }
+    } else {
+      Track *t = createTrack(c,tp,assigntime[c],false);
+      started[c].push_back(tp);
+      for(int d=0;d<2;d++) {
+        TrackPoint *dup = tp->dup[d];
+        if(dup && !dup->owner) {
+          dup->destroy();
+        }
+      }
+    }
+    tp = tpn;
+  }
+  assigntime[c]++;
+}
+
+void SMS :: splitMerge(int c)
+{
+  TimeType time = assigntime[c] - 1;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  Slice *sliceM0 = this->sliceM0[c];
+  Slice *sliceL0 = this->sliceL0[c];
+  Slice *sliceH0 = this->sliceH0[c];
+  Slice *sliceM1 = this->sliceM1[c];
+  Slice *sliceL1 = this->sliceL1[c];
+  Slice *sliceH1 = this->sliceH1[c];
+  TrackPoint *rbeginL0 = sliceL0?sliceL0->top:NULL;
+  TrackPoint *beginM0 = sliceM0->bottom;
+  TrackPoint *beginH0 = sliceH0?sliceH0->bottom:NULL;
+  for(list<TrackPoint*>::iterator i = started[c].begin();
+      i != started[c].end();
+      ++i) {
+    TrackPoint *tp = *i;
+    float F, FL, FH;	
+    tp->cont = nearestForward2(&beginM0,tp,&F,maxCost2SplitMerge,maxDFSplitMerge,dMCoeff2SplitMerge);
+    TrackPoint *minL = nearestReverse2(&rbeginL0,tp,&FL,maxCost2SplitMerge,maxDFSplitMerge,dMCoeff2SplitMerge);
+    if(minL) {
+      FL *= localFavorRatio;
+      if(FL < F) {
+        tp->cont = minL;
+        F = FL;
+      }
+    }
+    TrackPoint *minH = nearestForward2(&beginH0,tp,&FH,maxCost2SplitMerge,maxDFSplitMerge,dMCoeff2SplitMerge);
+    if(minH) {
+      FH *= localFavorRatio;
+      if(FH < F) {
+        tp->cont = minH;
+      }
+    }
+    if(1&&tp->cont) {
+      tp->owner->point.insert(tp->owner->point.begin(),tp->cont);
+      tp->owner->first--;
+      tp->owner->bStitch = true;
+      tp->bSplit = true;
+      tp->cont->bSplit = true;
+      tp->owner->bSplit = true;
+      tp->cont->refCount++;
+      tp->cont->owner->bStitch = true;
+    }
+  }
+
+  TrackPoint *rbeginL1 = sliceL1?sliceL1->top:NULL;
+  TrackPoint *beginM1 = sliceM1->bottom;
+  TrackPoint *beginH1 = sliceH1?sliceH1->bottom:NULL;
+  for(list<TrackPoint*>::iterator i = ended[c].begin();
+      i != ended[c].end();
+      ++i) {
+    TrackPoint *tp = *i;
+    float F, FL, FH;
+    tp->cont = nearestForward2(&beginM1,tp,&F,maxCost2SplitMerge,maxDFSplitMerge,dMCoeff2SplitMerge);
+    TrackPoint *minL = nearestReverse2(&rbeginL1,tp,&FL,maxCost2SplitMerge,maxDFSplitMerge,dMCoeff2SplitMerge);
+    if(minL) {
+      FL *= localFavorRatio;
+      if(FL < F) {
+        tp->cont = minL;
+        F = FL;
+      }
+    }
+    TrackPoint *minH = nearestForward2(&beginH1,tp,&FH,maxCost2SplitMerge,maxDFSplitMerge,dMCoeff2SplitMerge);
+    if(minH) {
+      FH *= localFavorRatio;
+      if(FH < F) {
+        tp->cont = minH;
+      }
+    }
+    if(1&&tp->cont) {
+      tp->owner->point.insert(tp->owner->point.end(),tp->cont);
+      tp->owner->last++;
+      tp->owner->bStitch = true;
+      tp->bMerge = true;
+      tp->cont->bMerge = true;
+      tp->owner->bMerge = true;
+      tp->cont->refCount++;
+      tp->cont->owner->bStitch = true;
+    }
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif
+}
+
+void SMS :: advance(int c)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&sliceMutex[c]);
+#endif
+  sliceBuffer[c].advance(1);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&sliceMutex[c]);
+#endif
+}
+
+void SMS :: add(grain *g0, grain *g1, grain *g2, int c)
+{
+  if(c == 0) {
+    if(band >= minTrial1Band) {
+      c2even(g0->x, x00[0], N);
+    }
+    if(band >= minTrial2Band) {
+      c2even(g1->x, x10[0], N);
+    }
+    c2even(g2->x, x2[0], N);
+  } else {
+    if(band >= minTrial1Band) {
+      c2odd(g0->x, x00[1], N);
+    }
+    if(band >= minTrial2Band) {
+      c2odd(g1->x, x10[1], N);
+    }
+    c2odd(g2->x, x2[1], N);
+  }
+
+  float *mag0;
+  if(band >= minTrial1Band) {
+    mag0 = (float*)malloc((Nover2+1)*sizeof(float));
+    calcmags(mag0, x00[c]);
+  }
+  float *mag1;
+  if(band >= minTrial2Band) {
+    mag1 = (float*)malloc((Nover2+1)*sizeof(float));
+    calcmags(mag1, x10[c]);
+  }
+  float mag2sum[1024];
+  memset(mag2sum,0,1024*sizeof(float));
+
+  float *mag2 = this->mag2[c];
+  calcmags(mag2sum, g2->x);
+  calcmags(mag2sum, x2[c]);
+  calcmags(mag2, x2[c]);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&magMutex[c]);
+#endif
+  if(band >= minTrial1Band) mag0Queue[c].push(mag0);
+  if(band >= minTrial2Band) mag1Queue[c].push(mag1);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&magMutex[c]);
+#endif
+  float magmax = mag2[0];
+  for(int k=1;k<=kEnd;k++) {
+    if(magmax < mag2[k]) magmax = mag2[k];
+  }
+  float peakmin = magmax * peakThresh;
+
+  float xt2 = 1.0f;
+  bool bTroughN1 = false;
+  bool bTroughN2 = false;
+  float x0 = 1.0f;
+  float y0 = mag2[1];
+  float x1 = 0.0f;
+  float y1 = 0.0f;
+  bool bX0 = !lo;
+  bool bX1 = false;
+  TrackPoint *prev = NULL;
+
+  /*
+  float xt2sum = 1.0f;
+  bool bTroughN1sum = false;
+  bool bTroughN2sum = false;
+  float x0sum = 1.0f;
+  float y0sum = mag2[1];
+  float x1sum = 0.0f;
+  float y1sum = 0.0f;
+  bool bX0sum = !lo;
+  bool bX1sum = false;
+  TrackPoint *prevsum = NULL;
+  TrackPoint *psum = NULL;
+  */
+
+  Slice *slice = new Slice(band,addtime[c]);
+
+  for(int k=1; k<=kEnd; k++) {
+    if(mag2[k] > peakmin && mag2[k] > mag2[k-1] && mag2[k] >= mag2[k+1]) {
+      if(k < kLo) {
+        x0 = findExtremum(mag2,mag2,k,&y0);
+        bX0 = true;
+      } else if(k > kHi) {
+        if(!bX1) {
+          x1 = findExtremum(mag2,mag2,k,&y1);
+          if(prev) {
+            prev->x01 = x1;
+            prev->y01 = y1;
+          }
+          bX1 = true;
+        }
+      } else {
+        TrackPoint *p = new TrackPoint(slice,peak2N,x2[c],mag2,mag2,k,N,band);
+
+        /*
+        if(psum) {
+          if(p->x - psum->x > peakWidth2) {
+            if(prev) {
+              prev->pn = psum;
+              psum->pp = prev;
+            } else {
+              slice->bottom = psum;
+            }
+            slice->top = psum;
+            prev = psum;
+            prevsum = psum;
+            psum->xtn2 = maxK;
+            bTroughN1sum = true;
+            bTroughN2sum = true;
+            psum->xtp2 = xt2sum;
+            psum->x01 = x0sum;
+            psum->y01 = y0sum;
+          } else {
+            delete psum;
+          }
+        }
+        psum = NULL;
+        */
+
+        if(prev) {
+          prev->pn = p;
+          p->pp = prev;
+        } else {
+          slice->bottom = p;
+        }
+        slice->top = p;
+        prev = p;
+        p->xtn2 = maxK;
+        bTroughN1 = true;
+        bTroughN2 = true;
+        p->xtp2 = xt2;
+        p->x01 = x0;
+        p->y01 = y0;
+      }
+    } else if(mag2[k] <= mag2[k-1] && mag2[k] <= mag2[k+1]) {
+      xt2 = findExtremum(mag2,mag2,k,NULL);
+      xt2 = max(1.0f,xt2);
+      xt2 = min((float)kEnd,xt2);
+      if(bTroughN2) {
+        prev->xtn2 = xt2;
+        bTroughN2 = false;
+      }
+    }
+
+    /*
+    if(mag2sum[k] > mag2sum[k-1] && mag2sum[k] >= mag2sum[k+1]) {
+      if(k < kLo) {
+        x0sum = findExtremum(mag2sum,mag2,k,&y0sum);
+        bX0sum = true;
+      } else if(k > kHi) {
+        if(!bX1sum) {
+          x1sum = findExtremum(mag2sum,mag2,k,&y1sum);
+          if(prevsum) {
+            prevsum->x01 = x1sum;
+            prevsum->y01 = y1sum;
+          }
+          bX1sum = true;
+        }
+      } else {
+        if(!prev || k - prev->x > peakWidth2) {
+          psum = new TrackPoint(slice,peak2N,x2[c],mag2sum,mag2,k,N,band);
+        }
+      }
+    } else if(mag2sum[k] <= mag2sum[k-1] && mag2sum[k] <= mag2sum[k+1]) {
+      xt2sum = findExtremum(mag2sum,mag2,k,NULL);
+      if(bTroughN2sum) {
+        prevsum->xtn2 = xt2;
+        bTroughN2sum = false;
+      }
+    }
+    */
+  }
+  if(bTroughN2) {
+    prev->xtn2 = kEnd;
+  }
+  if(!bX1 && !hi) {
+    x1 = kEnd;
+    y1 = mag2[kEnd];
+    bX1 = true;
+  }
+  float *dec2 = this->dec2[c];
+  memset(dec2,0,(Nover2+1)*sizeof(float));
+  if(bX0 && prev) {
+    int k1 = lrintf(x0);
+    int ko1 = k1 > x0 ? -1 : 1;
+    float kf1 = k1 > x0 ? k1 - x0 : x0 - k1; 
+    int k3 = min(kEnd,k1+peakWidth2);
+    for(int k=lrintf(slice->bottom->xtp2);k<=k3;k++) {
+      float m = interp2(k-k1,ko1,kf1);
+      dec2[k] += m * y0;
+    }
+  }
+  if(bX1 && prev) {
+    int k1 = lrintf(x1);
+    int ko1 = k1 > x1 ? -1 : 1;
+    float kf1 = k1 > x1 ? k1 - x1 : x1 - k1; 
+    int k3 = lrintf(slice->top->xtn2);
+    for(int k=max(0,k1-peakWidth2);k<=k3;k++) {
+      float m = interp2(k-k1,ko1,kf1);
+      dec2[k] += m * y1;
+    }
+  }
+  for(TrackPoint *p = slice->bottom;
+      p;
+      p = p->pn) {
+    int k1 = lrintf(p->x);
+    int ko1 = k1 > p->x ? -1 : 1;
+    float kf1 = k1 > p->x ? k1 - p->x : p->x - k1; 
+    int k0 = lrintf(p->xtp2);
+    float kf0 = (k0 > p->xtp2 ? k0 - p->xtp2 : p->xtp2 - k0);
+    int k2 = lrintf(p->xtn2);
+    float kf2 = (k2 > p->xtn2 ? k2 - p->xtn2 : p->xtn2 - k2);
+    float m2 = 0.0f;
+    if(k0 < p->xtp2) {
+      m2 += (mag2[k0] + mag2[k0+1]) * 0.5f * (1.0f - kf0) + 0.5f * mag2[k0+1];
+      int i = k0 - k1;
+      float m = interp2(i,ko1,kf1) * p->y;
+      m = min(m,mag2[k0]) * 0.5f * (1.0f + kf0);
+      m2 += m;
+      dec2[k0] += m;
+      m = interp2(i+1,ko1,kf1) * p->y;
+      m = min(m,mag2[k0+1]) * 0.5f * kf0;
+      m2 += m;
+      dec2[k0+1] += m;
+      m = interp2(i-1,ko1,kf1) * p->y;
+      m = min(m,mag2[k0-1]);
+      m2 += m;
+      dec2[k0-1] += m;
+    } else {
+      m2 += (mag2[k0] + mag2[k0-1]) * 0.5f * kf0 + 0.5f * mag2[k0] + mag2[k0+1];
+      int i = k0 - k1;
+      float m = interp2(i,ko1,kf1) * p->y;
+      m = min(m,mag2[k0]) * 0.5f * (1.0f - kf0);
+      m2 += m;
+      dec2[k0] += m;
+      m = interp2(i-1,ko1,kf1) * p->y;
+      m = min(m,mag2[k0-1]) * 0.5f * (2.0f - kf0);
+      m2 += m;
+      dec2[k0-1] += m;
+    }
+    if(k2 < p->xtn2) {
+      m2 += mag2[k2-1] + 0.5f * mag2[k2] + 0.5f * kf2 * (mag2[k2] + mag2[k2+1]);
+      int i = k2 - k1;
+      float m = interp2(i,ko1,kf1) * p->y;
+      m = min(m,mag2[k2]) * 0.5f * (1.0f - kf2);
+      m2 += m;
+      dec2[k2] += m;
+      m = interp2(i+1,ko1,kf1) * p->y;
+      m = min(m,mag2[k2+1]) * 0.5f * (2.0f - kf2);
+      m2 += m;
+      dec2[k2+1] += m;
+    } else {
+      m2 += (mag2[k2-1] + mag2[k2]) * (1.0f - kf2) * 0.5f + 0.5f * mag2[k2-1];
+      int i = k2 - k1;
+      float m = interp2(i,ko1,kf1) * p->y;
+      m = min(m,mag2[k2]) * 0.5f * (1.0f + kf2);
+      m2 += m;
+      dec2[k2] += m;
+      m = interp2(i-1,ko1,kf1) * p->y;
+      m = min(m,mag2[k2-1]) * 0.5f * kf2;
+      m2 += m;
+      dec2[k2-1] += m;
+      m = interp2(i+1,ko1,kf1) * p->y;
+      m = min(m,mag2[k2+1]);
+      m2 += m;
+      dec2[k2+1] += m;
+    }
+    for(int k=k0+2;k<k2-1;k++) {
+      m2 += mag2[k];
+    }
+    if(k0 + 1 == k2 - 1) {
+      m2 -= mag2[k0+1];
+    }
+    for(int k=max(0,k1-peakWidth2);k<k0-1;k++) {
+      float m = interp2(k-k1,ko1,kf1) * p->y;
+      m = min(m,mag2[k]);
+      m2 += m;
+      dec2[k] += m;
+    }
+    int k3 = min(kEnd,k1+peakWidth2);
+    for(int k=k2+2;k<=k3;k++) {
+      float m = interp2(k-k1,ko1,kf1) * p->y;
+      m = min(m,mag2[k]);
+      m2 += m;
+      dec2[k] += m;
+    }
+    p->m2 = m2;
+  }
+  float m2max = 0.0f;
+  for(TrackPoint *p = slice->bottom;
+      p;
+      p = p->pn) {
+    int k1 = lrintf(p->x);
+    int ko1 = k1 > p->x ? -1 : 1;
+    float kf1 = k1 > p->x ? k1 - p->x : p->x - k1; 
+    int k0 = lrintf(p->xtp2);
+    float kf0 = (k0 > p->xtp2 ? k0 - p->xtp2 : p->xtp2 - k0);
+    int k2 = lrintf(p->xtn2);
+    float kf2 = (k2 > p->xtn2 ? k2 - p->xtn2 : p->xtn2 - k2);
+    float mdec = 0.0f;
+    if(k0 < p->xtp2) {
+      mdec += (dec2[k0] + dec2[k0+1]) * 0.5f * (1.0f - kf0) + 0.5f * dec2[k0+1];
+    } else {
+      mdec += (dec2[k0] + dec2[k0-1]) * 0.5f * kf0 + 0.5f * dec2[k0] + dec2[k0+1];
+    }
+    if(k2 < p->xtn2) {
+      mdec += dec2[k2-1] + 0.5f * dec2[k2] + 0.5f * kf2 * (dec2[k2] + dec2[k2+1]);
+    } else {
+      mdec += (dec2[k2-1] + dec2[k2]) * (1.0f - kf2) * 0.5f + 0.5f * dec2[k2-1];
+    }
+    for(int k=k0+2;k<k2-1;k++) {
+      mdec += dec2[k];
+    }
+    if(k0 + 1 == k2 - 1) {
+      mdec -= dec2[k0+1];
+    }
+
+    p->m2 -= mdec;
+    p->m2 *= mNorm;
+    if(p->m2 > m2max) {
+      m2max = p->m2;
+    }
+  }
+  float m2min = m2max * peakThresh;
+  for(TrackPoint *p = slice->bottom;
+      p; ) {
+    TrackPoint *pn = p->pn;
+    if(p->m2 < m2min) {
+      delete p;
+    }
+    p = pn;
+  }
+    
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&sliceMutex[c]);
+#endif
+  sliceBuffer[c].write(slice);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&sliceMutex[c]);
+#endif
+  addtime[c]++;
+}
+
+void SMS :: prepad1(audio *buf, long n)
+{
+  if(band >= minTrial2Band) {
+    trial2GrainBuf->write(buf,n);
+  }
+}
+
+void SMS :: prepad0(audio *buf, long n)
+{
+  if(band >= minTrial1Band) {
+    trial1GrainBuf->write(buf,n);
+  }
+}
+
+int SMS :: getTrial2Latency()
+{ 
+  return minTrackSize;
+}
+
+Track *SMS :: createTrack(int c, TrackPoint *tp, const TimeType &time, bool bStitch) 
+{
+  TrackIndexType index;
+  if(trackIndex[c].empty()) {
+    index = trackIndexNone;
+  } else {
+    index = trackIndex[c].front();
+    trackIndex[c].pop();
+  }
+  Track *t = new Track(h1,index,tp,time,bStitch);
+  assignTracks[c].push_back(t);
+  return t;
+}
+
+void SMS :: returnTrackIndex(int c, Track *t)
+{
+  if(t->index != trackIndexNone) {
+    trackIndex[c].push(t->index);
+    t->index = trackIndexNone;
+  }
+}
+
+float SMS :: interp2(int k, int ko, float kf) {
+  return (1.0f-kf)*peak2N[k] + kf*peak2N[k+ko];
+}
+
+float SMS :: findExtremum(float *mag, float *mag2, int k, float *y)
+{
+  float y0 = mag[k-1];
+  float y1 = mag[k];
+  float y2 = mag[k+1];
+  float d = (y0 + y2 - y1 - y1);
+  float x = (d==0.0f?k:k + 0.5f * (y0 - y2) / d);
+  if(y) {
+    int ki = lrintf(x);
+    float kf = ki<x?x-ki:ki-x;
+    int ki1 = ki<k?ki+1:ki-1;
+    *y = ((1.0f-kf)*mag2[ki] + kf*mag2[ki1]);
+  }
+  return x;
+}
+
+void SMS :: calcmags(float *mag, audio *x) {
+  for(int k=0;k<=Nover2;k++) {
+    mag[k] = norm2(x[k]);
+  }
+}
+
+SynthRenderer :: SynthRenderer(int channels, int h)
+{
+  this->channels = channels;
+  for(int c=0; c<channels; c++) {
+    sines[c] = new ArrayRingBuffer<float>(0);
+    synthBufLength[c] = h << 4;
+    synthBuf[c] = (float*)malloc(synthBufLength[c]*sizeof(float));
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_init(&bufferMutex,NULL);
+#endif
+}
+
+SynthRenderer :: ~SynthRenderer()
+{
+  for(int c=0; c<channels; c++) {
+    delete sines[c];
+    free(synthBuf[c]);
+  }
+}
+
+void SynthRenderer :: startTime(int c, const TimeType &time, int n)
+{
+  if(n > synthBufLength[c]) {
+    free(synthBuf[c]);
+    synthBufLength[c] = n << 1;
+    synthBuf[c] = (float*)malloc(synthBufLength[c]*sizeof(float));
+  }
+  this->n[c] = n;
+  this->time[c] = time;
+  memset(synthBuf[c],0,n*sizeof(float));
+}
+
+void SynthRenderer :: render(int c, SBSMSTrack *t)
+{
+  ((Track*)t)->synth(synthBuf[c],time[c],n[c],synthModeOutput,c);
+}
+
+void SynthRenderer :: endTime(int c)
 {
 #ifdef MULTITHREADED
   pthread_mutex_lock(&bufferMutex);
 #endif
-  long n = outMixer->n_readable();
+  int n = this->n[c];
+  sines[c]->grow(n);
+  long j = sines[c]->writePos;
+  float *dest = sines[c]->buf;
+  float *src = synthBuf[c];
+  for(int k=0; k<n; k++) {
+    dest[j++] += src[k];
+  }
+  sines[c]->writePos += n;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+}
+
+long SynthRenderer :: read(audio *out, long n)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  n = min(n,sines[0]->nReadable());
+  for(int c=1; c<channels; c++) {
+    n = min(n,sines[c]->nReadable());
+  }
+  for(int c=0; c<channels; c++) {
+    float *buf = sines[c]->getReadBuf();
+    for(int k=0; k<n; k++) {
+      out[k][c] = buf[k];
+    }
+    sines[c]->advance(n);
+  }
 #ifdef MULTITHREADED
   pthread_mutex_unlock(&bufferMutex);
 #endif
   return n;
 }
 
-long sms :: read(audio *out, long n)
-{
-  long n_read;
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&bufferMutex);
-#endif
-  n_read = outMixer->read(out, n); 
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&bufferMutex);
-#endif
-  return n_read;
-}
-
-void sms :: advance(long n) 
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&bufferMutex);
-#endif
-  outMixer->advance(n);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&bufferMutex);
-#endif
-}
-
-void sms :: c2evenodd(grain *eo, grain *even, grain *odd) {
-  _c2evenodd(eo->x, even->x, odd->x, eo->N);
-}
-
-void sms :: calcmags(real *mag, grain *g, real q) {
-  for(int k=0;k<=Nover2;k++) {
-    real m = norm2(g->x[k])*q;
-    mag[k] = m;
-    if(magmax < m) magmax = m;
-  }
-  sqrtmagmax = sqrt(magmax);
-}
-
-peak *sms :: makePeak(real *mag, real *mag2, int k)
-{
-  real v0,v1,v2;
-  v0 = mag2[k-1];
-  v1 = mag2[k];
-  v2 = mag2[k+1];
-  real y1 = v1-v0;
-  real y2 = v2-v0;
-  real a = 0.5f*(y2 - 2*y1);
-  real b = a==0?2.0f:1.0f-y1/a;
-      
-  peak *p = pa->create();
-  p->x = k-1+0.5f*b;
-  p->k = k;
-  p->y2 = v0-0.25f*a*b*b;
-  int k0 = round2int(p->x);
-  real kf = k0<p->x?p->x-k0:k0-p->x;
-  int k1 = k0<p->x?k0+1:k0-1;
-  p->y = (1.0f-kf)*mag[k0] + kf*mag[k1];
-  p->tp = NULL;
-  p->tp2 = NULL;
-  p->tn = NULL;
-  p->tn2 = NULL;
-  return p;
-}
-
-void sms :: adjustPeaks(list<peak*> &peaks,
-			real *mag0,
-			real *mag1,
-			real *mag2,
-			real *dec,
-			int peakWidth
-			) {
-
-  for(int k=0;k<N;k++) {
-    dec[k] = 0.0;
-  }
-
-  // determine troughs and remove peaks based on minPeakTopRatio
-  // don't determine maginitude yet
-  for(list<peak *>::iterator tpi = peaks.begin();
-      tpi != peaks.end();
-      ) {
-    list<peak*>::iterator eraseMe = tpi;
-    peak *p = (*tpi);
-
-    peak *pp = NULL;
-    if(tpi!=peaks.begin()) {
-      pp = *(--tpi);
-      tpi++;
-    }
-
-    peak *pn = NULL;
-    tpi++;
-    if(tpi != peaks.end()) {
-      pn = (*tpi);
-    }
-
-    if(p->tp && pp && pp->tn
-       &&
-       p->x - p->tp->x > p->x - p->tp2->x
-       &&
-       pp->tn->x - pp->x > pp->tn2->x - pp->x) {
-    } else {
-      p->tp = p->tp2;
-    }
-    
-    if(p->tn && pn && pn->tp
-       &&
-       p->tn->x - p->x > p->tn2->x - p->x
-       &&
-       pn->x - pn->tp->x > pn->x - pn->tp2->x) {
-    } else {
-      p->tn = p->tn2;
-    }
-
-    peak *tp = p->tp;
-    peak *tn = p->tn;
-
-    int k1 = p->k;
-    int k0 = tp->k;
-    real kf0;
-    if(k0 < k1-peakWidth) {
-      k0 = k1-peakWidth;
-      kf0 = 0;
-    } else {
-      kf0 = k0 > tp->x ? k0 - tp->x : tp->x - k0;
-    }
-    int k2 = tn->k;
-    real kf2;
-    if(k2 > k1+peakWidth) {
-      k2 = k1+peakWidth;
-      kf2 = 0;
-    } else {
-      kf2 = k2 > tn->x ? k2 - tn->x : tn->x - k2;
-    }
-
-    real m = 0.0f;
-    real mtop = 0.0f;
-
-    real mbase = mag2[k0] + mag2[k2];
-    if(k0 < tp->x) {
-      real m0 = ((mag2[k0])+(mag2[k0+1]))*(1.0f-kf0);
-      m += m0;
-      mtop += max(0.0f,(m0 - mbase)*(1.0f-kf0));
-    } else {
-      real m0 = ((mag2[k0])+(mag2[k0+1]));
-      m += m0;
-      mtop += max(0.0f,m0 - mbase);
-      m0 = ((mag2[k0-1])+(mag2[k0]))*kf0;
-      m += m0;
-      mtop += max(0.0f,(m0 - mbase)*kf0);
-    }
-    
-    if(k2 < tn->x) {
-      real m0 = ((mag2[k2-1])+(mag2[k2]));
-      m += m0;
-      mtop += max(0.0f,m0 - mbase);
-      m0 = ((mag2[k2])+(mag2[k2+1]))*kf2;
-      m += m0;
-      mtop += max(0.0f,(m0 - mbase)*kf2);
-    } else {
-      real m0 = ((mag2[k2-1])+(mag2[k2]))*(1.0f-kf2);
-      m += m0;
-      mtop += max(0.0f,(m0 - mbase)*(1.0f-kf2));
-    }
-    
-    for(int k=k0+1;k<k2-1;k++) {
-      real m0 = ((mag2[k])+(mag2[k+1]));
-      m += m0;
-      mtop += max(0.0f,m0 - mbase);
-    }
-
-    if(mtop < minPeakTopRatio*m) {
-      peaks.erase(eraseMe);
-      if(pp && (!pn || pp->y > pn->y)) {
-	pp->tn = p->tn;
-	pp->tn2 = p->tn2;
-      } else if(pn && (!pp || pn->y > pp->y)) {
-	pn->tp = p->tp;
-	pn->tp2 = p->tp2;
-      }
-    }
-  }
-
-  // determine magnitude
-  for(list<peak *>::iterator tpi = peaks.begin();
-      tpi != peaks.end();
-      tpi++
-      ) {
-    peak *p = (*tpi);
-    
-    peak *tp = p->tp;
-    peak *tn = p->tn;
-       
-    int k1 = p->k;
-    int ko1 = k1 > p->x ? -1 : 1;
-    real kf1 = k1 > p->x ? k1 - p->x : p->x - k1; 
-    int k0 = tp->k;
-    real kf0;
-    if(k0 < k1-peakWidth) {
-      k0 = k1-peakWidth;
-      kf0 = 0;
-    } else {
-      kf0 = k0 > tp->x ? k0 - tp->x : tp->x - k0;
-    }
-    int k2 = tn->k;
-    real kf2;
-    if(k2 > k1+peakWidth) {
-      k2 = k1+peakWidth;
-      kf2 = 0;
-    } else {
-      kf2 = k2 > tn->x ? k2 - tn->x : tn->x - k2;
-    }
-
-    real m1 = 0.0f;
-
-    if(k0 < tp->x) {
-      m1 += ((mag1[k0])+(mag1[k0+1]))*(1.0f-kf0);
-    } else {
-      m1 += ((mag1[k0])+(mag1[k0+1]));
-      m1 += ((mag1[k0-1])+(mag1[k0]))*kf0;
-    }
-    
-    if(k2 < tn->x) {
-      m1 += ((mag1[k2-1])+(mag1[k2]));
-      m1 += ((mag1[k2])+(mag1[k2+1]))*kf2;
-    } else {
-      m1 += ((mag1[k2-1])+(mag1[k2]))*(1.0f-kf2);
-    }
-    
-    for(int k=k0+1;k<k2-1;k++) {
-      m1 += ((mag1[k])+(mag1[k+1]));
-    }
-    
-    m1 *= 0.5f;
-
-    for(int k=max(1,k1-peakWidth+1);k<=k0;k++) {
-      real d = (1.0f-kf1)*peak1[k-k1+N] + kf1*peak1[k-k1+N+ko1];
-      real m = d*(p->y);
-      m1 += m;
-      dec[k] += m;
-    }
-    for(int k=k2;k<min(k1+peakWidth,Nover2-1);k++) {
-      real d = (1.0f-kf1)*peak1[k-k1+N] + kf1*peak1[k-k1+N+ko1];
-      real m = d*(p->y);
-      m1 += m;
-      dec[k] += m;
-    }
-    p->m = m1;
-  }
-
-  for(list<peak *>::iterator tpi = peaks.begin();
-      tpi != peaks.end();
-      ) {
-    peak *p = (*tpi);
-
-    list<peak*>::iterator eraseMe = tpi;
-    peak *pp = NULL;
-    if(tpi!=peaks.begin()) {
-      pp = *(--tpi);
-      tpi++;
-    }
-    peak *pn = NULL;
-    tpi++;
-    if(tpi != peaks.end()) {
-      pn = (*tpi);
-    }
-
-    peak *tp;
-    peak *tn;
-    tp = p->tp;
-    tn = p->tn;
-
-    int k1 = p->k;
-    int k0 = tp->k;
-    real kf0;
-    if(k0 < k1-peakWidth) {
-      k0 = k1-peakWidth;
-      kf0 = 0;
-    } else {
-      kf0 = k0 > tp->x ? k0 - tp->x : tp->x - k0;
-    }
-    int k2 = tn->k;
-    real kf2;
-    if(k2 > k1+peakWidth) {
-      k2 = k1+peakWidth;
-      kf2 = 0;
-    } else {
-      kf2 = k2 > tn->x ? k2 - tn->x : tn->x - k2;
-    }
-
-    real m = p->m;
-    real mdec = 0;
-
-    if(k0 < tp->x) {
-      mdec += (dec[k0]+dec[k0+1])*(1.0f-kf0);
-    } else {
-      mdec += (dec[k0]+dec[k0+1]);
-      mdec += (dec[k0-1]+dec[k0])*kf0;
-    }
-    
-    if(k2 < tn->x) {
-      mdec += (dec[k2-1]+dec[k2]);
-      mdec += (dec[k2]+dec[k2+1])*kf2;
-    } else {
-      mdec += (dec[k2-1]+dec[k2])*(1.0f-kf2);
-    }
-    
-    for(int k=k0+1;k<k2-1;k++) {
-      mdec += (dec[k]+dec[k+1]);
-    }
-
-    mdec *= 0.5;
-
-    if(mdec > maxDecRatio*m) {
-      peaks.erase(eraseMe);
-      m -= mdec;
-      if(pp && pn) {
-	real d = square(pn->x - p->x) + square(pp->x - p->x);
-	pp->m += m*square(pn->x - p->x)/d;
-	pn->m += m*square(pp->x - p->x)/d;
-      } else if(pp) {
-	pp->m += m;
-      } else if(pn) {
-	pn->m += m;
-      }
-      pa->destroy(p);
-      continue;
-    } else {
-      m -= mdec;
-      p->m = m;
-    }
-  }
-}
-
-void sms :: extractTrackPoints(grain *g, 
-			       real *mag0, real *mag1, real *mag2,
-			       long currtime,
-			       TrackPointListBuffer *trackPointListBuffer,
-			       unsigned short h1,
-			       int c)
-{
-  real thmin = square(peakThresh)*magmax;
-  list<peak*> peaks;
-  peak* trough1 = NULL;
-  peak* trough2 = NULL;
-
-  peak *t0 = pa->create();
-  t0->k = 1;
-  t0->x = (real)1;
-  t0->y = mag1[0];
-  t0->y2 = mag2[0];
-  t0->tp = NULL;
-  t0->tp2 = NULL;
-  t0->tn = NULL;
-  t0->tn2 = NULL;
-
-  peak *t1 = pa->create();
-  t1->k = Nover2-1;
-  t1->x = (real)(Nover2-1);
-  t1->y = mag1[Nover2-1];
-  t1->y2 = mag2[Nover2-1];
-  t1->tp = NULL;
-  t1->tp2 = NULL;
-  t1->tn = NULL;
-  t1->tn2 = NULL;
-
-  trough2 = t0;
-
-  int k00=0;
-  int k01=Nover2-1;
-  int k10=0;
-  int k11=Nover2-1;
-  int kp = -1;
-
-  for(int k=1;k<Nover2-1;k++) {
-    if( (mag2[k] > thmin)
-        &&
-        (mag2[k] > mag2[k-1])
-        &&
-        (mag2[k] >= mag2[k+1])
-        ) {
-
-      kp = k;
-      if(k>=kStart-peakWidth && k<=kEnd+peakWidth) {
-        peak *p = makePeak(mag1,mag2,k);
-        p->tn2 = t1;
-        if(trough1 && trough1->tn == NULL) {
-          p->tp = trough1;
-          trough1->tn = p;
-        }
-        if(trough2 && trough2->tn2 == NULL) {
-          p->tp2 = trough2;
-          trough2->tn2 = p;
-        }
-        peaks.push_back(p);
-      }
-    } else if((mag2[k] <= mag2[k-1])
-              &&
-              (mag2[k] <= mag2[k+1])
-              ) {
-
-      peak *p = makePeak(mag1,mag2,k);
-      trough2 = p;
-      if(!peaks.empty()) { 
-        peaks.back()->tn2 = p;
-        p->tp2 = peaks.back();
-      }
-    }
-    if((mag0[k] <= mag0[k-1])
-       &&
-       (mag0[k] <= mag0[k+1])
-       ) {   
-      if(peaks.empty())
-        k00 = k;
-      if(kp <= kEnd)
-        k01 = k;
-    }
-    if((mag1[k] <= mag1[k-1])
-       &&
-       (mag1[k] <= mag1[k+1])
-       ) {      
-      if(peaks.empty())
-        k10 = k;
-      if(kp <= kEnd)
-        k11 = k;
-      peak *p = makePeak(mag1,mag1,k);
-      trough1 = p;
-      if(!peaks.empty() && peaks.back()->tn == NULL) {
-        peaks.back()->tn = p;
-        p->tp = peaks.back();
-      }
-    }
-  }
-  real m0=0.0f;
-  real m1=0.0f;
-  for(int k=k00;k<=k01;k++) {
-    m0 += mag0[k];
-    m1 += mag1[k];
-  }
-  real f = (m1==0.0f)?1.0f:min(1.0f,m0/m1);
-
-  adjustPeaks(peaks,
-	      mag0,
-	      mag1,
-	      mag2,
-	      dec,
-	      peakWidth);
-
-  tplist *trackPoints = new tplist;
-  for(list<peak*>::iterator pp=peaks.begin();
-      pp!=peaks.end();
-      pp++) {
-
-    peak *p = (*pp);
-    if(p->x>=kStart-0.5 && p->x<=kEnd+0.5 && p->m>0) {
-      real y = sqrt(f*p->m*mNorm);
-      trackpoint *tp = new trackpoint(g,p->x,y,N,M,h1,currtime);
-      trackPoints->push_back(tp);
-    }
-  }
-
-  pa->destroyAll();
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&tplbMutex[c]);
-#endif
-  trackPointListBuffer->write(trackPoints);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&tplbMutex[c]);
-#endif
-}
-
 }
diff --git a/lib-src/sbsms/src/sms.h b/lib-src/sbsms/src/sms.h
index ff2b86c56..6c3bed97a 100644
--- a/lib-src/sbsms/src/sms.h
+++ b/lib-src/sbsms/src/sms.h
@@ -1,141 +1,196 @@
+// -*- mode: c++ -*-
 #ifndef SMS_H
 #define SMS_H
 
-#include "track.h"
-#include "grain.h"
-#include "buffer.h"
-#include "peak.h"
-#include "sbsms.h"
 #include "config.h"
 #ifdef MULTITHREADED
 #include "pthread.h"
 #endif
-
+#include "sbsms.h"
+#include "track.h"
+#include "grain.h"
+#include "buffer.h"
+#include <queue>
 #include <list>
 using namespace std;
 
 namespace _sbsms_ {
 
-class renderer;
-class sms : public SampleBufBase {
-  friend class renderer;
+enum {
+  minTrial2Band = 1,
+  minTrial1Band = 2
+};
+
+class SynthRenderer : public SBSMSRenderer, public SampleBufBase {
  public:
-  sms(int N, unsigned short M, unsigned short M_MAX, int res, int latency, real p, real q, real pad, int Nlo, int channels, TrackAllocator *ta, PeakAllocator *pa);
-  void reset();
-  void readTrackPointsFromFile(FILE *fp);
-  int writeTrackPointsToFile(FILE *fp);
-  void setH(unsigned short h);
-  long addTrackPoints(grain *g0, grain *g1, grain *g2);
-  long assignTrackPoints(long offset, sms *hi, sms *lo, int c);
-  long startNewTracks(long offset, int c);
-  void markDuplicates(long offset, sms *hi, sms *lo, int c);
-  bool connectTrackPoints(trackpoint *tp0, trackpoint *tp1, sms *hi, sms *lo, real dtlo, int c);
-  bool adoptTrack(track *precursor, sms *lender, trackpoint *tp, real m, real dt, int c);
-  void synthTracks(real a, real f0, real f1);
-  void advanceTrackPoints(int c);
-  long nTrackPoints();
+  SynthRenderer(int channels, int h);
+  ~SynthRenderer();
+  void startTime(int c, const TimeType &time, int n);
+  void render(int c, SBSMSTrack *t);
+  void endTime(int c);
   long read(audio *out, long n);
-  long n_readable();
-  void advance(long n);
-  void zeroPad(long n);
-  void addTrack(int c, track *t);
-  ~sms();
-
-
-  bool bPhaseLock;
-  int res;
-  int N;
-  unsigned short M;
-  real m;
-  int Nover2;
-  RingBuffer<unsigned short> hSynth;
-  real h2cum;
-  long samplePos;
-  TrackPointListBuffer* trackPointListBuffer[2];
-
-  
-#ifdef MULTITHREADED
-  pthread_mutex_t dataMutex;
-  pthread_mutex_t tplbMutex[2];
-  pthread_mutex_t bufferMutex;
-  pthread_mutex_t trackMutex[2];
-#endif
 
  protected:
-  unsigned short encodeReal(real x, real min, real max);
-  float decodeReal(unsigned short x, real min, real max);
-  unsigned short encodeRealLog(real x);
-  float decodeRealLog(unsigned short x);
-  bool terminal;
-  void markDuplicatesLo(long offset, sms *lo, long offsetlo, int c);
-  long assignTrackPoints_(long offset, sms *hi, sms *lo, real dtlo, long offsetlo, int c);
-  void deleteTrackPoint(trackpoint *tp);
-  void adjustPeaks(list<peak*> &peaks,
-		   real *mag0,
-		   real *mag1,
-		   real *mag2,
-		   real *dec,
-		   int peakWidth);
-  long assignTrackPoints(long offset, sms *hi, sms *lo, real dtlo, long offsetlo, int c);
-  bool contTrack(track *t, trackpoint *tp, int c);
-  void extractTrackPoints(grain *g, real *mag0, real *mag1, real *mag2, long currtime, TrackPointListBuffer *tplb, unsigned short h1, int c);
-  bool nearestTrackPoint(tplist *tpl, trackpoint *tp0, real m0, real m1, real dt, tplist::iterator *minpos, real *minFx, real maxMerit2, real maxDF2);
-  int prune(trackpoint *tp);
-  real merit(trackpoint *tp0, trackpoint *tp1, real m0, real m1, real dt, real dMCoeff, real *df, real maxDF2);
-  void calcmags(real *mag, grain *g, real q);
-  peak *makePeak(real *mag, real *mag2, int k);
-
-  TrackAllocator *ta;
-  PeakAllocator *pa;
-  char *pData;
-  int datasize;
   int channels;
-  real p,q;
-  int peakWidth;
-  int maxPrunes;
-  real peakThresh;
-  real startThresh;
-  real maxMerit2;
-  real maxDF2;
-  real dMCoeff;
-  real maxMerit2Match;
-  real maxDF2Match;
-  real dMCoeffMatch;
-  int minNpts;
-  real maxdBIncr;
-  real maxdBIncrStitch;
-  real maxFMatch;
-  real minFMatch;
+  float *synthBuf[2];
+  int synthBufLength[2];
+  ArrayRingBuffer<float> *sines[2];
+  TimeType time[2];
+  int n[2];
+#ifdef MULTITHREADED
+  pthread_mutex_t bufferMutex;
+#endif
+};
+
+class SMS {
+ public:
+  SMS(SMS *lo, int N, int band, int bandMax, int h, int res, int N0, int N1, int N2, int channels, audio *peak2);
+  ~SMS();
+  void render(int c, list<SBSMSRenderer*> &renderers);
+  void add(grain *g0, grain *g1, grain *g2, int c);
+  void assignStart(long offset, int c);
+  void assignInit(long offset, int c);
+  void assignFind(long offset, int c);
+  bool assignConnect(long offset, int c, bool bLastDitch);
+  void start(long offset, int c);
+  void splitMerge(int c);
+  void mark(long offset, int c);
+  void advance(int c);
+  void trial2(int c);
+  void trial2Start(int c);
+  void trial2End(int c);
+  void adjust2();
+  void trial1(int c);
+  void trial1Start(int c);
+  void trial1End(int c);
+  void adjust1(float stretch, float pitch0, float pitch1);
+  void adjustInit(ArrayRingBuffer<float> **trialRingBuf,
+                  GrainBuf *trialGrainBuf);
+  void adjust(GrainBuf *trialGrainBuf,
+              queue<float*> *magQueue,
+              int minCutSep,
+              float **_mag1,
+              float **_dmag1,
+              audio **x1,
+              const TimeType &time,
+              Slice **slice);
+  void prepad1(audio *buf, long n);
+  void prepad0(audio *buf, long n);
+  int getTrial2Latency();
+
+ protected:
+  void connect(TrackPoint *tp0, TrackPoint *tp1, int ilo, int c);
+  void mark(long offset, long offsetlo, int c);
+  TrackPoint *nearestForward(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF2, float dMCoeff2, float dNCoeff2 = 0.0f);
+  TrackPoint *nearestReverse(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF2, float dMCoeff2, float dNCoeff2 = 0.0f);
+  TrackPoint *nearestForward2(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF2, float dMCoeff2, float dNCoeff2 = 0.0f);
+  TrackPoint *nearestReverse2(TrackPoint **begin, TrackPoint *tp0, float *minCost2, float maxCost2, float maxDF2, float dMCoeff2, float dNCoeff2 = 0.0f);
+  float interp2(int k, int ko1, float kf);
+  float findExtremum(float *mag, float *mag2, int k, float *y);
+  void calcmags(float *mag, audio *x);
+  int findCut(float *dmag, int k, int maxK);
+  Track *createTrack(int c, TrackPoint *tp, const TimeType &time, bool bStitch);
+  void returnTrackIndex(int c, Track *t);
+
+  list<TrackPoint*> ended[2];
+  list<TrackPoint*> started[2];
+  int minTrackSize; 
+  int peakWidth0;
+  int peakWidth1;
+  int peakWidth2;
+  int minCutSep1;
+  int minCutSep2;
+  int minK;
+  int maxK;
+  float peakThresh;
+  float maxCost2;
+  float maxDF;
+  float dMCoeff2;
+  float dNCoeff2;
+  float maxDFSplitMerge;
+  float maxCost2SplitMerge;
+  float dMCoeff2SplitMerge;
+  float maxCost2Match;
+  float maxDFMatch;
+  float dMCoeff2Match;
+  float maxCost2Stereo;
+  float maxDFStereo;
+  float dMCoeff2Stereo;
+  float maxFMatchM;
+  float minFMatchL;
+  float minFLo;
+  float maxFHi;
+  float minFMid;
+  float maxFMid;
   int kStart;
   int kEnd;
-  real mNorm;
-  real minPeakTopRatio;
-  real localFavorRatio;
-  real maxDecRatio;
-  
-  list<track*> **trax;
-  long currtime;
-  long assigntime[2];
-  long marktime[2];
-  long synthtime;
-
-  SampleBuf *sines2, *outMixer;
-  grain* x0[2];
-  grain* x1[2];
-  grain* x2[2];
-  
-  void c2evenodd(grain *g, grain *, grain *);
-
-  real* dec;
-  real* dec2;
-  real* mag0[2];
-  real* mag1[2];
-  real* mag2[2];
-  real *peak1;
-  bool bPeakSet;
-  real sqrtmagmax;
-  real magmax;
-
+  int kLo;
+  int kHi;
+  float mNorm;
+  float localFavorRatio;
+  queue<Slice*> adjust2SliceQueue[2];
+  queue<Slice*> adjust1SliceQueue[2];
+  RingBuffer<Slice*> sliceBuffer[2];
+  Slice* sliceM0[2];
+  Slice* sliceL0[2];
+  Slice* sliceH0[2];
+  Slice* sliceM1[2];
+  Slice* sliceL1[2];
+  Slice* sliceM2[2];
+  Slice* sliceH1[2];
+  audio* x10[2];
+  audio* x11[2];
+  float* dmag1[2];
+  float* mag11[2];
+  audio* x00[2];
+  audio* x01[2];
+  float* dmag0[2];
+  float* mag01[2];
+  float *mag2[2];
+  audio* x2[2];
+  float* dec2[2];
+  float *peak20;
+  float *peak2N;
+  int N;
+  int Nover2;
+  SMS *lo;
+  SMS *hi;
+  queue<TrackIndexType> trackIndex[2];
+  queue<float*> mag1Queue[2];
+  queue<float*> mag0Queue[2];
+  float *trial2Buf[2];
+  ArrayRingBuffer<float> *trial2RingBuf[2];
+  GrainBuf *trial2GrainBuf;
+  float *trial1Buf[2];
+  ArrayRingBuffer<float> *trial1RingBuf[2];
+  GrainBuf *trial1GrainBuf;
+  list<Track*> assignTracks[2];
+  list<Track*> renderTracks[2];
+  TimeType addtime[2];
+  TimeType assigntime[2];
+  TimeType trial2time[2];
+  TimeType adjust2time;
+  TimeType trial1time[2];
+  TimeType adjust1time;
+  TimeType synthtime[2];
+  queue<int> nRender[2];
+  double h2cum;
+  int channels;
+  long res;
+  long resMask;
+  int h;
+  float M;
+  double h1;
+  int band;  
+#ifdef MULTITHREADED
+  pthread_mutex_t sliceMutex[2];
+  pthread_mutex_t magMutex[2];
+  pthread_mutex_t renderMutex[2];
+  pthread_mutex_t trial2Mutex[2];
+  pthread_mutex_t trial1Mutex[2];
+  pthread_mutex_t trackMutex[2];
+#endif
+  bool bAssignDone[2];
 };
 
 }
diff --git a/lib-src/sbsms/src/subband.cpp b/lib-src/sbsms/src/subband.cpp
index 8c0a8dc2e..9305ecdde 100644
--- a/lib-src/sbsms/src/subband.cpp
+++ b/lib-src/sbsms/src/subband.cpp
@@ -7,1221 +7,999 @@ using namespace std;
 
 namespace _sbsms_ {
 
-#define SUB_BUF_SIZE 4096
-
-bool subband :: isWriteReady()
+SubBand :: SubBand(SubBand *parent, int band, int channels, SBSMSQuality *quality, bool bSynthesize)
 {
-  return (getFramesAtFront() <= 8);
-}
-
-bool subband :: isAddReady()
-{
-  return addInit(false)?true:false;
-}
-
-bool subband :: isMarkReady()
-{
-  bool bReady = false;
-  for(int c=0;c<channels;c++) {
-    if(markInit(false,c)) 
-      bReady = true;
+  if(band<quality->params.bands-1) {
+    sub = new SubBand(this,band+1,channels,quality,bSynthesize);
+  } else {
+    sub = NULL;
   }
-  return bReady;
-}
-
-bool subband :: isAssignReady()
-{
-  bool bReady = false;
-  for(int c=0;c<channels;c++) {
-    if(assignInit(false,c)) 
-      bReady = true;
-  }
-  return bReady;
-}
-
-bool subband :: isSynthReady()
-{
-  return synthInit(false)?true:false;
-}
-
-subband :: subband(subband *parent, unsigned short M, int channels, sbsms_quality *quality, int latency, bool bPreAnalyze, TrackAllocator *ta, PeakAllocator *pa)
-{
   this->quality = quality;
-  this->ta = ta;
-  this->pa = pa;
-  int k = ilog2(M);
   this->channels = channels;
   this->parent = parent;
-  this->N = quality->N[k];
-  this->M = M;
-  this->s = quality->S[k];
-  this->res = quality->res[k];
-  real pad = quality->pad[k];
-  if(M<quality->M_MAX) 
-    sub = new subband(this,M*2,channels,quality,latency,bPreAnalyze,ta,pa);
-  else 
-    sub = NULL;
-  int Nlo = sub?quality->N[k+1]:0;
-  
+  this->band = band;
+  int M = (1<<band);
+  int M_MAX = 1<<(quality->params.bands-1);
+  this->N = quality->params.N[band];
+  int N0 = quality->params.N0[band];
+  int N1 = quality->params.N1[band];  
+  int N2 = quality->params.N2[band];
+  this->res = quality->params.res[band];
+  this->resMask = res - 1;
+  this->bSynthesize = bSynthesize;
   nGrainsPerFrame = res;
   if(sub) nGrainsPerFrame *= sub->nGrainsPerFrame;
-  
-  if(sub) resTotal = 2*sub->resTotal;
-  else resTotal = 1;
-
-  nLatencyOriginal = latency;
-  gPrev = NULL;
-
-  init();
-
-  // sms 
-  in0 = new GrainBuf(N, h, pad*quality->P[k]);
-  in1 = new GrainBuf(N, h, pad);
-  in2 = new GrainBuf(N, h, pad*quality->Q[k]);
-
-  // synthesize
-  smser = new sms(N,(short)M,(short)quality->M_MAX,res,latency,quality->P[k],quality->Q[k],pad,Nlo,channels,ta,pa);
-
-  if(!parent && bPreAnalyze) {
-    this->bPreAnalyze = true;
-    inPre = new GrainBuf(N, h, 2);
-    x1[0] = grain :: create(N,pad);
-    x1[1] = grain :: create(N,pad);
-    x2[0] = grain :: create(N,pad);
-    x2[1] = grain :: create(N,pad);
-  } else {
-    this->bPreAnalyze = false;
-    inPre = NULL;
+  inputFrameSize = M_MAX*quality->params.H;
+  h = inputFrameSize / (M*nGrainsPerFrame);
+  nToDrop0 = (quality->getMaxPresamples()/M - N0/2);
+  nToDrop1 = (quality->getMaxPresamples()/M - N1/2);
+  nToDrop2 = (quality->getMaxPresamples()/M - N2/2);
+  nToWriteForGrain = (quality->getMaxPresamples()/M + N2/2);
+  nToPrepad1 = N1/2;
+  nToPrepad0 = N0/2;
+  nReadFromOutputFrame = 0;
+  for(int i=0; i<3; i++) {
+    nFramesAnalyzed[i] = 0;
   }
-
+  for(int c=0; c<channels; c++) {
+    nFramesExtracted[c] = 0;
+    nFramesMarked[c] = 0;
+    nFramesAssigned[c] = 0;
+    nFramesTrialed2[c] = 0;
+    nFramesTrialed1[c] = 0;
+    nFramesRendered[c] = 0;
+    nGrainsMarked[c] = 0;
+    nGrainsAssigned[c] = 0;
+    nGrainsTrialed2[c] = 0;
+    nGrainsTrialed1[c] = 0;
+    nGrainsAdvanced[c] = 0;
+  }
+  nGrainsWritten = 0;
+  nFramesAdjusted2 = 0;
+  nGrainsAdjusted2 = 0;
+  nFramesAdjusted1 = 0;
+  nGrainsAdjusted1 = 0;
+  nFramesRead = 0;
+  totalSizef = 0.0;
   if(sub) {
-    subOut = new SampleBuf(0);
-
-    // receive
-    in = new GrainBuf(N, N/s, 1);
-
-    // samples to sub
-    subIn = new SampleBuf(N/2);
-
-    // output samples
-    outMixer = new Mixer(smser,subOut);
-  } else {
-    outMixer = smser;
+    samplesSubIn = new SampleBuf(NDownSample/2);
+    grainsIn = new GrainBuf(NDownSample, NDownSample/SDownSample, NDownSample, hann);
+    downSampledGrainAllocator = new GrainAllocator(NDownSample/2,NDownSample/2,hann);
+  }
+  if(band >= minTrial1Band) {
+    grains[0] = new GrainBuf(N, h, N0, hannpoisson);
+  } else {
+    grains[0] = NULL;
+  }
+  if(band >= minTrial2Band) {
+    grains[1] = new GrainBuf(N, h, N1, hannpoisson);
+  } else {
+    grains[1] = NULL;
+  }
+  grains[2] = new GrainBuf(N, h, N2, hannpoisson);
+  for(int c=0; c<channels; c++) {
+    if(band >= minTrial1Band) {
+      analyzedGrains[0][c] = new GrainBuf(N, h, N0, hannpoisson);
+    } else {
+      analyzedGrains[0][c] = NULL;
+    }
+    if(band >= minTrial2Band) {
+      analyzedGrains[1][c] = new GrainBuf(N, h, N1, hannpoisson);
+    } else {
+      analyzedGrains[1][c] = NULL;
+    }
+    analyzedGrains[2][c] = new GrainBuf(N, h, N2, hannpoisson);
   }
-
 #ifdef MULTITHREADED
   pthread_mutex_init(&dataMutex, NULL);
-  pthread_mutex_init(&bufferMutex, NULL);
+  for(int i=0; i<3; i++) {
+    pthread_mutex_init(&grainMutex[i], NULL);
+  }
 #endif
-  
-}
-
-long subband :: getFramePos()
-{
-  return nFramesRead;  
-}
-
-void subband :: seek(long framePos) {
-  if(sub) sub->seek(framePos);
-  nFramesWritten = framePos;
-  nFramesAdded = framePos;
-  nFramesMarked[0] = framePos;
-  nFramesMarked[1] = framePos;
-  nFramesAssigned[0] = framePos;
-  nFramesAssigned[1] = framePos;
-  nFramesSynthed = framePos;
-  nFramesRead = framePos;
-}
-
-void subband :: reset() {
-  if(sub) sub->reset();
-  init();
-  inputFrameSize.clear();
-  outputFrameSize.clear();
-  aForH.clear();
-  aSynth.clear();
-  fSynth.clear();
-  frameRatio.clear();
-  in0->clear();
-  in1->clear();
-  in2->clear();
-  if(sub) {
-    in->clear();
-    subIn->clear();
-    subOut->clear();
+  sms = new SMS(sub?sub->sms:NULL,N,band,quality->params.bands-1,h,res,N0,N1,N2,channels,analyzedGrains[2][0]->getWindowFFT());
+  nTrial2Latency = sms->getTrial2Latency() / nGrainsPerFrame + 1;
+  if(sms->getTrial2Latency() % nGrainsPerFrame) nTrial2Latency++;
+  int nAdjust2LatencyGrains = N1/(2*h);
+  nAdjust2Latency = nAdjust2LatencyGrains / nGrainsPerFrame + 1;
+  if(nAdjust2LatencyGrains % nGrainsPerFrame) nAdjust2Latency++;
+  int nAdjust1LatencyGrains = N0/(2*h);
+  nAdjust1Latency = nAdjust1LatencyGrains / nGrainsPerFrame + 1;
+  if(nAdjust1LatencyGrains % nGrainsPerFrame) nAdjust1Latency++;
+  if(sub) nTrial2Latency = max(nTrial2Latency,sub->nTrial2Latency);
+  if(sub) nAdjust2Latency = max(nAdjust2Latency,sub->nAdjust2Latency);
+  if(sub) nAdjust1Latency = max(nAdjust1Latency,sub->nAdjust1Latency);
+  nMarkLatency = 1;
+  nAssignLatency = 1;
+  nTrial1Latency = 1;
+  nRenderLatency = 1;
+  if(band==0) {
+    SubBand *s = sub;
+    while(s) {
+      s->nTrial2Latency = nTrial2Latency;
+      s->nAdjust2Latency = nAdjust2Latency;
+      s->nAdjust1Latency = nAdjust1Latency;
+      s = s->sub;
+    }
   }
-  smser->reset();
+#ifdef MULTITHREADED
+  nWriteSlack = 6;
+  nAnalyzeSlack = 6;
+  nExtractSlack = 6;
+  nMarkSlack = 6;
+  nAssignSlack = 6;
+  nTrial2Slack = 6;
+  nAdjust2Slack = 6;
+  nTrial1Slack = 6;
+  nAdjust1Slack = 6;
+  nRenderSlack = 6;
+#else
+  nWriteSlack = 2;
+  nAnalyzeSlack = 2;
+  nExtractSlack = 2;
+  nMarkSlack = 2;
+  nAssignSlack = 2;
+  nTrial2Slack = 2;
+  nAdjust2Slack = 2;
+  nTrial1Slack = 2;
+  nAdjust1Slack = 2;
+  nRenderSlack = 2;
+#endif
+  synthRenderer = NULL;
+  outMixer = NULL;
+  if(bSynthesize) {
+    synthRenderer = new SynthRenderer(channels,M*h);
+    renderers.push_back(synthRenderer);
+    if(sub) {
+      samplesSubOut = new SampleBuf(0);
+      outMixer = new Mixer(synthRenderer,samplesSubOut);
+    } else {
+      outMixer = synthRenderer;
+    }
+  }       
 }
 
-void subband :: init()
+SubBand :: ~SubBand() 
 {
-  int ssms = (N*nGrainsPerFrame)/(resTotal*quality->H[2]);
-  h = N/ssms;
-  lastInputFrameSize = h*nGrainsPerFrame;
-  lastFrameA = 1.0f;
-  lastFrameRatio = 1.0f;
-  nLatency = nLatencyOriginal;
-  nToDrop = (quality->N[quality->bands-1]/quality->H[2]*nGrainsPerFrame-ssms)/2;
-  nDropped = 0;
-  nFramesSkipped = 0;
-  nFramesWritten = 0;
-  nFramesAdded = 0;
-  nFramesMarked[0] = 0;
-  nFramesMarked[1] = 0;
-  nFramesAssigned[0] = 0;
-  nFramesAssigned[1] = 0;
-  nFramesSynthed = 0;
-  nFramesRead = 0;
-  nTrackPointsWritten = 0;
-  nTrackPointsMarked[0] = 0;
-  nTrackPointsMarked[1] = 0;
-  nTrackPointsAssigned[0] = 0;
-  nTrackPointsAssigned[1] = 0;
-  nTrackPointsStarted[0] = 0;
-  nTrackPointsStarted[1] = 0;
-  nTrackPointsAdvanced[0] = 0;
-  nTrackPointsAdvanced[1] = 0;
-
-  samplesQueued = 0;
-
-  bWritingComplete = false;
-  
-  totalSizef = 0.0;
-}
-
-subband :: ~subband() 
-{
-  delete in0;
-  delete in1;
-  delete in2;
-  delete smser;
-
-  if(inPre) {
-    delete inPre;
-    grain ::destroy(x1[0]);
-    grain ::destroy(x1[1]);
-    grain ::destroy(x2[0]);
-    grain ::destroy(x2[1]);
+  for(int i=0; i<3; i++) {
+    if(grains[i]) {
+      delete grains[i];
+    }
+    for(int c=0; c<channels; c++) {
+      if(analyzedGrains[i][c]) {
+        delete analyzedGrains[i][c];
+      }
+    }
   }
+  delete sms;
   if(sub) {
     delete sub;
-    delete in;
-    delete subIn;
-    delete subOut;
-    delete outMixer;
+    delete grainsIn;
+    delete samplesSubIn;
+    delete downSampledGrainAllocator;
+    if(bSynthesize) {
+      delete samplesSubOut;
+      delete outMixer;
+    }
   }
+  if(bSynthesize) delete synthRenderer;
 }
 
-void subband :: setFrameSize(int iFrameSize, real a, real ratio)
+void SubBand :: addRenderer(SBSMSRenderer *renderer)
 {
-  real oFrameSizef = a*(real)iFrameSize;
-  totalSizef += oFrameSizef;
-  long oFrameSizei = round2int(totalSizef);
-  totalSizef -= oFrameSizei;
-  inputFrameSize.write(iFrameSize);
-  outputFrameSize.write(oFrameSizei);
-  lastInputFrameSize = iFrameSize;
-  lastOutputFrameSize = oFrameSizei;
-  samplesQueued += oFrameSizei * ratio;
-  //samplesQueued += oFrameSizei;
+  if(sub) sub->addRenderer(renderer);
+  renderers.push_back(renderer);
 }
 
-void subband :: setH(real ratio)
+void SubBand :: removeRenderer(SBSMSRenderer *renderer)
 {
-  real a = aForH.read(aForH.readPos);
-  if(a > 4.0)
-    h = quality->H[0];
-  else if(a > 2.0 && a <= 4.0)
-    h = quality->H[1];
-  else if(a >= 0.5 && a <= 2.0)
-    h = quality->H[2];
-  else if(a >= 0.25 && a < 0.5)
-    h = quality->H[3];
-  else
-    h = quality->H[4];
-
-  h = (h*resTotal)/nGrainsPerFrame;
-  in0->h = h;
-  in1->h = h;
-  in2->h = h;
-  if(inPre) inPre->h = h;
-  if(!parent) 
-    setFrameSize(h*nGrainsPerFrame,a,ratio);
-  aForH.advance(1);
+  if(sub) sub->removeRenderer(renderer);
+  renderers.remove(renderer);
 }
 
-void subband :: setAForH(real a)
+void SubBand :: setStretch(float stretch)
 {
-  aForH.write(a);
-  if(sub) sub->setAForH(a);
-}
-
-void subband :: setA(real a)
-{
-  aSynth.write(a);
-  if(sub) sub->setA(a);
-  lastFrameA = a;
-}
-
-void subband :: setF(real f)
-{
-  fSynth.write(f);
-  if(sub) sub->setF(f);
-}
-
-void subband :: setAMod(real a)
-{
-  aMod.write(a);
-}
-
-void subband :: setRatio(real ratio)
-{
-  frameRatio.write(ratio);
-  lastFrameRatio = ratio;
-}
-
-void subband :: write_(audio *inBuf, long n, real a, real ratio) 
-{
-  long nwritten = 0;
 #ifdef MULTITHREADED
   pthread_mutex_lock(&dataMutex);
 #endif
-
-  while(nwritten<n) {
-    long ntowrite = min((long)h,n-nwritten);
-    long ng = in1->write(inBuf+nwritten, ntowrite);
-    in0->write(inBuf+nwritten, ntowrite);
-    in2->write(inBuf+nwritten, ntowrite);
-    nwritten += ntowrite;
-    long n_advance = 0;
-    for(int k=0;k<ng;k++) {
-      if(nDropped < nToDrop) {
-        n_advance++;
-        nDropped++;
-      } else {
-	if(!parent && nTrackPointsWritten%nGrainsPerFrame == 0) {
-    real amod;
-    if(bPreAnalyze && aPreAnalysis.n_readable()) {
-	    amod = aPreAnalysis.read(aPreAnalysis.readPos);
-	    aPreAnalysis.advance(1);
-	  } else {
-      amod = 1.0f;
-	  }
-	  setA(amod*a);
-    setAMod(amod);	 
-	  setRatio(ratio);
-    setF(1.0f/ratio);
-	}
-	if(!parent && (nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
-	  setAForH(a);
-	}
-	if((nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
-	  setH(ratio);
-	  nFramesWritten++;
-	}
-	nTrackPointsWritten++;
-      }
-    }
-    if(n_advance) {
-      in0->advance(n_advance);
-      in1->advance(n_advance);
-      in2->advance(n_advance);
-    }
+  if(!parent) {
+    float oFrameSizef = (stretch==0.0f?1.0f:stretch)*(float)inputFrameSize;
+    totalSizef += oFrameSizef;
+    long oFrameSizei = lrintf(totalSizef);
+    totalSizef -= oFrameSizei;
+    outputFrameSize.write(oFrameSizei);
   }
-
+  stretchRender.write(stretch);
 #ifdef MULTITHREADED
   pthread_mutex_unlock(&dataMutex);
 #endif
-  
-  if(sub) {
-    in->write(inBuf, n);
-    long ng_read = 0;
-    for(int k=in->readPos;k<in->writePos;k++) {
-      grain *gdown = in->read(k)->downsample();
-      subIn->write(gdown, N/2/s);
-      grain :: destroy(gdown);
-      ng_read++;
-    }
-    in->advance(ng_read);  
-    long n_tosub = subIn->n_readable();
-    audio *subBuf = subIn->getReadBuf();
-    n_tosub = subIn->read(subBuf,n_tosub);
-    sub->write_(subBuf,n_tosub,a,ratio);
-    subIn->advance(n_tosub);
-  }
+  if(sub) sub->setStretch(stretch);
 }
 
-void subband :: stepAddFrame()
+void SubBand :: setPitch(float f)
 {
-  if(sub) sub->stepAddFrame();
-  nFramesAdded++;
+  if(sub) sub->setPitch(f);
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&dataMutex);
+#endif
+  pitchRender.write(f);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&dataMutex);
+#endif    
 }
 
-void subband :: stepMarkFrame(int c)
+void SubBand :: stepAnalyzeFrame(int i)
+{
+  if(sub) sub->stepAnalyzeFrame(i);
+  nFramesAnalyzed[i]++;
+}
+
+void SubBand :: stepExtractFrame(int c)
+{
+  if(sub) sub->stepExtractFrame(c);
+  nFramesExtracted[c]++;
+}
+
+void SubBand :: stepMarkFrame(int c)
 {
   if(sub) sub->stepMarkFrame(c);
   nFramesMarked[c]++;
 }
 
-void subband :: stepAssignFrame(int c)
+void SubBand :: stepAssignFrame(int c)
 {
   if(sub) sub->stepAssignFrame(c);
   nFramesAssigned[c]++;
 }
 
-void subband :: stepSynthFrame()
+void SubBand :: stepTrial2Frame(int c)
 {
-  if(sub) sub->stepSynthFrame();
+  if(sub) sub->stepTrial2Frame(c);
+  nFramesTrialed2[c]++;
+}
+
+void SubBand :: stepAdjust2Frame()
+{
+  if(sub) sub->stepAdjust2Frame();
+  nFramesAdjusted2++;
+}
+void SubBand :: stepTrial1Frame(int c)
+{
+  if(sub) sub->stepTrial1Frame(c);
+  nFramesTrialed1[c]++;
+}
+
+void SubBand :: stepAdjust1Frame()
+{
+  if(sub) sub->stepAdjust1Frame();
 #ifdef MULTITHREADED
   pthread_mutex_lock(&dataMutex);
 #endif
-  if(!parent) aMod.advance(1);
-  aSynth.advance(1);
-  fSynth.advance(1);
-  nFramesSynthed++;
+  stretchRender.advance(1);
+  pitchRender.advance(1);
 #ifdef MULTITHREADED
   pthread_mutex_unlock(&dataMutex);
 #endif
+  nFramesAdjusted1++;
 }
 
-void subband :: stepReadFrame()
+void SubBand :: stepRenderFrame(int c)
 {
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
+  if(sub) sub->stepRenderFrame(c);
+  nFramesRendered[c]++;
+}
+
+void SubBand :: stepReadFrame()
+{
+  if(sub) sub->stepReadFrame();
   nFramesRead++;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
 }
 
-long subband :: addInit(bool bSet)
+bool SubBand :: writeInit()
 {
-  long n;
-  if(sub) n = res*sub->addInit(bSet);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  if(!sub) n = max((long)0,min((long)1,min(in1->n_readable(),4-(nFramesAdded-getFramesMarked()))));
-  if(bSet) {
-    nTrackPointsToAdd = n;
+  long n = getFramesAtFront(0);
+  n = min(n,getFramesAtFront(1));
+  n = min(n,getFramesAtFront(2));
+  return (n <= nWriteSlack);
+}
+
+long SubBand :: readInit()
+{
+  long n = nFramesRendered[0];
+  for(int c=1; c<channels; c++) {
+    n = max(0L,min(1L,min(n,nFramesRendered[c]-nFramesRead)));
   }
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
+  if(sub) n = min(n,sub->readInit());
   return n;
 }
 
-void subband :: addTrackPoints()
+long SubBand :: analyzeInit(int i, bool bSet, long n)
 {
-  if(sub) sub->addTrackPoints();
-  vector<grain*> g0V;
-  vector<grain*> g1V;
-  vector<grain*> g2V;
-
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  for(int k=in1->readPos;k<in1->readPos+nTrackPointsToAdd;k++) {
-    grain *g0 = in0->read(k);
-    grain *g1 = in1->read(k);
-    grain *g2 = in2->read(k);
-    g0V.push_back(g0);
-    g1V.push_back(g1);
-    g2V.push_back(g2);
-  }
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-
-  int size = (int)g1V.size();
-  for(int k=0;k<size;k++) {
-    smser->addTrackPoints(g0V[k],g1V[k],g2V[k]);
-  }
-
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  in0->advance(nTrackPointsToAdd);
-  in1->advance(nTrackPointsToAdd);
-  in2->advance(nTrackPointsToAdd);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-
-}
-
-long subband :: markInit(bool bSet, int c)
-{
-  long n;
-  if(sub) n = res*sub->markInit(bSet,c);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  if(!sub) n = max((long)0,min((long)1,min(nFramesAdded-nFramesMarked[c]-1,4-(nFramesMarked[c]-nFramesAssigned[c]))));
-  if(bSet) {
-    nTrackPointsToMark[c] = n;
-  }
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
-}
-
-void subband :: markDuplicates(int c)
-{
-  long ntodo = parent?1:nTrackPointsToMark[c];
-  long ndone = 0;
-  while(ndone<ntodo) {  
-    smser->markDuplicates(nTrackPointsMarked[c],
-                          parent?parent->smser:NULL,
-                          sub?sub->smser:NULL,
-                          c);
-    if(nTrackPointsMarked[c]%res==1 || res==1) {
-      if(sub) sub->markDuplicates(c);
+  if(!parent) {
+    n = getFramesAtFront(i);
+    for(int c=0; c<channels; c++) {
+      n = max(0L,min(1L,min(n,nAnalyzeSlack-(long)(nFramesAnalyzed[i]-nFramesExtracted[c]))));
     }
-    ndone++;
-    nTrackPointsMarked[c]++;
   }
+  if(bSet) {
+    nGrainsToAnalyze[i] = n * nGrainsPerFrame;
+    if(sub) {
+      sub->analyzeInit(i,bSet,n);
+    }
+  }
+  return n;
 }
 
-long subband :: assignInit(bool bSet, int c)
+long SubBand :: extractInit(int c, bool bSet)
 {
   long n;
-  if(sub) n = res*sub->assignInit(bSet,c);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  if(!sub) n = max((long)0,min((long)1,min(nFramesMarked[c]-nFramesAssigned[c]-1,4+nLatency-(nFramesAssigned[c]-nFramesSynthed))));
+  if(sub) n = res*sub->extractInit(c,bSet);
+  if(!sub) {
+    n = max(0L,min(1L,nExtractSlack+nMarkLatency-(long)(nFramesExtracted[c]-nFramesMarked[c])));
+    for(int i=0; i<3; i++) {
+      n = max(0L,min(1L,min(n,(long)(nFramesAnalyzed[i]-nFramesExtracted[c]))));
+    }
+  }
   if(bSet) {
-    nTrackPointsToAdvance[c] = n;
-    nTrackPointsToAssign[c] = n;
-    if(nTrackPointsToAssign[c]) {
+    nGrainsToExtract[c] = n;
+  }
+  return n;
+}
+
+long SubBand :: markInit(int c, bool bSet)
+{
+  long n;
+  if(sub) n = res*sub->markInit(c,bSet);
+  if(!sub) n = max(0L,min(1L,min((long)(nFramesExtracted[c]-nFramesMarked[c])-nMarkLatency,
+                                 nMarkSlack+nAssignLatency-(long)(nFramesMarked[c]-nFramesAssigned[c]))));
+  if(bSet) {
+    nGrainsToMark[c] = n;
+  }
+  return n;
+}
+
+long SubBand :: assignInit(int c, bool bSet)
+{
+  long n;
+  if(sub) {
+    n = res * sub->assignInit(c,bSet);
+  } else {
+    n = max(0L,min(1L,min((long)(nFramesMarked[c]-nFramesAssigned[c])-nAssignLatency,
+                          nAssignSlack+nTrial2Latency-(long)(nFramesAssigned[c]-nFramesTrialed2[c]))));
+  }
+  if(bSet) {
+    nGrainsToAdvance[c] = n;
+    nGrainsToAssign[c] = n;
+    if(n) {
       if(nFramesAssigned[c]==0) {
-        smser->assignTrackPoints(nTrackPointsAssigned[c]++,
-                                 parent?parent->smser:NULL,
-                                 sub?sub->smser:NULL,
-                                 c);
-        smser->startNewTracks(nTrackPointsStarted[c]++,c);
+        sms->start(0,c);
       }      
     }
   }
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
   return n;
 }
 
-long subband :: assignTrackPoints(int c) 
+long SubBand :: trial2Init(int c, bool bSet)
 {
-  long ntodo = parent?1:nTrackPointsToAssign[c];
+  long n;
+  if(sub) {
+    n = res * sub->trial2Init(c,bSet);
+  } else {
+    n = max(0L,min(1L,min((long)(nFramesAssigned[c]-nFramesTrialed2[c])-nTrial2Latency,
+                          nTrial2Slack+nAdjust2Latency-(long)(nFramesTrialed2[c]-nFramesAdjusted2))));
+  }
+  if(bSet) {
+    nGrainsToTrial2[c] = n;
+    nGrainsTrialed2[c] = 0;
+  }
+  return n;
+}
+
+long SubBand :: adjust2Init(bool bSet)
+{
+  long n;
+  if(sub) {
+    n = res * sub->adjust2Init(bSet);
+  } else {
+    n = 1;
+    for(int c=0; c<channels; c++) {
+      n = min(n,(long)(nFramesTrialed2[c]-nFramesAdjusted2-nAdjust2Latency));
+      n = min(n,nAdjust2Slack+nTrial1Latency-(long)(nFramesAdjusted2-nFramesTrialed1[c]));
+    }
+    n = max(0L,n);
+  }
+  if(bSet) {
+    nGrainsToAdjust2 = n;
+    nGrainsAdjusted2 = 0;
+  }
+  return n;
+}
+
+long SubBand :: trial1Init(int c, bool bSet)
+{
+  long n;
+  if(sub) {
+    n = res * sub->trial1Init(c,bSet);
+  } else {
+    n = max(0L,min(1L,min((long)(nFramesAdjusted2-nFramesTrialed1[c])-nTrial1Latency,
+                          nTrial1Slack+nAdjust1Latency-(long)(nFramesTrialed1[c]-nFramesAdjusted1))));
+  }
+  if(bSet) {
+    nGrainsToTrial1[c] = n;
+    nGrainsTrialed1[c] = 0;
+  }
+  return n;
+}
+
+long SubBand :: adjust1Init(bool bSet)
+{
+  long n;
+  if(sub) {
+    n = res * sub->adjust1Init(bSet);
+  } else {
+    n = 1;
+    for(int c=0; c<channels; c++) {
+      n = min(n,(long)(nFramesTrialed1[c]-nFramesAdjusted1-nAdjust1Latency));
+      n = min(n,nAdjust1Slack+nRenderLatency-(long)(nFramesAdjusted1-nFramesRendered[c]));
+    }
+    n = max(0L,n);
+  }
+  if(bSet) {
+    nGrainsToAdjust1 = n;
+    nGrainsAdjusted1 = 0;
+  }
+  return n;
+}
+
+long SubBand :: renderInit(int c, bool bSet) 
+{
+  long n;
+  if(sub) {
+    n = res * sub->renderInit(c,bSet);
+  } else {
+    n = max(0L,min(1L,min((long)(nFramesAdjusted1-nFramesRendered[c])-nRenderLatency,
+                          nRenderSlack-(long)(nFramesRendered[c]-nFramesRead))));
+  }
+  if(bSet) {
+    nGrainsRendered[c] = 0;
+    nGrainsToRender[c] = n;
+  }
+  return n;
+}
+
+void SubBand :: analyze(int i)
+{
+  if(sub) sub->analyze(i);
+  if(grains[i]) {
+    vector<grain*> gV;
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&grainMutex[i]);
+#endif
+    for(int k=grains[i]->readPos;k<grains[i]->readPos+nGrainsToAnalyze[i];k++) {
+      grain *g = grains[i]->read(k);
+      gV.push_back(g);
+    }
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&grainMutex[i]);
+#endif
+
+    for(int k=0;k<nGrainsToAnalyze[i];k++) {
+      gV[k]->analyze();
+    }
+
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&grainMutex[i]);
+#endif
+    for(int k=0;k<nGrainsToAnalyze[i];k++) {
+      for(int c=0; c<channels; c++) {
+        analyzedGrains[i][c]->write(gV[k]);
+      }
+    }
+    grains[i]->advance(nGrainsToAnalyze[i]);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&grainMutex[i]);
+#endif
+  }
+}
+
+void SubBand :: extract(int c)
+{
+  if(sub) sub->extract(c);
+  vector<grain*> gV[3];
+
+  for(int i=0; i<3; i++) {
+    if(grains[i]) {
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&grainMutex[i]);
+#endif    
+      for(int k=analyzedGrains[i][c]->readPos;
+          k<analyzedGrains[i][c]->readPos+nGrainsToExtract[c];
+          k++) {
+        grain *g = analyzedGrains[i][c]->read(k);
+        gV[i].push_back(g);
+      }
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&grainMutex[i]);
+#endif
+    }
+  }
+
+  for(int k=0;k<nGrainsToExtract[c];k++) {
+    grain *g0 = (grains[0]?gV[0][k]:NULL);
+    grain *g1 = (grains[1]?gV[1][k]:NULL);
+    grain *g2 = gV[2][k];
+    sms->add(g0,g1,g2,c);
+  }
+
+  for(int i=0; i<3; i++) {
+    if(grains[i]) {
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&grainMutex[i]);
+#endif
+      analyzedGrains[i][c]->advance(nGrainsToExtract[c]);
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&grainMutex[i]);
+#endif
+    }
+  }
+}
+
+void SubBand :: mark(int c)
+{
+  long ntodo = parent?1:nGrainsToMark[c];
   long ndone = 0;
   while(ndone<ntodo) {  
-    if(nTrackPointsAssigned[c]%res==0) {
-      if(sub) sub->assignTrackPoints(c);
-      smser->assignTrackPoints(nTrackPointsAssigned[c]++,
-                               parent?parent->smser:NULL,
-                               sub?sub->smser:NULL,
-                               c);
-      if(!parent) startNewTracks(c);
-    } else {
-      smser->assignTrackPoints(nTrackPointsAssigned[c]++,
-                               parent?parent->smser:NULL,
-                               sub?sub->smser:NULL,
-                               c);
+    sms->mark(nGrainsMarked[c],c);
+    if(nGrainsMarked[c]&resMask || res==1) {
+      if(sub) sub->mark(c);
     }
-    if(parent && parent->res != 1)
-      parent->smser->startNewTracks(parent->nTrackPointsStarted[c]++,c);
-    
     ndone++;
-  }
-  
-  return nTrackPointsAssigned[c];
-}
-
-void subband :: startNewTracks(int c)
-{
-  if(!parent||!sub||nTrackPointsAssigned[c]%2==1||res==1) {
-    smser->startNewTracks(nTrackPointsStarted[c]++,c);
-  }
-  if(sub&&(nTrackPointsAssigned[c]%2==1||res==1)) {
-    sub->startNewTracks(c);
+    nGrainsMarked[c]++;
   }
 }
 
-void subband :: advanceTrackPoints(int c)
+void SubBand :: assign(int c) 
 {
-  long ntodo = parent?1:nTrackPointsToAdvance[c];
+  for(int ndone=0; ndone<nGrainsToAssign[c]; ndone++) {
+    assignStart(c);
+    bool bCont = true;
+    while(bCont) {
+      assignInit(c);
+      assignFind(c);
+      bCont = assignConnect(c);
+    }
+    assignStep(c);
+    splitMerge(c);
+  }
+}
+
+void SubBand :: assignStart(int c)
+{
+  if(sub && !(nGrainsAssigned[c]&resMask)) sub->assignStart(c);
+  sms->assignStart(nGrainsAssigned[c],c);
+}
+
+void SubBand :: assignInit(int c)
+{
+  if(sub) sub->assignInit(c);
+  sms->assignInit(nGrainsAssigned[c],c);
+}
+
+void SubBand :: assignFind(int c)
+{
+  if(sub) sub->assignFind(c);
+  sms->assignFind(nGrainsAssigned[c],c);
+}
+
+bool SubBand :: assignConnect(int c)
+{
+  bool bCont = false;
+  if(sub) {
+    if(sub->assignConnect(c)) {
+      bCont = true;
+    }
+  }  
+  if(sms->assignConnect(nGrainsAssigned[c],c,false)) {
+    bCont = true;
+  }
+  return bCont;
+}
+
+void SubBand :: assignStep(int c)
+{
+  sms->assignConnect(nGrainsAssigned[c],c,true);
+  if(sub && !((nGrainsAssigned[c]+1)&resMask)) {
+    sub->assignStep(c);
+  }
+  sms->start(nGrainsAssigned[c]+1,c);
+}
+
+void SubBand :: splitMerge(int c)
+{
+  nGrainsAssigned[c]++;
+  if(sub && !(nGrainsAssigned[c]&resMask)) {
+    sub->splitMerge(c);
+  }
+  sms->splitMerge(c);
+}
+
+void SubBand :: advance(int c)
+{
+  long ntodo = parent?1:nGrainsToAdvance[c];
   long ndone = 0;
-
   while(ndone<ntodo) {
-    if(nTrackPointsAdvanced[c]%res==0)
-      if(sub) sub->advanceTrackPoints(c);
-    smser->advanceTrackPoints(c);
-	nTrackPointsMarked[c]--;
-	nTrackPointsAssigned[c]--;
-	nTrackPointsStarted[c]--;
-    nTrackPointsAdvanced[c]++;
+    if(sub && !(nGrainsAdvanced[c]&resMask)) {
+      sub->advance(c);
+    }
+    sms->advance(c);
+    nGrainsMarked[c]--;
+    nGrainsAssigned[c]--;
+    nGrainsAdvanced[c]++;
     ndone++;
   }
 }
 
-long subband :: getFramesAssigned()
+void SubBand :: trial2(int c)
 {
-  long assigned = LONG_MAX;
-  for(int c=0;c<channels;c++) {
-    if(nFramesAssigned[c] < assigned)
-      assigned = nFramesAssigned[c];
+  for(int i=0; i<nGrainsToTrial2[c]; i++) {  
+    trial2Start(c);
+    trial2Trial(c);
+    trial2End(c);
   }
-  return assigned;
 }
 
-long subband :: getFramesMarked()
+void SubBand :: trial2Start(int c)
 {
-  long marked = LONG_MAX;
-  for(int c=0;c<channels;c++) {
-    if(nFramesMarked[c] < marked)
-      marked = nFramesMarked[c];
+  if(!(nGrainsTrialed2[c]&resMask)) {
+    if(sub) sub->trial2Start(c);
+    sms->trial2Start(c);
   }
-  return marked;
 }
 
-long subband :: readInit(bool bSet)
+void SubBand :: trial2Trial(int c)
 {
-  long n;
-  if(sub) n = res*sub->readInit(bSet);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  if(!sub) n = max((long)0,min((long)1,nFramesInFile-getFramesAssigned()));
-  if(bSet) {
-    nTrackPointsToAssign[0] = n;
-    nTrackPointsToAssign[1] = n;
+  if(sub && !(nGrainsTrialed2[c]&resMask)) {
+    sub->trial2Trial(c);
   }
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-
-  return n;
+  sms->trial2(c);
 }
 
-void subband :: readTrackPointsFromFile(FILE *fp)
+void SubBand :: trial2End(int c)
 {
-  long ntodo = parent?1:nTrackPointsToAssign[0];
+  nGrainsTrialed2[c]++;
+  if(!(nGrainsTrialed2[c]&resMask)) {
+    if(sub) sub->trial2End(c);
+    sms->trial2End(c);
+  }
+}
+
+void SubBand :: adjust2()
+{
+  long ntodo = parent?1:nGrainsToAdjust2;
   long ndone = 0;
-
-  while(ndone<ntodo) {
-    if(nTrackPointsAssigned[0]%res==0)
-      if(sub) sub->readTrackPointsFromFile(fp);
-    smser->readTrackPointsFromFile(fp);
-#ifdef MULTITHREADED
-    pthread_mutex_lock(&dataMutex);
-#endif
-    nTrackPointsAssigned[0]++;
-    nTrackPointsAssigned[1]++;
-    nTrackPointsStarted[0]++;
-    nTrackPointsStarted[1]++;
-    nTrackPointsMarked[0]++;
-    nTrackPointsMarked[1]++;
-#ifdef MULTITHREADED
-    pthread_mutex_unlock(&dataMutex);
-#endif
+  while(ndone<ntodo) {  
+    if(!(nGrainsAdjusted2&resMask)) {
+      if(sub) sub->adjust2();
+    }
+    sms->adjust2();
     ndone++;
+    nGrainsAdjusted2++;
   }
 }
 
-
-long subband :: writeTrackPointsToFile(FILE *fp) 
+void SubBand :: trial1(int c)
 {
-  long ntodo = parent?1:nTrackPointsToSynth;
-  long ndone = 0;
-  long frameBytes = 0;
-
-  while(ndone<ntodo) {
-    if(nTrackPointsSynthed%res==0)
-      if(sub) frameBytes += sub->writeTrackPointsToFile(fp);
-    
-    frameBytes += smser->writeTrackPointsToFile(fp);
-    nTrackPointsSynthed++;
-    ndone++;
+  for(int i=0; i<nGrainsToTrial1[c]; i++) {  
+    trial1Start(c);
+    trial1Trial(c);
+    trial1End(c);
   }
-  return frameBytes;
 }
 
-long subband :: synthInit(bool bSet) 
+void SubBand :: trial1Start(int c)
 {
-  long n;
-  if(sub) n = res*sub->synthInit(bSet);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  if(!sub) n = max((long)0,min((long)1,getFramesAssigned()-nFramesSynthed-nLatency));
-  if(bSet) {
-    nTrackPointsSynthed = 0;
-    nTrackPointsToSynth = n;
+  if(!(nGrainsTrialed1[c]&resMask)) {
+    if(sub) sub->trial1Start(c);
+    sms->trial1Start(c);
   }
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
 }
 
-void subband :: synthTracks() 
+void SubBand :: trial1Trial(int c)
+{
+  if(sub && !(nGrainsTrialed1[c]&resMask)) {
+    sub->trial1Trial(c);
+  }
+  sms->trial1(c);
+}
+
+void SubBand :: trial1End(int c)
+{
+  nGrainsTrialed1[c]++;
+  if(!(nGrainsTrialed1[c]&resMask)) {
+    if(sub) sub->trial1End(c);
+    sms->trial1End(c);
+  }
+}
+
+void SubBand :: adjust1()
 {
 #ifdef MULTITHREADED
   pthread_mutex_lock(&dataMutex);
 #endif
-  real a = aSynth.read(aSynth.readPos);
-  real f0 = fSynth.read(fSynth.readPos);
-  real f1;
-  if(fSynth.n_readable()>=2)
-    f1 = fSynth.read(fSynth.readPos+1);
-  else
+  float stretch = stretchRender.read();
+  float f0 = pitchRender.read(pitchRender.readPos);
+  float f1;
+  if(pitchRender.nReadable()>=2) {
+    f1 = pitchRender.read(pitchRender.readPos+1);
+  } else {
     f1 = f0;
+  }
 #ifdef MULTITHREADED
   pthread_mutex_unlock(&dataMutex);
 #endif
-  long ntodo = parent?1:nTrackPointsToSynth;
+  long ntodo = parent?1:nGrainsToAdjust1;
   long ndone = 0;
-
-  while(ndone<ntodo) {
-    if(nTrackPointsSynthed%res==0)
-      if(sub) sub->synthTracks();   
-    real df = (f1-f0)/(real)nTrackPointsToSynth;
-    smser->synthTracks(a,f0+nTrackPointsSynthed*df,f0+(nTrackPointsSynthed+1)*df);
-    nTrackPointsSynthed++;
+  float df = (f1-f0)/(float)nGrainsToAdjust1;
+  while(ndone<ntodo) {  
+    if(!(nGrainsAdjusted1&resMask)) {
+      if(sub) sub->adjust1();
+    }
+    sms->adjust1(stretch,f0+nGrainsAdjusted1*df,f0+(nGrainsAdjusted1+1)*df);
     ndone++;
+    nGrainsAdjusted1++;
   }
 }
 
-void subband :: readSubSamples()
+void SubBand :: readSubSamples()
 {
   if(sub) sub->readSubSamples();
   if(sub) {
-    audio fromSub[SUB_BUF_SIZE];
-    long n_fromsub = 0;
+    audio fromSub[subBufSize];
+    long nFromSub = 0;
     do {
-      n_fromsub = min((long)SUB_BUF_SIZE,sub->n_readable());
-      n_fromsub = sub->read(fromSub,n_fromsub);
-      subOut->write(fromSub, n_fromsub);
-    } while(n_fromsub>0);
+      nFromSub = sub->outMixer->read(fromSub,subBufSize);
+      samplesSubOut->write(fromSub, nFromSub);
+    } while(nFromSub>0);
   }
 }
 
-long subband :: write(audio *inBuf, long n, real a, real ratio)
-{
-  write_(inBuf, n, a, ratio);
-  return n;
-}
-
-void subband :: process()
-{
-  do { 
-    addInit(true);
-    addTrackPoints();
-    if(nTrackPointsToAdd) stepAddFrame();
-  } while(nTrackPointsToAdd);
-
-
-  for(int c=0;c<channels;c++) {
-    do { 
-      markInit(true,c);
-      markDuplicates(c);
-      if(nTrackPointsToMark[c]) stepMarkFrame(c);
-    } while(nTrackPointsToMark[c]);
-    
-    do {
-      assignInit(true,c);
-      assignTrackPoints(c);
-      advanceTrackPoints(c);
-      if(nTrackPointsToAssign[c]) stepAssignFrame(c);
-    } while(nTrackPointsToAssign[c]);
-  }
-}
-
-void subband :: setFramesInFile(long frames) 
-{
-  if(sub) sub->setFramesInFile(frames);
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  nFramesInFile = frames;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-}
-
-long subband :: readFromFile(FILE *fp, real a, real ratio)
-{
-  long samples = 0; 
-  if(readInit(true)) {
-    int framesize;
-    real amod;
-    fread(&framesize,sizeof(int),1,fp);
-    fread(&amod,sizeof(real),1,fp);
-    readTrackPointsFromFile(fp);
-    for(int c=0;c<channels;c++)
-      stepAssignFrame(c);
-    samples += framesize;
-#ifdef MULTITHREADED
-    pthread_mutex_lock(&dataMutex);
-#endif    
-    setA(1.0f+amod*(a-1.0f));
-    setAMod(amod);
-    setF(1.0f/ratio);
-    setRatio(ratio);
-    setFrameSize(framesize,a,ratio);
-#ifdef MULTITHREADED
-    pthread_mutex_unlock(&dataMutex);
-#endif    
-  }
-  return samples;
-}
-
-void subband :: writeFramePositionsToFile(FILE *fp)
-{
-  long frames = 0;
-  // samples, frames, channels, quality
-  long offset = 2*sizeof(long) + sizeof(int) + sizeof(sbsms_quality);
-  unsigned short maxtrackindex = ta->size();
-  fseek(fp,offset,SEEK_SET);
-  fwrite(&maxtrackindex,sizeof(unsigned short),1,fp); offset += sizeof(unsigned short);
-  fseek(fp,0,SEEK_END);
-  for(int k=frameBytes.readPos+nFramesSkipped; k<frameBytes.writePos;k++) {
-    long samples = inputFrameSize.read(k);
-    int bytes = frameBytes.read(k);
-    fwrite(&offset,sizeof(long),1,fp);
-    fwrite(&samples,sizeof(long),1,fp);
-    offset += bytes;
-    frames++;
-  }
-  //samples
-  offset = sizeof(long);
-  fseek(fp,offset,SEEK_SET);
-  fwrite(&frames,sizeof(long),1,fp);
-}
-
-long subband :: getFramesWrittenToFile()
-{
-  long samples = 0;
-  bool bRead;
-  do {
-#ifdef MULTITHREADED
-    pthread_mutex_lock(&dataMutex);
-#endif    
-    bRead = (nFramesSynthed > nFramesRead);
-#ifdef MULTITHREADED
-    pthread_mutex_unlock(&dataMutex);
-#endif    
-    if(bRead) {
-      stepReadFrame();
-      if(nFramesRead > nFramesSkipped)
-	samples += inputFrameSize.read(nFramesSynthed);
-    }
-  } while(bRead);
-  return samples;
-}
-
-long subband :: writeTracksToFile(FILE *fp)
-{
-  long samples = 0;
-  bool bReady = false;
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif    
-  if(inputFrameSize.n_readable() > nFramesSynthed) bReady = true;
-  if(!bReady) {
-#ifdef MULTITHREADED
-    pthread_mutex_unlock(&dataMutex);
-#endif    
-    return 0;
-  }
-  int framesize = inputFrameSize.read(nFramesSynthed);
-  real amod = aMod.read(aMod.readPos);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif    
-  samples += framesize;
-  int bytes = 0;
-  if(fp) {
-    fwrite(&framesize,sizeof(int),1,fp); bytes += sizeof(int);
-    fwrite(&amod,sizeof(real),1,fp); bytes += sizeof(real);
-  } else {
-    nFramesSkipped++;
-  }
-  bytes += writeTrackPointsToFile(fp);
-  frameBytes.write(bytes);
-  frameRatio.advance(1);
-  outputFrameSize.advance(1);
-  return samples;
-}
-
-long subband :: writeToFile(FILE *fp)
-{
-  long samples = 0; 
-  if(synthInit(true)) {
-    samples = writeTracksToFile(fp);
-    stepSynthFrame();
-  }
-  return samples;
-}
-
-long subband :: synth()
-{
-  long frames = 0;
-  do {
-    if(synthInit(true)) {
-      synthTracks();
-      stepSynthFrame();
-      frames++;
-    }
-  } while(nTrackPointsToSynth);
-  return frames;
-}
-
-long subband :: zeroPad()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  frameRatio.write(lastFrameRatio);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  long samples = zeroPad_();
-  return samples;
-}
-
-long subband :: zeroPad_()
-{
-  if(sub) sub->zeroPad_();
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  setFrameSize(lastInputFrameSize,lastFrameA,lastFrameRatio);
-  smser->zeroPad(lastOutputFrameSize);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return lastOutputFrameSize;
-}
-
-bool subband :: isframe_readable()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  if(!outputFrameSize.n_readable())
-    return false;
-  long n = outputFrameSize.read(outputFrameSize.readPos);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return (n_readable()>=n);
-}
-
-long subband :: getSamplesQueued()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  long n = (long)round2int(samplesQueued);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
-}
-
-long subband :: getFramesQueued()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  long n = outputFrameSize.n_readable();
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
-}
-
-long subband :: getFramesAtFront()
-{
-  if(sub) return sub->getFramesAtFront();
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  long n = in1->n_readable();
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
-}
-
-long subband :: getFramesAtBack()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  long n =  getFramesAssigned() - nFramesSynthed;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
-}
-
-long subband :: getLastInputFrameSize()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  long n = lastInputFrameSize;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-  return n;
-}
-
-long subband :: n_readable()
-{
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&bufferMutex);
-#endif
-  long n = outMixer->n_readable();
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&bufferMutex);
-#endif
-  return n;
-}
-
-long subband :: read(audio *buf, real *ratio0, real *ratio1) 
+long SubBand :: read(audio *buf, long n) 
 {
+  long nRead = 0;
+  long nToRead = n;
   readSubSamples();
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  long n = 0;
-  if(outputFrameSize.n_readable() >= 2) {
-    n = outputFrameSize.read(outputFrameSize.readPos);
-    if(n_readable()>=n) {
-      real rat0 = frameRatio.read(frameRatio.readPos);
-      real rat1 = frameRatio.read(frameRatio.readPos+1);
-      if(ratio0 != NULL) *ratio0 = rat0;
-      if(ratio1 != NULL) *ratio1 = rat1;
-      samplesQueued -= n*0.5f*(rat0+rat1);
+  while(nToRead && nRead < n && outputFrameSize.nReadable()) {
+    long nToReadFromOutputFrame = outputFrameSize.read();
+    nToRead = min(n-nRead,nToReadFromOutputFrame-nReadFromOutputFrame);
+    nToRead = outMixer->read(buf+nRead, nToRead);
+    nReadFromOutputFrame += nToRead;
+    nRead += nToRead;
+    if(nReadFromOutputFrame == nToReadFromOutputFrame) {
+      nReadFromOutputFrame = 0;
       outputFrameSize.advance(1);
-      inputFrameSize.advance(1);
-      frameRatio.advance(1);
-#ifdef MULTITHREADED
-      pthread_mutex_unlock(&dataMutex);
-#endif
-      if(buf) {
-        stepReadFrame();
-      }
-      n = read(buf, n);
-    } else {
-      n = 0;
-#ifdef MULTITHREADED
-      pthread_mutex_unlock(&dataMutex);
-#endif
+      stepReadFrame();
     }
-  } else {
-#ifdef MULTITHREADED
-    pthread_mutex_unlock(&dataMutex);
-#endif
   }
-
-  return n;
+  return nRead;
 }
 
-long subband :: read(audio *buf, long n)
+long SubBand :: renderSynchronous() 
 {
-  if(n==0)
-    return 0;
-  long n_read = n;
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&bufferMutex);
-#endif
-  if(buf) n_read = outMixer->read(buf, n_read);
-  outMixer->advance(n_read);
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&bufferMutex);
-#endif
-
-  return n_read;
-}
-
-void subband :: writingComplete()
-{
-  if(sub) sub->writingComplete();
-#ifdef MULTITHREADED
-  pthread_mutex_lock(&dataMutex);
-#endif
-  nLatency = 0;
-  bWritingComplete = true;
-#ifdef MULTITHREADED
-  pthread_mutex_unlock(&dataMutex);
-#endif
-}
-
-long subband :: preAnalyze(audio *buf, long n, real a, real ratio)
-{
-  long nwritten = 0;
-  while(nwritten<n) {
-    long ntowrite = min((long)(inPre->h),n-nwritten);
-    inPre->write(buf+nwritten,ntowrite);
-
-    nwritten += ntowrite;
-    
-    long ng_read = 0;
-    for(int k=inPre->readPos;k<inPre->writePos;k++) {
-      if(nDropped < nToDrop) {
-        nDropped++;
-      } else {
-        if(!parent && (nTrackPointsWritten)%nGrainsPerFrame == 0) {
-          grain *g = inPre->read(k);
-          grain::referenced(g);
-          real o = calculateOnset(gPrev,g);
-          onset.write(o);
-          if(gPrev) grain::forget(gPrev);
-          gPrev = g;
-          setA(a);
-        }
-        if(!parent && (nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
-          setAForH(a);
-        }
-        if((nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
-          setH(ratio);
-        }
-        nTrackPointsWritten++;
-      }
-      ng_read++;
-    }
-    inPre->advance(ng_read);
+  for(list<SBSMSRenderer*>::iterator i = renderers.begin(); i != renderers.end(); ++i) {
+    SBSMSRenderer *renderer = *i;
+    renderer->startFrame();
   }
-  long samples = 0;
-  while(inputFrameSize.n_readable()) {
-    samples += inputFrameSize.read(inputFrameSize.readPos);
-    inputFrameSize.advance(1);
-    outputFrameSize.advance(1);
+  for(int c=0; c<channels; c++) {    
+    renderInit(c,true);
+    render(c);
+    stepRenderFrame(c);
   }
+  for(list<SBSMSRenderer*>::iterator i = renderers.begin(); i != renderers.end(); ++i) {
+    SBSMSRenderer *renderer = *i;
+    renderer->endFrame();
+  }
+  long samples = outputFrameSize.read();
+  outputFrameSize.advance(1);
+  stepReadFrame();
   return samples;
 }
 
-real subband :: getOnset(long k)
+void SubBand :: render(int c)
 {
-  real tot = 2.0f*onset.read(k);
-  real c = 2.0f;
-  if(k-1>=onset.readPos) {
-    tot += onset.read(k-1);
-    c += 1.0f;
+  long ntodo = parent?1:nGrainsToRender[c];
+  long ndone = 0;
+  long nRenderedTotal = 0;
+
+  while(ndone<ntodo) {
+    if(sub && !(nGrainsRendered[c]&resMask)) {
+      sub->render(c);
+    }
+    sms->render(c,renderers);
+    nGrainsRendered[c]++;
+    ndone++;
   }
-  if(k+1<onset.writePos) {
-    tot += onset.read(k+1);
-    c += 1.0f;
-  }
-  return tot / c;
 }
 
-void subband :: preAnalyzeComplete()
+void SubBand :: renderComplete(const SampleCountType &samples)
 {
-  long k0 = onset.readPos;
-  long k1 = onset.writePos;
-  long kstart = 0;
-  long kend = 0;
+  for(list<SBSMSRenderer*>::iterator i = renderers.begin(); i != renderers.end(); ++i) {
+    SBSMSRenderer *renderer = *i;
+    renderer->end(samples);
+  }
+}
 
-  for(long k=k0;k<k1;k++) {
-    bool bOnset = false;
-    if(k==k0) {
-      bOnset = true;
+long SubBand :: write(audio *inBuf, long n, float stretch, float pitch)
+{
+  long nWritten = 0;
+
+  while(nWritten<n) {
+    long nToWrite = min(nToWriteForGrain,n-nWritten);
+    if(nToDrop2) {
+      nToWrite = min(nToDrop2,nToWrite);
+      nToDrop2 -= nToWrite;
+      nToDrop1 -= nToWrite;
+      nToDrop0 -= nToWrite;
     } else {
-      real o0 = getOnset(k);
-      if(o0 < 0.1f) continue;
-      real o1 = getOnset(k-1);
-      if(o0 < 1.1f*o1) continue;
-      if(o0 < 0.22f) continue;
-      bOnset = ((o0 > 0.4f) || (o0>1.4f*o1));
-      if(!bOnset && k>k0+1) {
-        real o2 = getOnset(k-2);
-        bOnset = ((o0 > 1.2f*o1) && (o1 > 1.2f * o2));
-        if(!bOnset && k>k0+2) {
-          real o3 = getOnset(k-3);
-          bOnset = ((o0 > 0.3f) && (o1 > 1.1f * o2) && (o2 > 1.1f * o3));
+      if(nToDrop1) {
+        nToWrite = min(nToDrop1,nToWrite);
+        nToDrop1 -= nToWrite;
+        nToDrop0 -= nToWrite;
+      } else {
+        if(nToDrop0) {
+          nToWrite = min(nToDrop0,nToWrite);
+        } else if(nToPrepad0) {
+          nToWrite = min(nToPrepad0,nToWrite);
+        }
+        if(nToPrepad1) {
+          nToWrite = min(nToPrepad1,nToWrite);
+          sms->prepad1(inBuf+nWritten, nToWrite);
+          nToPrepad1 -= nToWrite;
+        }
+        if(nToDrop0) {
+          nToDrop0 -= nToWrite;
+        } else {
+          if(nToPrepad0) {
+            sms->prepad0(inBuf+nWritten, nToWrite);
+            nToPrepad0 -= nToWrite;
+          }
+#ifdef MULTITHREADED
+          pthread_mutex_lock(&grainMutex[0]);
+#endif      
+          if(grains[0]) {
+            grains[0]->write(inBuf+nWritten, nToWrite);
+          }
+#ifdef MULTITHREADED
+          pthread_mutex_unlock(&grainMutex[0]);
+#endif
+        }
+#ifdef MULTITHREADED
+        pthread_mutex_lock(&grainMutex[1]);
+#endif      
+        if(grains[1]) {
+          grains[1]->write(inBuf+nWritten, nToWrite);
+        }
+#ifdef MULTITHREADED
+        pthread_mutex_unlock(&grainMutex[1]);
+#endif
+      }
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&grainMutex[2]);
+#endif      
+      grains[2]->write(inBuf+nWritten, nToWrite);
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&grainMutex[2]);
+#endif
+    }
+    nWritten += nToWrite;
+    nToWriteForGrain -= nToWrite;
+    if(nToWriteForGrain == 0) {
+      nToWriteForGrain = h;
+      if(!parent) {
+        if(nGrainsWritten == 0) {
+          setStretch(stretch);
+          setPitch(pitch);
+        }
+        nGrainsWritten++;
+        if(nGrainsWritten == nGrainsPerFrame) {
+          nGrainsWritten = 0;
         }
       }
     }
-    if(bOnset) {
-      if(kend != 0) {
-        calculateA(kstart,kend);
-      }
-      kstart = kend;
-      kend = k;
-    }
   }
-  calculateA(kstart,k1);
-  aPreAnalysis.write(1.0f);
-  aPreAnalysis.advance(1);
+
+  if(sub) {
+    grainsIn->write(inBuf, n);
+    long nGrainsRead = 0;
+    for(int k=grainsIn->readPos;k<grainsIn->writePos;k++) {
+      grain *g = grainsIn->read(k); g->analyze();
+      grain *gdown = downSampledGrainAllocator->create();
+      g->downsample(gdown);
+      samplesSubIn->write(gdown, hSub);
+      downSampledGrainAllocator->forget(gdown);
+      nGrainsRead++;
+    }
+    grainsIn->advance(nGrainsRead);  
+    long nWriteToSub = samplesSubIn->nReadable();
+    audio *subBuf = samplesSubIn->getReadBuf();
+    nWriteToSub = sub->write(subBuf,nWriteToSub,stretch,pitch);
+    samplesSubIn->advance(nWriteToSub);
+  }
+  return n;
 }
 
-void subband :: calculateA(long kstart, long kend)
+void SubBand :: process(bool bRender)
 {
-  real oMax = 0.0f;
-  real dTotal = 0.0f;
-
-  for(long k=kstart;k<kend;k++) {
-    real o = getOnset(k);
-    if(o > oMax) oMax = o;
+  for(int i=0; i<3; i++) {
+    if(analyzeInit(i,true)) {
+      analyze(i);
+      stepAnalyzeFrame(i);
+    }
   }
 
-  oMax *= 1.3;
-
-  for(long k=kstart;k<kend;k++) {
-    real o = getOnset(k);
-    real d = oMax - o;
-    dTotal += d;
-  }
-
-  real aAllot = (real)(kend-kstart);
-  for(long k=kstart;k<kend;k++) {
-    real o = getOnset(k);
-    real d = oMax - o;
-    real da;
-    if(dTotal == 0.0 || k+1==kend) {
-      da = aAllot;
-    } else {
-      da = d/dTotal*aAllot;
+  for(int c=0; c<channels; c++) {
+    if(extractInit(c,true)) {
+      extract(c);
+      stepExtractFrame(c);
     }
 
-    dTotal -= d;
-    aAllot -= da;
-    aPreAnalysis.write(da);
-  }
-
-}
-
-real subband :: calculateOnset(grain *g1, grain *g2)
-{  
-  _c2evenodd(g2->x, x2[0]->x, x2[1]->x, g2->N);
-  real o = 1.0f;
-  if(g1!=NULL) {
-    int Nover2 = N/2;
-    int nOnset = 0;
-    int nThresh = 0;
-    for(int k=0;k<Nover2;k++) {
-      real m2 = norm2(x2[0]->x[k]) + norm2(x2[1]->x[k]);
-      real m1 = norm2(x1[0]->x[k]) + norm2(x1[1]->x[k]);
-      bool bThresh = (m2 > 1e-6);
-      bool bOnset = (m2 > 2.0f*m1) && bThresh;
-      if(bOnset) nOnset++;
-      if(bThresh) nThresh++;
+    if(markInit(c,true)) {
+      mark(c);
+      stepMarkFrame(c);
     }
-    if(nThresh == 0)
-      o = 0.0f;
-    else
-      o = (real)nOnset/(real)nThresh;
-  } 
-  memcpy(x1[0]->x,x2[0]->x,g2->N*sizeof(audio));
-  memcpy(x1[1]->x,x2[1]->x,g2->N*sizeof(audio));
-  return o;
+    
+    if(assignInit(c,true)) {
+      assign(c);
+      advance(c);
+      stepAssignFrame(c);
+    }
+
+    if(trial2Init(c,true)) {
+      trial2(c);
+      stepTrial2Frame(c);
+    }
+
+    if(adjust2Init(true)) {
+      adjust2();
+      stepAdjust2Frame();
+    }
+
+    if(trial1Init(c,true)) {
+      trial1(c);
+      stepTrial1Frame(c);
+    }
+
+    if(adjust1Init(true)) {
+      adjust1();
+      stepAdjust1Frame();
+    }
+
+    if(bRender) {
+      if(renderInit(c,true)) {
+        render(c);
+        stepRenderFrame(c);
+      }
+    }
+  }
+}
+
+long SubBand :: getFramesAtFront(int i)
+{
+  long n = 65536;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&grainMutex[i]);
+#endif
+  if(grains[i]) {
+    n = grains[i]->nReadable() / nGrainsPerFrame;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&grainMutex[i]);
+#endif
+  if(sub) n = min(n,sub->getFramesAtFront(i));
+  return n;
+}
+
+long SubBand :: getInputFrameSize()
+{
+  return inputFrameSize;
 }
 
 }
diff --git a/lib-src/sbsms/src/subband.h b/lib-src/sbsms/src/subband.h
index 4b4e34edf..e600f2ac0 100644
--- a/lib-src/sbsms/src/subband.h
+++ b/lib-src/sbsms/src/subband.h
@@ -1,9 +1,9 @@
+// -*- mode: c++ -*-
 #ifndef SUBBAND_H
 #define SUBBAND_H
 
 #include "real.h"
 #include "buffer.h"
-#include "audio.h"
 #include "sms.h"
 #include <stdio.h>
 #include "config.h"
@@ -13,164 +13,172 @@
 
 namespace _sbsms_ {
 
-class renderer;
+enum {
+  NDownSample = 256,
+  SDownSample = 4,
+  subBufSize = 512,
+  hSub = NDownSample/(2*SDownSample)
+};
 
-class subband {
-  friend class renderer;
+class SubBand {
  public:
-  subband(subband *parent, unsigned short M, int channels, sbsms_quality *quality, int latency, bool bPreAnalysis, TrackAllocator *ta, PeakAllocator *pa);
-  ~subband();
+  SubBand(SubBand *parent, int band, int channels, SBSMSQuality *quality, bool bSynthesize);
+  ~SubBand();
 
-  long write(audio *buf, long n, real a, real ratio);
-  void process();
-  long read(audio *buf, real *ratio0, real *ratio1);
-  long n_readable();
-  bool isframe_readable();
-  void writingComplete();
-  long readFromFile(FILE *fp, real a, real ratio);
-  long synth();
-  long getFramesWrittenToFile();
-  long writeToFile(FILE *fp);
-  void init();
-  void reset();
-  void seek(long framePos);
-  long getSamplesQueued();
-  long getFramesQueued();
-  long getFramesAtFront();
-  long getFramesAtBack();
-  long getLastInputFrameSize();
-  long getFramePos();
-  void write_(audio *buf, long n, real a, real ratio);
+  long write(audio *buf, long n, float stretch, float pitch);
+  long read(audio *buf, long n);
+  long getInputFrameSize();
 
-  void writeFramePositionsToFile(FILE *fp);
-  long addInit(bool);
-  void addTrackPoints();
-  long markInit(bool, int c);
-  void markDuplicates(int c);
-  long assignInit(bool,int c);
-  long assignTrackPoints(int c);
-  void startNewTracks(int c);
-  void advanceTrackPoints(int c);
-  long synthInit(bool);
-  void synthTracks();
-  long readInit(bool);
-  long writeTracksToFile(FILE *fp);
-  void readTrackPointsFromFile(FILE *fp);
-  long writeTrackPointsToFile(FILE *fp); 
-  void stepAddFrame();
-  void stepMarkFrame(int c);
-  void stepAssignFrame(int c);
-  void stepSynthFrame();
+  bool writeInit();
+  long analyzeInit(int,bool,long n=0);
+  long extractInit(int,bool);
+  long markInit(int,bool);
+  long assignInit(int,bool);
+  long trial2Init(int,bool);
+  long adjust2Init(bool);
+  long trial1Init(int,bool);
+  long adjust1Init(bool);
+  long renderInit(int,bool);
+  long writeFromFileInit(int,bool);
+  long readInit();
+
+  void analyze(int);
+  void extract(int);
+  void mark(int);
+  void assign(int);
+  void trial2(int);
+  void trial2Start(int);
+  void trial2Trial(int);
+  void trial2End(int);
+  void adjust2();
+  void trial1(int);
+  void trial1Start(int);
+  void trial1Trial(int);
+  void trial1End(int);
+  void adjust1();
+  void advance(int);
+  void render(int);
+
+  void assignStart(int c);
+  void assignInit(int c);
+  void assignFind(int c);
+  bool assignConnect(int c);
+  void assignStep(int c);
+  void splitMerge(int c);
+  void addRenderer(SBSMSRenderer *);
+  void removeRenderer(SBSMSRenderer *);
+  long renderSynchronous();
+  void renderComplete(const SampleCountType &samples);
+  void process(bool);
+
+  void stepAnalyzeFrame(int);
+  void stepExtractFrame(int);
+  void stepMarkFrame(int);
+  void stepAssignFrame(int);
+  void stepTrial2Frame(int);
+  void stepAdjust2Frame();
+  void stepTrial1Frame(int);
+  void stepAdjust1Frame();
+  void stepRenderFrame(int);
   void stepReadFrame();
-  void readSubSamples();
-  void setA(real a);
-  void setAMod(real a);
-  void setAForH(real a);
-  void setH(real ratio);
-  void setF(real f);
-  void setFrameSize(int inputSize, real a, real ratio);
-  void setRatio(real ratio);
-  void setFramesInFile(long frames);
-  long zeroPad();
-  long zeroPad_();
 
-  long preAnalyze(audio *buf, long n, real a, real ratio);
-  void preAnalyzeComplete();
-
-  FILE *fp;
-
-  long getFramesAssigned();
-  long getFramesMarked();
-
-  bool isWriteReady();
-  bool isAddReady();
-  bool isMarkReady();
-  bool isAssignReady();
-  bool isSynthReady();
 #ifdef MULTITHREADED
   pthread_mutex_t dataMutex;
-  pthread_mutex_t bufferMutex;
+  pthread_mutex_t grainMutex[3];
 #endif
-
-  long nLatency;
-  long nLatencyOriginal;
+  friend class SBSMSImp;
 
  protected:
-  long read(audio *buf, long n);
-  void calculateA(long kstart, long kend);
-  real calculateOnset(grain *g1, grain *g2);
+  void resetNoRecurse();
+  
+  long getFramesAtFront(int);
+  void readSubSamples();
+  void setStretch(float stretch);
+  void setPitch(float pitch);
 
-  TrackAllocator *ta;
-  PeakAllocator *pa;
-
-  RingBuffer<real> aPreAnalysis;
-  RingBuffer<real> aMod;
-  RingBuffer<real> aSynth;
-  RingBuffer<real> aForH;
-  RingBuffer<real> fSynth;
-  RingBuffer<int> inputFrameSize;
+  int nMarkLatency;
+  int nAssignLatency;
+  int nTrial2Latency;
+  int nAdjust2Latency;
+  int nTrial1Latency;
+  int nAdjust1Latency;
+  int nRenderLatency;
+  int nWriteSlack;
+  int nExtractSlack;
+  int nAnalyzeSlack;
+  int nMarkSlack;
+  int nAssignSlack;
+  int nTrial2Slack;
+  int nAdjust2Slack;
+  int nTrial1Slack;
+  int nAdjust1Slack;
+  int nRenderSlack;
+  list<SBSMSRenderer*> renderers;
+  RingBuffer<float> stretchRender;
+  RingBuffer<float> pitchRender;
+  int inputFrameSize;
   RingBuffer<int> outputFrameSize;
-  RingBuffer<real> frameRatio;
-  RingBuffer<int> frameBytes;
-  RingBuffer<real> onset;
-  grain *gPrev;
-
-  real getOnset(long k);
-  int lastInputFrameSize;
-  int lastOutputFrameSize;
-  real samplesQueued;
-  real lastFrameA;
-  real lastFrameRatio;
-  real totalSizef;
-  bool bPreAnalyze;
-  sbsms_quality *quality;
+  float totalSizef;
+  SBSMSQuality *quality;
   int channels;
   int N;
   int h;
-  unsigned short M;
-  int s;
-  int res;
-  int nGrainsPerFrame;
-  int resTotal;
-  long nDropped;
-  long nToDrop;
+  int band;
+  long nReadFromOutputFrame;
+  long nToWriteForGrain;
+  long res;
+  long resMask;
+  long nGrainsPerFrame;
+  long nToDrop0;
+  long nToDrop1;
+  long nToDrop2;
+  long nToPrepad1;
+  long nToPrepad0;
+  bool bSynthesize;
 
-  long nTrackPointsToAdd;
-  long nTrackPointsToMark[2];
-  long nTrackPointsToAssign[2];
-  long nTrackPointsToAdvance[2];
-  long nTrackPointsToSynth;
+  long nGrainsToAnalyze[3];
+  long nGrainsToExtract[2];
+  long nGrainsToMark[2];
+  long nGrainsToAssign[2];
+  long nGrainsToAdvance[2];
+  long nGrainsToTrial2[2];
+  long nGrainsToAdjust2;
+  long nGrainsToTrial1[2];
+  long nGrainsToAdjust1;
+  long nGrainsToRender[2];
+  long nGrainsWritten;
+  long nGrainsMarked[2];
+  long nGrainsAssigned[2];
+  long nGrainsTrialed2[2];
+  long nGrainsAdjusted2;
+  long nGrainsTrialed1[2];
+  long nGrainsAdjusted1;
+  long nGrainsAdvanced[2];
+  long nGrainsRendered[2];
+  long nGrainsRead;
 
-  long nTrackPointsMarked[2];
-  long nTrackPointsAssigned[2];
-  long nTrackPointsStarted[2];
-  long nTrackPointsAdvanced[2];
-  long nTrackPointsSynthed;
-  long nTrackPointsRead;
-  long nFramesSkipped;
-  long nFramesWritten;
-  long nFramesAdded;
+  long nFramesAnalyzed[3];
+  long nFramesExtracted[2];
   long nFramesMarked[2];
   long nFramesAssigned[2];
+  long nFramesTrialed2[2];
+  long nFramesAdjusted2;
+  long nFramesTrialed1[2];
+  long nFramesAdjusted1;
+  long nFramesRendered[2];
   long nFramesRead;
-  long nFramesSynthed;
-  long nFramesInFile;
-  long nTrackPointsWritten;
 
-  bool bWritingComplete;
-  subband *parent;
-  subband *sub;
-  GrainBuf *in0,*in1,*in2;
+  SubBand *parent;
+  SubBand *sub;
   SampleBufBase *outMixer;
-  sms *smser;
-  SampleBuf *subIn;
-  SampleBuf *subOut;
-  GrainBuf *in;
-  GrainBuf *inPre;
-  
-  grain *x1[2];
-  grain *x2[2];
-
+  SynthRenderer *synthRenderer;
+  SMS *sms;
+  SampleBuf *samplesSubIn;
+  SampleBuf *samplesSubOut;
+  GrainBuf *grains[3];
+  GrainBuf *analyzedGrains[3][2];
+  GrainBuf *grainsIn;
+  GrainAllocator *downSampledGrainAllocator;
 };
 
 }
diff --git a/lib-src/sbsms/src/track.cpp b/lib-src/sbsms/src/track.cpp
index ff4529627..5ae9d48c9 100644
--- a/lib-src/sbsms/src/track.cpp
+++ b/lib-src/sbsms/src/track.cpp
@@ -1,309 +1,345 @@
 #include "track.h"
-#include <math.h>
-#include "utils.h"
 #include "real.h"
-#include "sbsms.h"
-#include "sms.h"
-#include <vector>
+#include "dBTable.h"
+#include "synthTable.h"
+#include "utils.h"
+
+#include <algorithm>
 using namespace std;
 
 namespace _sbsms_ {
 
-#define SBSMS_TRACK_BLOCK 2048
-
-TrackAllocator :: TrackAllocator(bool bManageIndex)
+Track :: Track(float h, TrackIndexType index, TrackPoint *p, const TimeType &time, bool bStitch)
 {
-  this-> bManageIndex = bManageIndex;
-}
-
-TrackAllocator :: TrackAllocator(bool bManageIndex, unsigned short maxtrackindex)
-{
-  this-> bManageIndex = bManageIndex;
-  gTrack.resize(maxtrackindex);
-  init();
-}
-
-TrackAllocator :: ~TrackAllocator()
-{
-}
-
-void TrackAllocator :: init()
-{
-  for(unsigned short k=0;k<gTrack.size();k++)
-    gTrack[k] = NULL;
-  while(!gTrackIndex.empty())
-    gTrackIndex.pop();
-#ifdef MULTITHREADED
-	pthread_mutex_init(&taMutex,NULL);
-#endif
-}
-
-track *TrackAllocator :: getTrack(unsigned short index)
-{
-  return gTrack[index];
-}
-
-int TrackAllocator :: size()
-{
-  return gTrack.size();
-}
-
-track *TrackAllocator :: create(track *precursor, sms *owner, int res, unsigned short index) 
-{
-  track *t = new track(precursor,owner,res);
-  t->index = index;
-  gTrack[index] = t;
-  return t;
-}
-
-track *TrackAllocator :: create(track *precursor, sms *owner, int res) 
-{
-#ifdef MULTITHREADED
-	pthread_mutex_lock(&taMutex);
-#endif
-  if(gTrackIndex.empty()) {
-    unsigned short n = gTrack.size();
-    gTrack.resize(n+SBSMS_TRACK_BLOCK);
-    for(int k=n+SBSMS_TRACK_BLOCK-1;k>=n;k--) {
-      gTrackIndex.push(k);
-      gTrack[k] = NULL;
-    }
-  }
-  unsigned short index = gTrackIndex.top();
-  gTrackIndex.pop();
-#ifdef MULTITHREADED
-	pthread_mutex_unlock(&taMutex);
-#endif
-  return create(precursor, owner, res, index);
-}
-
-void TrackAllocator :: destroy(track *t)
-{
-#ifdef MULTITHREADED
-	pthread_mutex_lock(&taMutex);
-#endif
-  gTrack[t->index] = NULL;
-  if(bManageIndex) 
-    gTrackIndex.push(t->index);
-  delete t;
-#ifdef MULTITHREADED
-	pthread_mutex_unlock(&taMutex);
-#endif
-}
-
-track :: track(track *precursor, sms *owner, int res) 
-{
-  this->owner = owner;
-  this->res = res;
-  this->descendant = NULL;
-  this->precursor = precursor;
-  this->end = LONG_MAX;
-  this->rise = 0.3f;
-  this->fall = 0.5f;
-  tailEnd = 0;
-  tailStart = 0;
-  m_p = 0.0;
-  currtime = 0;
-}
-
-
-void track :: endTrack(bool bTail)
-{
-  end = back()->time;
-  if(bTail) {
-    this->fall = min(1.5f,.25f + back()->y / point[point.size()-2]->y);
-    tailEnd = 1;
-    end++;
-    trackpoint *f = new trackpoint(back());
-    f->time = back()->time + 1;
-    point.push_back(f);
-  }
-}
-
-void track :: synth(SampleBuf *out,
-                    long writePos,
-                    int c,
-                    long synthtime,
-                    int steps,
-                    real fScale0,
-                    real fScale1,
-                    real mScale) {
-  if(point.size()==0) return;
-  long k = synthtime - start;
-  if(k>=(long)point.size()-1) return;
-  currtime = synthtime;
-  if(k<0) return;
-  int k1 = k + 1;  
-
-  tpoint *tp0 = point[k];
-  tpoint *tp1 = point[k1];
-
-  real w0 = tp0->f;
-  real w1 = tp1->f;
-  real ph0 = tp0->ph;
-  real ph1 = tp1->ph;
-  real h = tp0->h;
- 
-  real dp = ph1 - ph0;
-  if(dp>PI) dp-=TWOPI;
-  else if(dp<-PI) dp+=TWOPI;
-  real dp0 = 0.5f*h*(w0 + w1);
-  real dw = canon(dp - dp0)/h;
-
-  if(k==0) {
-    if(precursor) {
-      m_p = precursor->m_pDescendant;
-    }  else {    
-      dw = 0;
-    }
-  }
-  
-  real dt = (real)steps;
-  w0 = (w0+dw);
-  w1 = (w1+dw);
-  w0 = w0*fScale0;
-  w1 = w1*fScale1;
-  dp = dt*0.5f*(w0 + w1);
-  real b = (w1 - w0)/(2.0f*dt);
-
-  bool bEnd = (k1==(long)point.size()-1);
-  bool bStart = (k==0);
-
-  if(bStart && tailStart) {
-    if(w0 < PI && w0 > -PI) {
-      real ph = m_p;
-      int rise = round2int(this->rise * (real)steps);
-      real dm = mScale*tp1->y/(real)rise;
-      real m = mScale*tp1->y - dm;
-      for(int i=steps-1;i>=steps-rise+1;i--) {
-        ph -= w0;     
-        if(ph<-PI) ph += TWOPI;
-        else if(ph>PI) ph -= TWOPI;
-        out->buf[writePos+i][c] += m * COS(ph);
-        m -= dm;
-      }
-    }
-  } else if(bEnd && tailEnd) {
-    if(w0 < PI && w0 > -PI) {
-      real ph = m_p;
-      int fall = round2int(this->fall * (real)steps);
-      real dm = mScale*tp0->y/(real)fall;
-      real m = mScale*tp0->y;
-      for(int i=0;i<fall;i++) {
-        out->buf[writePos+i][c] += m * COS(ph); 
-        ph += w0;
-        if(ph<-PI) ph += TWOPI;
-        else if(ph>PI) ph -= TWOPI;
-        m -= dm;
-      }
-    }
-  } else  {
-    real m = mScale*tp0->y;
-    real dm = mScale*(tp1->y0 - tp0->y)/dt;
-    real ph = m_p;
-    real b2tt1 = b;
-    real b2 = 2.0f*b;
-    real dph;
-
-    audio *o = &(out->buf[writePos]);
-    for(int i=0;i<steps;i++) {
-      dph = w0 + b2tt1;      
-      if(dph < PI && dph > -PI) (*o)[c] += m * COS(ph);
-      ph += dph;
-      if(ph<-PI) ph += TWOPI;
-      else if(ph>PI) ph -= TWOPI;
-      b2tt1 += b2;
-      m += dm;
-      o++;
-    }
-  }
-
-  if(bEnd) {
-    if(descendant && descendant->back()->M < tp0->M) {
-      m_pDescendant = canon(m_p + dp/dt*(real)(descendant->owner->samplePos - owner->samplePos));
-    }
-  } else if(bStart && tailStart) {
+  this->h = h;
+  jumpThresh = 1.0e-5f * h;
+  this->index = index;
+  bEnd = false;
+  bEnded = false;
+  bRender = false;
+  bSplit = false;
+  bMerge = false;
+  first = time;
+  start = time;
+  if(bStitch) {
+    this->bStitch = true;
   } else {
-    m_p = canon(m_p + dp);
-    if(descendant && descendant->back()->M > tp0->M && (k1+res==(long)point.size()-1)) {
-      m_pDescendant = canon(m_p + dp/dt*(real)(descendant->owner->samplePos - (owner->samplePos+steps)));
+    this->bStitch = false;
+    if(start > 0) {
+      start--;
+    }
+  }
+  point.push_back(p);
+  p->owner = this;
+  p->refCount++;
+  end = time;
+  last = time;
+}
+
+Track :: ~Track() {
+  for(vector<TrackPoint*>::iterator i = point.begin();
+      i != point.end();
+      ++i) {
+    TrackPoint *tp = (*i);
+    if(tp) tp->destroy();
+  }
+}
+
+TrackIndexType Track :: getIndex()
+{
+  return index;
+}
+
+bool Track :: isFirst(const TimeType &time)
+{
+  return (time == first);
+}
+
+bool Track :: isLast(const TimeType &time)
+{
+  return (time == last);
+}
+
+TimeType Track :: size()
+{
+  return point.size();
+}
+
+TrackPoint *Track :: back() 
+{
+  return point.back(); 
+}
+
+TrackPoint *Track :: getTrackPoint(const TimeType &time)
+{
+  return point[time - first];
+}
+
+SBSMSTrackPoint *Track :: getSBSMSTrackPoint(const TimeType &time)
+{
+  return getTrackPoint(time);
+}
+
+bool Track :: jump(TrackPoint *tp0, TrackPoint *tp1)
+{
+  if(tp1->m > tp0->m) {
+    float cost = 1.0e-4f * dBApprox(tp0->m,tp1->m);
+    return (cost > jumpThresh);
+  } else {
+    return false;
+  }
+}
+          
+TrackPoint *Track :: updateFPH(const TimeType &time, int mode, int n, float f0, float f1)
+{
+  if(time == start && time < first) {
+    TrackPoint *tp1 = getTrackPoint(time+1);
+    tp1->fSynth1 = max(0.0f,min(6.0f,f1 * tp1->f));
+    tp1->fSynth0 = tp1->fSynth1;
+    tp1->phSynth = tp1->ph;
+    if(mode == synthModeOutput && tp1->dupStereo) {
+      return tp1;
+    }
+  } else if(time == last) {
+    if(last < end) {
+      TrackPoint *tp0 = getTrackPoint(time);
+      tp0->fSynth0 = tp0->fSynth1;
+    }
+  } else {
+    TrackPoint *tp0 = getTrackPoint(time);
+    TrackPoint *tp1 = getTrackPoint(time+1);
+
+    if(mode == synthModeOutput) {
+      if(tp0->dupStereo && tp1->dupStereo && tp0->dupStereo->owner == tp1->dupStereo->owner) {
+        float dp = tp1->ph - tp0->ph;
+        float dp0 = 0.5f*h*(tp0->f + tp1->f);
+        float dw = canonPI(dp - dp0)/h;
+        float dpStereo = tp1->dupStereo->ph - tp0->dupStereo->ph;
+        float dp0Stereo = 0.5f*h*(tp0->dupStereo->f + tp1->dupStereo->f);
+        float dwStereo = canonPI(dpStereo - dp0Stereo)/h;
+        if(dw > .0013f * (tp0->f + tp1->f)) {
+          dw = 0;
+          dwStereo = 0;
+        } else if(dwStereo > .0013f * (tp0->dupStereo->f + tp1->dupStereo->f)) {
+          dwStereo = 0;
+        }
+        float w0 = 0.5f * (tp0->f + tp0->dupStereo->f + dw + dwStereo);
+        float w1 = 0.5f * (tp1->f + tp1->dupStereo->f + dw + dwStereo);
+        float dwSynth = 0.5f * canonPI(dp - dpStereo) / n;
+        if(!(bSplit && time == first)) {
+          tp0->fSynth0 = max(0.0f,min(6.0f,f0 * (w0 + dwSynth)));
+        }
+        if(!(bMerge && time + 1 == last)) {
+          tp1->fSynth1 = max(0.0f,min(6.0f,f1 * (w1 + dwSynth)));
+        }
+      } else {
+        float dp = tp1->ph - tp0->ph;
+        float dp0 = 0.5f*h*(tp0->f + tp1->f);
+        float dw = canonPI(dp - dp0)/h;
+        if(dw > .0013f * (tp0->f + tp1->f)) {
+          dw = 0;
+        }
+        if(!(bSplit && time == first)) {
+          tp0->fSynth0 = max(0.0f,min(6.0f,f0 * (tp0->f + dw)));
+        }
+        if(!(bMerge && time + 1 == last)) {
+          tp1->fSynth1 = max(0.0f,min(6.0f,f1 * (tp1->f + dw)));
+        }
+      }
+  
+      if(!(tp0->bSplit || tp0->bMerge || tp1->bSplit || tp1->bMerge) && jump(tp0,tp1)) {
+        tp1->bJump = true;
+        if(tp0->dupStereo && tp1->dupStereo) {
+          if(tp0->dupStereo->owner == tp1->dupStereo->owner) {
+            tp1->bSyncStereo = !jump(tp0->dupStereo,tp1->dupStereo);
+          }
+        }
+      }
+
+      if(!tp0->bSplit) {
+        if(tp0->bJump) {
+          if(tp0->bSyncStereo) {
+            tp0->phSynth = canon2PI(tp0->dupStereo->phSynth + tp0->ph - tp0->dupStereo->ph);
+          } else {
+            tp0->phSynth = tp0->ph;
+          }
+        }
+      }
+
+      if(!(bMerge && time + 1 == last)) {
+        float dw = (tp1->fSynth1 - tp0->fSynth0) / n;
+        float w = tp0->fSynth0 + 0.5f * dw;
+        float iw = lrintf(w * WScale) / WScale;
+        float idw = lrintf(dw * WScale) / WScale;
+        tp1->phSynth = canon2PI(tp0->phSynth + n * iw + ((n * (n - 1)) >> 1) * idw);
+      }
+    } else {
+      float dp = tp1->ph - tp0->ph;
+      float dp0 = 0.5f*h*(tp0->f + tp1->f);
+      float dw = canonPI(dp - dp0)/h;
+      if(dw > .0013f * (tp0->f + tp1->f)) {
+        dw = 0;
+      }
+      if(!(bSplit && time == first)) {
+        tp0->fSynth0 = max(0.0f,min(6.0f,f0 * (tp0->f + dw)));
+        tp0->phSynth = tp0->ph;
+      }
+      if(!(bMerge && time + 1 == last)) {
+        tp1->fSynth1 = max(0.0f,min(6.0f,f1 * (tp1->f + dw)));
+        tp1->phSynth = tp1->ph;
+      }
+    }
+  }
+  return NULL;
+}
+
+void Track :: updateM(const TimeType &time, int mode)
+{
+  if(mode == synthModeTrial2) {
+    if(time == first && time == start) {
+      TrackPoint *tp0 = getTrackPoint(time);
+      tp0->m = (tp0->m2>0.0f?sqrt(tp0->m2):0.0f);
+    }
+    if(time < last) {
+      TrackPoint *tp1 = getTrackPoint(time+1);
+      tp1->m = (tp1->m2>0.0f?sqrt(tp1->m2):0.0f);
     }
   }
 }
 
-bool track :: isEnded()
+void Track :: step(const TimeType &time)
 {
-  return (end!=LONG_MAX);
+  if(time > first && time < last) {
+    TrackPoint *tp = point[time-first];
+    tp->destroy();
+    point[time-first] = NULL;
+  }
 }
 
-void track :: push_back_tpoint(tpoint *p)
-{
-  point.push_back(p);
-}
-
-void track :: push_back(trackpoint *p)
+void Track :: push_back(TrackPoint *p)
 {
   point.push_back(p);
   p->owner = this;
+  p->refCount++;
+  last++;
+  end++;
 }
-  
-void track :: startTrack(trackpoint *p, bool bTail)
+
+void Track :: endTrack(bool bStitch)
 {
-  push_back(p);
-  start = p->time;
-  m_pDescendant = p->ph;
-  if(bTail) {
-    tailStart = 1;
-    start--;
-    trackpoint *s = new trackpoint(p);
-    s->time = p->time - 1;
-    point.insert(point.begin(),s);
-    m_p = p->ph;
+  if(bStitch) {
+    this->bStitch = true;
+  } else {
+    end++;
   }
-  currtime = p->time-1;
+  bEnded = true;
 }
 
-trackpoint *track :: back() 
+void Track :: synth(float *out,
+                    const TimeType &time,
+                    int n,
+                    int mode,
+                    int c)
 {
-  return (trackpoint*)point.back(); 
-}
+  float m0, m1;
+  float w0, w1;
+  float dw;
+  float ph0, ph1;
+  bool bTailStart;
+  bool bTailEnd;
+  if(time >= end) return;
+  if(time < last) {
+    TrackPoint *tp1 = getTrackPoint(time+1);
+    w1 = tp1->fSynth1;
+    m1 = tp1->m;
+    ph1 = tp1->phSynth;
+    if(bMerge && time + 1 == last) {
+      m1 = 0.0f;
+    }
+    bTailStart = tp1->bJump;
+    bTailEnd = tp1->bJump;
+  } else {
+    bTailStart = false;
+    bTailEnd = (last != end);
+  }
+  if(time >= first) {
+    TrackPoint *tp0 = getTrackPoint(time);
+    w0 = tp0->fSynth0;
+    m0 = tp0->m;
+    ph0 = tp0->phSynth;
+    if(bSplit && time == first) {
+      m0 = 0.0f;
+    }
+  } else {
+    bTailStart = true;
+  }
 
-trackpoint *track :: getTrackPoint(long time)
-{
-  long k = time-start;
-  if(k<0 || k >= (long)point.size())
-    return NULL;
-  else
-    return (trackpoint*)point[k];
-}
+  if(bTailEnd) {
+    int fall = min(n,w0==0.0f?384:min(384,(int)lrintf(PI * 4.0f / w0)));
+    float dm = m0 / (float)fall;
+    float w = w0;
+    float *out2 = out;
+    float *end = out + fall;
+    long iph = lrintf(ph0 * WScale);
+    if(iph>=W2PI) iph -= W2PI;
+    long iw = lrintf(w * WScale);
+    while(out2 != end) {
+      if(iw < WPI) {
+        long f = (iph>>PhShift)&Ph1;
+        long i = iph>>WShift;
+        *out2 += m0 * (float)(synthTable1[i] + f * synthTable2[i]);
+      }
+      out2++;
+      m0 -= dm;
+      iph += iw;
+      iph &= W2PIMask;
+    }
+  }
 
-bool track :: isStart(long synthtime)
-{
-  return (synthtime == start);
-}
+  if(bTailStart) {
+    int rise = min(n,w1==0.0f?384:min(384,(int)lrintf(PI * 3.0f / w1)));
+    float dm = m1 / (float)rise;
+    float w = w1;
+    out += n;
+    float *end = out-rise;
+    long iph = lrintf(ph1 * WScale);
+    iph &= W2PIMask;
+    long iw = lrintf(w * WScale);
+    while(out != end) {
+      out--;
+      m1 -= dm;
+      iph -= iw;
+      if(iph<0) iph += W2PI;
+      if(iw < WPI) {
+        long f = (iph>>PhShift)&Ph1;
+        long i = iph>>WShift;
+        *out += m1 * (float)(synthTable1[i] + f * synthTable2[i]);
+      }
+    }
+  }
 
-bool track :: isEnd(long synthtime)
-{
-  return (synthtime == end);
-}
+  if(!(bTailStart || bTailEnd)) {
+    float dw = (w1 - w0) / n;
+    float w = w0 + 0.5f * dw;
+    float dm = (m1 - m0) / n;
+    long iph = lrintf(ph0 * WScale);
+    if(iph>=W2PI) iph -= W2PI;
+    long iw = lrintf(w * WScale);
+    long idw = lrintf(dw * WScale);
 
-bool track :: isDone() 
-{
-  return (currtime-start+1 >= (long)point.size()-1);
-}
-
-long track :: size()
-{
-  return 1+end-start-tailEnd-tailStart;
-}
-
-track :: ~track() {
-  if(precursor) precursor->descendant = NULL;
-  if(descendant) descendant->precursor = NULL;
-  for(vector<tpoint*>::iterator i = point.begin();
-      i != point.end();
-      i++) {
-    delete (*i);
+    float *end = out + n;
+    while(out != end) {
+      if(iw < WPI) {
+        long f = (iph>>PhShift)&Ph1;
+        long i = iph>>WShift;
+        *out += m0 * (float)(synthTable1[i] + f * synthTable2[i]);
+      }
+      iph += iw;
+      iw += idw;
+      iph &= W2PIMask;
+      m0 += dm;
+      out++;
+    }
   }
 }
 
diff --git a/lib-src/sbsms/src/track.h b/lib-src/sbsms/src/track.h
index c938c7d04..4e3a8802a 100644
--- a/lib-src/sbsms/src/track.h
+++ b/lib-src/sbsms/src/track.h
@@ -1,90 +1,81 @@
+// -*- mode: c++ -*-
 #ifndef TRACK_H
 #define TRACK_H
 
-#include "buffer.h"
 #include "trackpoint.h"
 #include "config.h"
+
 #ifdef MULTITHREADED
 #include "pthread.h"
 #endif
-#include <stack>
+
 #include <vector>
 using namespace std;
 
 namespace _sbsms_ {
 
-class sms;
-class renderer;
-
-class track {
-  friend class renderer;
- public:
-  void endTrack(bool bTail);
-  bool isEnded();
-  bool isDone();
-  void startTrack(trackpoint *p, bool bTail);
-  void push_back(trackpoint *p);
-  void push_back_tpoint(tpoint *p);
-  long size();
-  void synth(SampleBuf *out,
-             long writePos,
-             int c,
-             long synthtime,
-             int steps,
-             real fScale0,
-             real fScale1,
-             real mScale);
-  trackpoint *getTrackPoint(long time);
-  bool isStart(long synthtime);
-  bool isEnd(long synthtime);
-  trackpoint *back();
-
-  vector<tpoint*> point;
-
-  unsigned short index;
-  bool bEnd;
-  track *descendant;
-  track *precursor;
-  long tailEnd;
-  long tailStart;
-  long currtime;
-  real rise;
-  real fall;
-  long start;
-  long end;
-  real m_p;
-  real m_pDescendant;
-  int res;
-  sms *owner;
-
- protected:
-  friend class TrackAllocator;
-  track(track *precursor,sms *owner,int res);
-  ~track();
+enum {
+  trackIndexNone = 0
 };
 
-class TrackAllocator {
- public:
-  TrackAllocator(bool bManageIndex);
-  TrackAllocator(bool bManageIndex, unsigned short maxtrackindex);
-  void init();
-  int size();
-  ~TrackAllocator();
+#define PhShift 5
+#define WShift 21
+#define Ph1 65535
+#define WPI 536870912
+#define W2PI 1073741824
+#define W2PIMask 1073741823
+#define WScale 1.708913188941079e8f
+#define MScale 4.656683928435187e-10f
 
-  track *getTrack(unsigned short index);
-  track *create(track *precursor,sms *owner, int res, unsigned short index);
-  track *create(track *precursor,sms *owner, int res);
-  void destroy(track *t);
+enum SynthMode {
+  synthModeOutput = 0,
+  synthModeTrial2,
+  synthModeTrial1
+};
+
+class SMS;
+
+class Track : public SBSMSTrack {
+public:
+  Track(float h, TrackIndexType index, TrackPoint *p, const TimeType &time, bool bStitch);
+  ~Track();
+
+  SBSMSTrackPoint *getSBSMSTrackPoint(const TimeType &time);
+  TrackIndexType getIndex();
+  bool isFirst(const TimeType &synthtime);
+  bool isLast(const TimeType &synthtime);
+
+protected:
+  void push_back(TrackPoint *p);
+  TrackPoint *back();
+  void endTrack(bool bStitch);
+  TrackPoint *getTrackPoint(const TimeType &time);
+  TimeType size();
+  TrackPoint *updateFPH(const TimeType &time, int mode, int n, float f0, float f1);
+  void updateM(const TimeType &time, int mode);
+  void step(const TimeType &time);
+  void synth(float *out, const TimeType &synthtime, int n, int mode, int c);
+  bool jump(TrackPoint *tp0, TrackPoint *tp1);
+
+  friend class SMS;
+  friend class SynthRenderer;
+  friend class TrackPoint;
 
  protected:
-#ifdef MULTITHREADED
-  pthread_mutex_t taMutex;
-#endif
-  long gIdCount;
-  stack<unsigned short> gTrackIndex;
-  vector<track*> gTrack;
-  bool bManageIndex;
-
+  vector<TrackPoint*> point;
+  float h;
+  float jumpThresh;
+  TrackIndexType index;
+  TimeType start;
+  TimeType first;
+  TimeType end;
+  TimeType last;
+  bool bEnd;
+  bool bEnded;
+  bool bRender;
+  bool bStitch;
+  bool bSplit;
+  bool bMerge;
 };
 
 }
diff --git a/lib-src/sbsms/src/trackpoint.cpp b/lib-src/sbsms/src/trackpoint.cpp
index a59c9020e..f3ed331dc 100644
--- a/lib-src/sbsms/src/trackpoint.cpp
+++ b/lib-src/sbsms/src/trackpoint.cpp
@@ -1,99 +1,170 @@
 #include <math.h>
 #include "real.h"
 #include "utils.h"
-#include "track.h"
 #include "trackpoint.h"
-#include "grain.h"
+#include "track.h"
 
 namespace _sbsms_ {
 
-trackpoint :: trackpoint(trackpoint *tp)
+void TrackPoint :: destroy()
 {
-  init();
-  f = tp->f;
-  y = tp->y;
-  y0 = tp->y0;
-  h = tp->h;
-  M = tp->M;
-  ph = tp->ph;
-  owner = tp->owner;
+  refCount--;
+  if(refCount <= 0) {
+    delete this;
+  }
 }
 
-trackpoint :: ~trackpoint()
+TrackPoint :: TrackPoint(Slice *slice, float *peak, audio *gx, float *mag, float *mag2, int k, int N, int band)
 {
+  refCount = 0;
   for(int d=0;d<3;d++) {
-    if(dup[d]) {
-      dup[d]->dup[2-d] = NULL;
-    }
-  }
-}
-
-trackpoint :: trackpoint(grain *g, real x, real y, int N, short M, short h, long time)
-{
-  init();
-  real k = x;
-  int ki = round2int(k);
-  real kf = ki<k?k-ki:ki-k;
-
-  real norm0 = square(g->x[ki][0]) + square(g->x[ki][1]); 
-  real ph0;
-  if(norm0 > 0.0f) {
-    ph0 = atan2(g->x[ki][1],g->x[ki][0]);
-  } else {
-    ph0 = 0.0f;
-  }
-
-  int ki1 = ki<k?ki+1:ki-1;
-  real norm1, ph1;
-  if(ki == N-1) {
-    norm1 = norm0;
-    ph1 = ph0;
-  } else {
-    norm1 = square(g->x[ki1][0]) + square(g->x[ki1][1]);
-    if(norm1 > 0.0f) {
-      ph1 = atan2(g->x[ki1][1],g->x[ki1][0]);
-    } else { 
-      ph1 = 0.0f;
-    }
-  }
-
-  real ifreq = TWOPI*k/(real)N;
-  ph0 = ph0 + (real)ki*PI;
-  ph1 = ph1 + (real)ki1*PI;
-  if(kf < 0.5) {
-    real dp = canon(ph1 - ph0);
-    ph1 = ph0 + dp;
-  } else {
-    real dp = canon(ph0 - ph1);
-    ph0 = ph1 + dp;
-  }
-  real ph = ((1.0f-kf)*ph0 + kf*ph1);
-
-  this->time = time;
-  this->y = y;
-  this->y0 = y;
-  this->M = M;
-  this->h = h;
-  this->f = ifreq;
-  this->ph = canon(ph);
-}
-
-trackpoint :: trackpoint()
-{
-  init();
-}
-
-void trackpoint :: init()
-{
-  for(int d=0;d<3;d++) 
     dup[d] = NULL; 
-  contF = 1e9;
-  cont = NULL;
-  dupcont = NULL;
+  }
+  dupStereo = NULL;
+  bJump = false;
+  y01 = 0.0f;
+  pp = NULL;
+  pn = NULL;
+  bSyncStereo = false;
   bConnect = false;
   bConnected = false;
   bDelete = false;
+  bOwned = false;
+  bMarked = false;
+  bSplit = false;
+  bMerge = false;
   owner = NULL;
+  this->slice = slice;
+  this->peak = peak;
+  float y0 = mag[k-1];
+  float y1 = mag[k];
+  float y2 = mag[k+1];
+  float d = (y0 + y2 - y1 - y1);
+  x = (d==0.0f?k:k + 0.5f * (y0 - y2) / d);
+  int ki = lrintf(x);
+  int ki1;
+  float kf;
+  if(ki<x) {
+    ki1 = ki + 1;
+    kf = x - ki;
+  } else {
+    ki1 = ki - 1;
+    kf = ki - x;
+  }
+  y = ((1.0f-kf)*mag2[ki] + kf*mag2[ki1]);
+  f = TWOPI*x/(float)(N*(1<<band));
+  float norm0 = square(gx[ki][0]) + square(gx[ki][1]); 
+  float ph0;
+  if(norm0 > 0.0f) {
+    ph0 = atan2(gx[ki][1],gx[ki][0]);
+  } else {
+    ph0 = 0.0f;
+  }
+  float ph1;
+  float norm1 = square(gx[ki1][0]) + square(gx[ki1][1]);
+  if(norm1 > 0.0f) {
+    ph1 = atan2(gx[ki1][1],gx[ki1][0]);
+  } else { 
+    ph1 = 0.0f;
+  }
+  ph0 += (float)(ki&1)*PI;
+  ph1 += (float)(ki1&1)*PI;
+  if(kf < 0.5f) {
+    ph1 = ph0 + canonPI(ph1 - ph0);
+  } else {
+    ph0 = ph1 + canonPI(ph0 - ph1);
+  }
+  ph = canon2PI((1.0f-kf)*ph0 + kf*ph1);
+  phSynth = ph;
+}
+
+TrackPoint :: ~TrackPoint()
+{
+  for(int d=0;d<3;d++) {
+    if(dup[d]) {
+      m2 = 0.0f;
+      dup[d]->dup[2-d] = NULL;
+    }
+  }
+  m2 = 0;
+  if(slice) slice->remove(this);
+  if(pp && pn) {
+    pp->pn = pn;
+    pn->pp = pp;
+    if(!(owner && owner->bRender)) {
+      if(pp->y * peak[lrintf(pp->x - x)] > pn->y * peak[lrintf(pn->x - x)]) {
+        pp->m2 += m2;
+        pp->xtn2 = xtn2;
+        pn->xtp2 = xtn2;
+      } else {
+        pn->m2 += m2;
+        pp->xtn2 = xtp2;
+        pn->xtp2 = xtp2;
+      }
+    }
+  } else if(pp) {
+    pp->pn = NULL;
+    if(!(owner && owner->bRender)) {
+      if(y01 == 0.0f || y01 * peak[lrintf(x01 - x)] < pp->y * peak[lrintf(pp->x - x)]) {      
+        pp->x01 = x01;
+        pp->y01 = y01;
+        pp->m2 += m2;
+        pp->xtn2 = xtn2;
+      }
+    }
+  } else if(pn) {
+    pn->pp = NULL;
+    if(!(owner && owner->bRender)) {
+      if(y01 == 0.0f || y01 * peak[lrintf(x01 - x)] < pn->y * peak[lrintf(pn->x - x)]) {      
+        pn->x01 = x01;
+        pn->y01 = y01;
+        pn->m2 += m2;
+        pn->xtp2 = xtp2;
+      }
+    }
+  }
+}
+
+float TrackPoint :: getF()
+{
+  return f;
+}
+
+float TrackPoint :: getM()
+{
+  return y;
+}
+
+float TrackPoint :: getPhase()
+{
+  return ph;
+}
+
+Slice :: Slice(int band, const TimeType &time)
+{
+  this->band = band;
+  this->time = time;
+  bottom = NULL;
+  top = NULL;
+}
+
+void Slice :: remove(TrackPoint *tp)
+{
+  if(tp == top) {
+    top = top->pp;
+  }
+  if(tp == bottom) {
+    bottom = bottom->pn;
+  }
+}
+
+Slice :: ~Slice()
+{
+  for(TrackPoint *tp = bottom;
+      tp;
+      tp = tp->pn) {
+    tp->slice = NULL;
+  }
 }
 
 }
diff --git a/lib-src/sbsms/src/trackpoint.h b/lib-src/sbsms/src/trackpoint.h
index 74253b087..81cf2ba83 100644
--- a/lib-src/sbsms/src/trackpoint.h
+++ b/lib-src/sbsms/src/trackpoint.h
@@ -1,46 +1,77 @@
+// -*- mode: c++ -*-
 #ifndef TRACKPOINT_H
 #define TRACKPOINT_H
 
-#include "grain.h"
 #include "sbsms.h"
 
 namespace _sbsms_ {
 
-class track;
+enum { TrackPointNoCont = 65535 };
 
-class tpoint {
- public:
-  tpoint() {}
-  virtual ~tpoint() {}
-  real f;
-  real y;
-  real ph;
-  short h;
-  short M;
-  real y0;
+class Track;
+class Slice;
+
+class TrackPoint : public SBSMSTrackPoint {
+public:
+  TrackPoint(Slice *slice, float *peak, audio *gx, float *mag, float *mag2, int k, int N, int band);
+  ~TrackPoint();
+  void destroy();
+  float getF();
+  float getM();
+  float getPhase();
+protected:
+  TrackPoint *pp;
+  TrackPoint *pn;
+  TrackPoint *dupcont;
+  TrackPoint *dupStereo;
+  TrackPoint *cont;
+  TrackPoint *dup[3];
+  Track *owner;
+  Slice *slice;
+  float *peak;
+  float x01;
+  float y01;
+  float phSynth;
+  union {
+    float fSynth0;
+    float xtp2;
+  };
+  union {
+    float fSynth1;
+    float xtn2;
+  };
+  int refCount;
+  float f;
+  float x;
+  float y;
+  float ph;
+  float contF;
+  float m;
+  float m2;
+  bool bJump;
+  bool bSyncStereo;
+  bool bConnected;
+  bool bConnect;
+  bool bDelete;
+  bool bOwned;
+  bool bMarked;
+  bool bSplit;
+  bool bMerge;
+
+  friend class Slice;
+  friend class SMS;
+  friend class Track;
 };
 
-class trackpoint : public tpoint {
- public:
-  trackpoint();
-  trackpoint(trackpoint *tp);
-  trackpoint(grain *g, real x, real y, int N, short M, short h, long time);
-  ~trackpoint();
-
-  track *owner;
-  long time;
-
-  real contF;
-  bool bConnect;
-  bool bConnected;
-  bool bDelete;
-
-  trackpoint *dupcont;
-  trackpoint *cont;
-  trackpoint *dup[3];
-
- protected:
-  void init();
+class Slice {
+public:
+  Slice(int band, const TimeType &time);
+  ~Slice();
+  void remove(TrackPoint *tp);
+  TrackPoint *bottom;
+  TrackPoint *top;
+  int band;
+  TimeType time;
 };
 
 }
diff --git a/lib-src/sbsms/src/utils.h b/lib-src/sbsms/src/utils.h
index da48a8928..0ce9d16dc 100644
--- a/lib-src/sbsms/src/utils.h
+++ b/lib-src/sbsms/src/utils.h
@@ -1,11 +1,10 @@
-#ifndef FFTUTILS_H
-#define FFTUTILS_H
+// -*- mode: c++ -*-
+#ifndef UTILS_H
+#define UTILS_H
 
 #include "real.h"
+#include "config.h"
 #include "sbsms.h"
-#include <math.h>
-#include <limits.h>
-#include <stdlib.h>
 
 namespace _sbsms_ {
 
@@ -13,67 +12,56 @@ namespace _sbsms_ {
 #define PI 3.1415926535897932384626433832795f
 #define TWOPI 6.28318530717958647692528676655900576f
 
-extern int COSSIZE;
-extern real COSFACTOR;
-extern real *COSTABLE;
-
-void cosinit(int size);
-void _evenodd2c(audio *eo, audio *even, audio *odd, int N);
-void _c2evenodd(audio *eo, audio *even, audio *odd, int N);
-inline real COS(real x);
-inline real square(real x);
-void _c2magphase(audio *g, int N);
-void _magphase2c(audio *g, int N);
-inline real canon(real ph);
-inline real norm(audio x);
-inline real norm2(audio x);
-inline real sign(real x);
-inline real dBApprox(real x);
-int *factor(int n);
-void factor(int n, int *f, int m);
-
-inline int ilog2(int x)
+inline void c2even(audio *eo, audio *even, int N)
 {
-	int n = 0;
-	while(x>1) {
-		x>>=1;
-		n++;
-	}
-	return n;
+  int Nover2 = N/2;
+  even[0][0] = eo[0][0];
+  even[0][1] = 0.0f;
+  for(int k=1;k<=Nover2;k++) {
+    int Nk = N-k;
+    even[k][0] = 0.5f*(eo[k][0] + eo[Nk][0]);
+    even[k][1] = 0.5f*(eo[k][1] - eo[Nk][1]);
+  }
 }
 
-inline real dBApprox(real x) 
+inline void c2odd(audio *eo, audio *odd, int N)
 {
-  real u = (x-1.0f)/(x+1.0f);
-  real u2 = u*u;
-  return 17.37177927613007f*u*(1.0f + u2*(0.333333333333333f + u2*(0.2f + u2*0.14285714285714f)));
+  int Nover2 = N/2;
+  odd[0][0] = eo[0][1];
+  odd[0][1] = 0.0f;
+  for(int k=1;k<=Nover2;k++) {
+    int Nk = N-k;
+    odd[k][0] = 0.5f*(eo[k][1] + eo[Nk][1]);
+    odd[k][1] = 0.5f*(eo[Nk][0] - eo[k][0]);
+  }
 }
 
-inline real canon(real ph) 
+inline float canonPI(float ph) 
 {
-  return ph - TWOPI*(real)round2int(ph*ONEOVERTWOPI);
+  ph -= TWOPI * lrintf(ph * ONEOVERTWOPI);
+  if(ph < -PI) ph += TWOPI;
+  else if(ph >= PI) ph -= TWOPI;
+  return ph;
 }
 
-inline real norm2(audio x)
+inline float canon2PI(float ph) 
 {
-  return square(x[0]) + square(x[1]);
+  ph -= TWOPI * lrintf(ph * ONEOVERTWOPI);
+  if(ph < 0.0f) ph += TWOPI;
+  if(ph >= TWOPI) ph -= TWOPI;
+  return ph;
 }
 
-inline real norm(audio x)
-{
-  return sqrt(norm2(x));
-}
-
-inline real COS(real x)
-{
-  return COSTABLE[round2int(COSFACTOR*fabsf(x))];
-}
-
-inline real square(real x)
+inline float square(float x)
 { 
   return x*x;
 }
 
+inline float norm2(t_fft x)
+{
+  return square(x[0]) + square(x[1]);
+}
+
 }
 
 #endif
diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index 2cb8b1588..6821877a1 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -828,9 +828,7 @@
 		28884969131B6CF600B59735 /* ro.po in Sources */ = {isa = PBXBuildFile; fileRef = 28884938131B6CF600B59735 /* ro.po */; };
 		2888496A131B6CF600B59735 /* ru.po in Sources */ = {isa = PBXBuildFile; fileRef = 28884939131B6CF600B59735 /* ru.po */; };
 		2888496B131B6CF600B59735 /* sk.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493A131B6CF600B59735 /* sk.po */; };
-		2888496C131B6CF600B59735 /* sl.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493B131B6CF600B59735 /* sl.po */; };
-		2888496D131B6CF600B59735 /* sr_RS.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493C131B6CF600B59735 /* sr_RS.po */; };
-		2888496D131B6CF600B59735 /* sr_RS@latin.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493C131B6CF600B59735 /* sr_RS@latin.po */; };
+		2888496C131B6CF600B59735 /* sr_RS@latin.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493B131B6CF600B59735 /* sr_RS@latin.po */; };
 		2888496D131B6CF600B59735 /* sv.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493C131B6CF600B59735 /* sv.po */; };
 		2888496E131B6CF600B59735 /* tg.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493D131B6CF600B59735 /* tg.po */; };
 		2888496F131B6CF600B59735 /* tr.po in Sources */ = {isa = PBXBuildFile; fileRef = 2888493E131B6CF600B59735 /* tr.po */; };
@@ -1151,20 +1149,17 @@
 		28FE4A080ABF4E960056F5C4 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FE4A060ABF4E960056F5C4 /* mmx_optimized.cpp */; };
 		28FE4A090ABF4E960056F5C4 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FE4A070ABF4E960056F5C4 /* sse_optimized.cpp */; };
 		28FE4A3A0ABF58360056F5C4 /* soundtouch_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28FE4A390ABF58360056F5C4 /* soundtouch_config.h */; };
+		82FF185213CF01A600C1B664 /* dBTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82FF184D13CF01A600C1B664 /* dBTable.cpp */; };
+		82FF185313CF01A600C1B664 /* slide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82FF184F13CF01A600C1B664 /* slide.cpp */; };
 		8406A93812D0F2510011EA01 /* EQDefaultCurves.xml in Resources */ = {isa = PBXBuildFile; fileRef = 8406A93712D0F2510011EA01 /* EQDefaultCurves.xml */; };
 		8484F31413086237002DF7F0 /* DeviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484F31213086237002DF7F0 /* DeviceManager.cpp */; };
 		ED2706FF0EF9C47E007D4FFD /* sbsms.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2706FE0EF9C47E007D4FFD /* sbsms.h */; };
-		ED2707240EF9C51D007D4FFD /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707020EF9C51D007D4FFD /* audio.cpp */; };
-		ED2707250EF9C51D007D4FFD /* audio.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707030EF9C51D007D4FFD /* audio.h */; };
 		ED2707260EF9C51D007D4FFD /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707040EF9C51D007D4FFD /* buffer.cpp */; };
 		ED2707270EF9C51D007D4FFD /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707050EF9C51D007D4FFD /* buffer.h */; };
-		ED2707280EF9C51D007D4FFD /* defs.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707060EF9C51D007D4FFD /* defs.h */; };
 		ED2707290EF9C51D007D4FFD /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707070EF9C51D007D4FFD /* fft.cpp */; };
 		ED27072A0EF9C51D007D4FFD /* fft.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707080EF9C51D007D4FFD /* fft.h */; };
 		ED27072B0EF9C51D007D4FFD /* grain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707090EF9C51D007D4FFD /* grain.cpp */; };
 		ED27072C0EF9C51D007D4FFD /* grain.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070A0EF9C51D007D4FFD /* grain.h */; };
-		ED27072D0EF9C51D007D4FFD /* peak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070B0EF9C51D007D4FFD /* peak.cpp */; };
-		ED27072E0EF9C51D007D4FFD /* peak.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070C0EF9C51D007D4FFD /* peak.h */; };
 		ED2707300EF9C51D007D4FFD /* real.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070E0EF9C51D007D4FFD /* real.h */; };
 		ED2707310EF9C51D007D4FFD /* resample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070F0EF9C51D007D4FFD /* resample.cpp */; };
 		ED2707320EF9C51D007D4FFD /* sbsms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707100EF9C51D007D4FFD /* sbsms.cpp */; };
@@ -1177,7 +1172,6 @@
 		ED2707390EF9C51D007D4FFD /* track.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707170EF9C51D007D4FFD /* track.h */; };
 		ED27073A0EF9C51D007D4FFD /* trackpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707180EF9C51D007D4FFD /* trackpoint.cpp */; };
 		ED27073B0EF9C51D007D4FFD /* trackpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707190EF9C51D007D4FFD /* trackpoint.h */; };
-		ED27073C0EF9C51D007D4FFD /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27071A0EF9C51D007D4FFD /* utils.cpp */; };
 		ED27073D0EF9C51D007D4FFD /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27071B0EF9C51D007D4FFD /* utils.h */; };
 		ED2707460EF9C550007D4FFD /* liblibsbsms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2706F40EF9C3C6007D4FFD /* liblibsbsms.a */; };
 		ED2707500EF9C64F007D4FFD /* SBSMSEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27074B0EF9C64F007D4FFD /* SBSMSEffect.cpp */; };
@@ -2453,8 +2447,6 @@
 		28884938131B6CF600B59735 /* ro.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ro.po; path = ../locale/ro.po; sourceTree = SOURCE_ROOT; };
 		28884939131B6CF600B59735 /* ru.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ru.po; path = ../locale/ru.po; sourceTree = SOURCE_ROOT; };
 		2888493A131B6CF600B59735 /* sk.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sk.po; path = ../locale/sk.po; sourceTree = SOURCE_ROOT; };
-		2888493B131B6CF600B59735 /* sl.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sl.po; path = ../locale/sl.po; sourceTree = SOURCE_ROOT; };
-		2888493B131B6CF600B59735 /* sr_RS.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sr_RS.po; path = ../locale/sr_RS.po; sourceTree = SOURCE_ROOT; };
 		2888493B131B6CF600B59735 /* sr_RS@latin.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = "sr_RS@latin.po"; path = "../locale/sr_RS@latin.po"; sourceTree = SOURCE_ROOT; };
 		2888493C131B6CF600B59735 /* sv.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sv.po; path = ../locale/sv.po; sourceTree = SOURCE_ROOT; };
 		2888493D131B6CF600B59735 /* tg.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = tg.po; path = ../locale/tg.po; sourceTree = SOURCE_ROOT; };
@@ -2824,6 +2816,11 @@
 		28FE4A060ABF4E960056F5C4 /* mmx_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = mmx_optimized.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		28FE4A070ABF4E960056F5C4 /* sse_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = sse_optimized.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		28FE4A390ABF58360056F5C4 /* soundtouch_config.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = soundtouch_config.h; path = "../lib-src/soundtouch/include/soundtouch_config.h"; sourceTree = SOURCE_ROOT; tabWidth = 3; };
+		82FF184D13CF01A600C1B664 /* dBTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dBTable.cpp; path = sbsms/src/dBTable.cpp; sourceTree = "<group>"; };
+		82FF184E13CF01A600C1B664 /* dBTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dBTable.h; path = sbsms/src/dBTable.h; sourceTree = "<group>"; };
+		82FF184F13CF01A600C1B664 /* slide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slide.cpp; path = sbsms/src/slide.cpp; sourceTree = "<group>"; };
+		82FF185013CF01A600C1B664 /* sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sse.h; path = sbsms/src/sse.h; sourceTree = "<group>"; };
+		82FF185113CF01A600C1B664 /* synthTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = synthTable.h; path = sbsms/src/synthTable.h; sourceTree = "<group>"; };
 		8406A93712D0F2510011EA01 /* EQDefaultCurves.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = EQDefaultCurves.xml; path = ../presets/EQDefaultCurves.xml; sourceTree = SOURCE_ROOT; };
 		8484F31213086237002DF7F0 /* DeviceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceManager.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		8484F31313086237002DF7F0 /* DeviceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = DeviceManager.h; sourceTree = "<group>"; tabWidth = 3; };
@@ -2851,17 +2848,12 @@
 		ED05D12A0E50AD5700CC4BD3 /* scorealign.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = scorealign.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED2706F40EF9C3C6007D4FFD /* liblibsbsms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibsbsms.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		ED2706FE0EF9C47E007D4FFD /* sbsms.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sbsms.h; sourceTree = "<group>"; tabWidth = 3; };
-		ED2707020EF9C51D007D4FFD /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = audio.cpp; path = sbsms/src/audio.cpp; sourceTree = "<group>"; tabWidth = 3; };
-		ED2707030EF9C51D007D4FFD /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = audio.h; path = sbsms/src/audio.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707040EF9C51D007D4FFD /* buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = buffer.cpp; path = sbsms/src/buffer.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707050EF9C51D007D4FFD /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = buffer.h; path = sbsms/src/buffer.h; sourceTree = "<group>"; tabWidth = 3; };
-		ED2707060EF9C51D007D4FFD /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = defs.h; path = sbsms/src/defs.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707070EF9C51D007D4FFD /* fft.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = fft.cpp; path = sbsms/src/fft.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707080EF9C51D007D4FFD /* fft.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = fft.h; path = sbsms/src/fft.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707090EF9C51D007D4FFD /* grain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = grain.cpp; path = sbsms/src/grain.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED27070A0EF9C51D007D4FFD /* grain.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = grain.h; path = sbsms/src/grain.h; sourceTree = "<group>"; tabWidth = 3; };
-		ED27070B0EF9C51D007D4FFD /* peak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = peak.cpp; path = sbsms/src/peak.cpp; sourceTree = "<group>"; tabWidth = 3; };
-		ED27070C0EF9C51D007D4FFD /* peak.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = peak.h; path = sbsms/src/peak.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED27070E0EF9C51D007D4FFD /* real.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = real.h; path = sbsms/src/real.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED27070F0EF9C51D007D4FFD /* resample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = resample.cpp; path = sbsms/src/resample.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707100EF9C51D007D4FFD /* sbsms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = sbsms.cpp; path = sbsms/src/sbsms.cpp; sourceTree = "<group>"; tabWidth = 3; };
@@ -2874,7 +2866,6 @@
 		ED2707170EF9C51D007D4FFD /* track.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = track.h; path = sbsms/src/track.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707180EF9C51D007D4FFD /* trackpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = trackpoint.cpp; path = sbsms/src/trackpoint.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED2707190EF9C51D007D4FFD /* trackpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = trackpoint.h; path = sbsms/src/trackpoint.h; sourceTree = "<group>"; tabWidth = 3; };
-		ED27071A0EF9C51D007D4FFD /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = sbsms/src/utils.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED27071B0EF9C51D007D4FFD /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = utils.h; path = sbsms/src/utils.h; sourceTree = "<group>"; tabWidth = 3; };
 		ED27074B0EF9C64F007D4FFD /* SBSMSEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = SBSMSEffect.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		ED27074C0EF9C64F007D4FFD /* SBSMSEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = SBSMSEffect.h; sourceTree = "<group>"; tabWidth = 3; };
@@ -4845,9 +4836,9 @@
 				28884938131B6CF600B59735 /* ro.po */,
 				28884939131B6CF600B59735 /* ru.po */,
 				2888493A131B6CF600B59735 /* sk.po */,
-				2888493B131B6CF600B59735 /* sl.po */,
-				2888493C131B6CF600B59735 /* sr_RS.po */,
-				2888493C131B6CF600B59735 /* sr_RS@latin.po */,
+				2888493B131B6CF600B59735 /* sr_RS@latin.po */,
+				2888493C131B6CF600B59735 /* sv.po */,
+				2888493C131B6CF600B59735 /* sv.po */,
 				2888493C131B6CF600B59735 /* sv.po */,
 				2888493D131B6CF600B59735 /* tg.po */,
 				2888493E131B6CF600B59735 /* tr.po */,
@@ -5227,21 +5218,21 @@
 		ED2707000EF9C489007D4FFD /* src */ = {
 			isa = PBXGroup;
 			children = (
-				ED2707020EF9C51D007D4FFD /* audio.cpp */,
-				ED2707030EF9C51D007D4FFD /* audio.h */,
+				82FF184D13CF01A600C1B664 /* dBTable.cpp */,
+				82FF184E13CF01A600C1B664 /* dBTable.h */,
+				82FF184F13CF01A600C1B664 /* slide.cpp */,
+				82FF185013CF01A600C1B664 /* sse.h */,
+				82FF185113CF01A600C1B664 /* synthTable.h */,
+				ED2707110EF9C51D007D4FFD /* sincCoeffs.h */,
 				ED2707040EF9C51D007D4FFD /* buffer.cpp */,
 				ED2707050EF9C51D007D4FFD /* buffer.h */,
-				ED2707060EF9C51D007D4FFD /* defs.h */,
 				ED2707070EF9C51D007D4FFD /* fft.cpp */,
 				ED2707080EF9C51D007D4FFD /* fft.h */,
 				ED2707090EF9C51D007D4FFD /* grain.cpp */,
 				ED27070A0EF9C51D007D4FFD /* grain.h */,
-				ED27070B0EF9C51D007D4FFD /* peak.cpp */,
-				ED27070C0EF9C51D007D4FFD /* peak.h */,
 				ED27070E0EF9C51D007D4FFD /* real.h */,
 				ED27070F0EF9C51D007D4FFD /* resample.cpp */,
 				ED2707100EF9C51D007D4FFD /* sbsms.cpp */,
-				ED2707110EF9C51D007D4FFD /* sincCoeffs.h */,
 				ED2707120EF9C51D007D4FFD /* sms.cpp */,
 				ED2707130EF9C51D007D4FFD /* sms.h */,
 				ED2707140EF9C51D007D4FFD /* subband.cpp */,
@@ -5250,7 +5241,6 @@
 				ED2707170EF9C51D007D4FFD /* track.h */,
 				ED2707180EF9C51D007D4FFD /* trackpoint.cpp */,
 				ED2707190EF9C51D007D4FFD /* trackpoint.h */,
-				ED27071A0EF9C51D007D4FFD /* utils.cpp */,
 				ED27071B0EF9C51D007D4FFD /* utils.h */,
 			);
 			name = src;
@@ -5777,12 +5767,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				ED2706FF0EF9C47E007D4FFD /* sbsms.h in Headers */,
-				ED2707250EF9C51D007D4FFD /* audio.h in Headers */,
 				ED2707270EF9C51D007D4FFD /* buffer.h in Headers */,
-				ED2707280EF9C51D007D4FFD /* defs.h in Headers */,
 				ED27072A0EF9C51D007D4FFD /* fft.h in Headers */,
 				ED27072C0EF9C51D007D4FFD /* grain.h in Headers */,
-				ED27072E0EF9C51D007D4FFD /* peak.h in Headers */,
 				ED2707300EF9C51D007D4FFD /* real.h in Headers */,
 				ED2707330EF9C51D007D4FFD /* sincCoeffs.h in Headers */,
 				ED2707350EF9C51D007D4FFD /* sms.h in Headers */,
@@ -6203,7 +6190,6 @@
 			isa = PBXProject;
 			buildConfigurationList = 1790ABE409883346008A330A /* Build configuration list for PBXProject "Audacity" */;
 			compatibilityVersion = "Xcode 2.4";
-			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				English,
@@ -7132,8 +7118,8 @@
 				28884969131B6CF600B59735 /* ro.po in Sources */,
 				2888496A131B6CF600B59735 /* ru.po in Sources */,
 				2888496B131B6CF600B59735 /* sk.po in Sources */,
-				2888496C131B6CF600B59735 /* sl.po in Sources */,
-				2888496C131B6CF600B59735 /* sr_RS.po in Sources */,
+				2888496C131B6CF600B59735 /* sr_RS@latin.po in Sources */,
+				2888496C131B6CF600B59735 /* sr_RS@latin.po in Sources */,
 				2888496C131B6CF600B59735 /* sr_RS@latin.po in Sources */,
 				2888496D131B6CF600B59735 /* sv.po in Sources */,
 				2888496E131B6CF600B59735 /* tg.po in Sources */,
@@ -7142,6 +7128,8 @@
 				28884971131B6CF600B59735 /* vi.po in Sources */,
 				28884972131B6CF600B59735 /* zh_TW.po in Sources */,
 				28884973131B6CF600B59735 /* zh.po in Sources */,
+				82FF185213CF01A600C1B664 /* dBTable.cpp in Sources */,
+				82FF185313CF01A600C1B664 /* slide.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7256,18 +7244,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				ED2707240EF9C51D007D4FFD /* audio.cpp in Sources */,
 				ED2707260EF9C51D007D4FFD /* buffer.cpp in Sources */,
 				ED2707290EF9C51D007D4FFD /* fft.cpp in Sources */,
 				ED27072B0EF9C51D007D4FFD /* grain.cpp in Sources */,
-				ED27072D0EF9C51D007D4FFD /* peak.cpp in Sources */,
 				ED2707310EF9C51D007D4FFD /* resample.cpp in Sources */,
 				ED2707320EF9C51D007D4FFD /* sbsms.cpp in Sources */,
 				ED2707340EF9C51D007D4FFD /* sms.cpp in Sources */,
 				ED2707360EF9C51D007D4FFD /* subband.cpp in Sources */,
 				ED2707380EF9C51D007D4FFD /* track.cpp in Sources */,
 				ED27073A0EF9C51D007D4FFD /* trackpoint.cpp in Sources */,
-				ED27073C0EF9C51D007D4FFD /* utils.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7613,6 +7598,7 @@
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = macosx10.4;
+				SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC";
 				TOPLEVEL = ..;
 				WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-debug-static-$(WX_VER) -I$(WX_PREFIX)/include/wx-$(WX_VER) -D__WXDEBUG__ -D__WXMAC__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA";
 				WX_CONFIG = "$(WX_PREFIX)/bin/wx-config";
@@ -7804,6 +7790,7 @@
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = macosx10.4;
+				SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC";
 				TOPLEVEL = ..;
 				WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-debug-$(WX_VER) -I$(WX_PREFIX)/include/wx-$(WX_VER) -D__WXDEBUG__ -D__WXMAC__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA";
 				WX_CONFIG = "$(WX_PREFIX)/bin/wx-config";
@@ -8126,6 +8113,7 @@
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = macosx10.4;
+				SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC";
 				TOPLEVEL = ..;
 				WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-release-$(WX_VER) -I$(WX_PREFIX)/include/wx-$(WX_VER) -D__WXMAC__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA";
 				WX_CONFIG = "$(WX_PREFIX)/bin/wx-config";
@@ -8747,6 +8735,7 @@
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = macosx10.4;
+				SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC";
 				TOPLEVEL = ..;
 				WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-release-static-$(WX_VER) -I$(WX_PREFIX)/include/wx-$(WX_VER) -D__WXMAC__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA";
 				WX_CONFIG = "$(WX_PREFIX)/bin/wx-config";
@@ -8793,8 +8782,14 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				OTHER_CFLAGS = "$(WX_CFLAGS)";
-				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				OTHER_CFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CFLAGS)",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CXXFLAGS)",
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = libsbsms;
 			};
@@ -8808,8 +8803,14 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				OTHER_CFLAGS = "$(WX_CFLAGS)";
-				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				OTHER_CFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CFLAGS)",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CXXFLAGS)",
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = libsbsms;
 			};
@@ -8823,8 +8824,14 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				OTHER_CFLAGS = "$(WX_CFLAGS)";
-				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				OTHER_CFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CFLAGS)",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CXXFLAGS)",
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = libsbsms;
 			};
@@ -8838,8 +8845,14 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				OTHER_CFLAGS = "$(WX_CFLAGS)";
-				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				OTHER_CFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CFLAGS)",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(SSE_CPPFLAGS)",
+					"$(WX_CXXFLAGS)",
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = libsbsms;
 			};
diff --git a/src/effects/SBSMSEffect.cpp b/src/effects/SBSMSEffect.cpp
index c8126ceaf..47e2b5145 100644
--- a/src/effects/SBSMSEffect.cpp
+++ b/src/effects/SBSMSEffect.cpp
@@ -6,7 +6,7 @@ SBSMSEffect.cpp
 
 Clayton Otey
 
-This abstract class contains all of the common code for an
+This class contains all of the common code for an
 effect that uses SBSMS to do its processing (TimeScale)
 
 **********************************************************************/
@@ -22,79 +22,90 @@ effect that uses SBSMS to do its processing (TimeScale)
 #include "../Project.h"
 #include "TimeWarper.h"
 
-class resampleBuf
+enum {
+  SBSMSOutBlockSize = 512
+};
+
+class ResampleBuf
 {
 public:
-   resampleBuf()
+   ResampleBuf()
    {
+      processed = 0;
       buf = NULL;
       leftBuffer = NULL;
       rightBuffer = NULL;
+      quality = NULL;
+      iface = NULL;
+      sbsms = NULL;
 
-      sbsmser = NULL;
-      outBuf = NULL;
-      outputLeftBuffer = NULL;
-      outputRightBuffer = NULL;
+      resampler = NULL;
+      SBSMSBuf = NULL;
       outputLeftTrack = NULL;
       outputRightTrack = NULL;
-      resampler = NULL;
    }
 
-   ~resampleBuf()
+   ~ResampleBuf()
    {
       if(buf)                 free(buf);
       if(leftBuffer)          free(leftBuffer);
       if(rightBuffer)         free(rightBuffer);
-      if(sbsmser)             sbsms_destroy(sbsmser);
-      if(outBuf)              free(outBuf);
-      if(outputLeftBuffer)    free(outputLeftBuffer);
-      if(outputRightBuffer)   free(outputRightBuffer);
+      if(SBSMSBuf)            free(SBSMSBuf);
       if(outputLeftTrack)     delete outputLeftTrack;
       if(outputRightTrack)    delete outputRightTrack;
+      if(quality)             delete quality;
+      if(sbsms)               delete sbsms;
+      if(iface)           delete iface;
       if(resampler)           delete resampler;
    }
 
+   bool bPitch;
    audio *buf;
    double ratio;
-   sampleCount block;
+   sampleCount processed;
+   sampleCount blockSize;
+   sampleCount SBSMSBlockSize;
    sampleCount offset;
    sampleCount end;
    float *leftBuffer;
    float *rightBuffer;
    WaveTrack *leftTrack;
    WaveTrack *rightTrack;
+   SBSMS *sbsms;
+   SBSMSInterface *iface;
+   audio *SBSMSBuf;
 
    // Not required by callbacks, but makes for easier cleanup
-   sbsms *sbsmser;
-   audio *outBuf;
-   float *outputLeftBuffer;
-   float *outputRightBuffer;
+   Resampler *resampler;
+   SBSMSQuality *quality;
    WaveTrack *outputLeftTrack;
    WaveTrack *outputRightTrack;
+};
+
+class SBSMSEffectInterface : public SBSMSInterfaceSliding {
+public:
+   SBSMSEffectInterface(Resampler *resampler,
+                        Slide *rateSlide, Slide *pitchSlide,
+                        bool bReferenceInput,
+                        long samples, long preSamples,
+                        SBSMSQuality *quality) 
+      : SBSMSInterfaceSliding(rateSlide,pitchSlide,bReferenceInput,samples,preSamples,quality)
+   {
+      this->resampler = resampler;
+   }
+   virtual ~SBSMSEffectInterface() {}
+
+   long samples(audio *buf, long n) { 
+      return resampler->read(buf, n);
+   }
+
+protected:
    Resampler *resampler;
 };
 
-long samplesCB(audio *chdata, long numFrames, void *userData)
-{ 
-   sbsmsInfo *si = (sbsmsInfo*) userData;
-   long n_read = si->rs->read(chdata, numFrames);
-   return n_read;
-}
-
-void EffectSBSMS :: setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd, bool bPreAnalyze)
+long resampleCB(void *cb_data, SBSMSFrame *data) 
 {
-   this->rateStart = rateStart;
-   this->rateEnd = rateEnd;
-   this->pitchStart = pitchStart;
-   this->pitchEnd = pitchEnd;
-   this->bPreAnalyze = bPreAnalyze;
-}
-
-bool EffectSBSMS :: bInit = FALSE;
-
-long resampleCB(void *cb_data, sbsms_resample_frame *data) 
-{
-   resampleBuf *r = (resampleBuf*) cb_data;
+   ResampleBuf *r = (ResampleBuf*) cb_data;
    
    long blockSize = r->leftTrack->GetBestBlockSize(r->offset);
    
@@ -112,29 +123,75 @@ long resampleCB(void *cb_data, sbsms_resample_frame *data)
       r->buf[i][1] = r->rightBuffer[i];
    }
    
-   r->offset += blockSize;
-   data->in = r->buf;
+   data->buf = r->buf;
    data->size = blockSize;
-   data->ratio0 = r->ratio;
-   data->ratio1 = r->ratio;
-   
+   if(r->bPitch) {
+     float t0 = (float)(r->processed) / r->iface->getSamplesToInput();
+     float t1 = (float)(r->processed + blockSize) / r->iface->getSamplesToInput();
+     data->ratio0 = r->iface->getStretch(t0);
+     data->ratio1 = r->iface->getStretch(t1);
+   } else {
+     data->ratio0 = r->ratio;
+     data->ratio1 = r->ratio;
+   }
+   r->processed += blockSize;
+   r->offset += blockSize;
    return blockSize;
 }
 
+long postResampleCB(void *cb_data, SBSMSFrame *data)
+{
+   ResampleBuf *r = (ResampleBuf*) cb_data;
+   long sampleCount = r->sbsms->read(r->iface, r->SBSMSBuf, r->SBSMSBlockSize);
+   data->buf = r->SBSMSBuf;
+   data->size = sampleCount;
+   data->ratio0 = 1.0 / r->ratio;
+   data->ratio1 = 1.0 / r->ratio;
+   return sampleCount;
+}
+
+void EffectSBSMS :: setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd,
+                                  SlideType rateSlideType, SlideType pitchSlideType,
+                                  bool bLinkRatePitch, bool bRateReferenceInput, bool bPitchReferenceInput)
+{
+   this->rateStart = rateStart;
+   this->rateEnd = rateEnd;
+   this->pitchStart = pitchStart;
+   this->pitchEnd = pitchEnd;
+   this->bLinkRatePitch = bLinkRatePitch;
+   this->rateSlideType = rateSlideType;
+   this->pitchSlideType = pitchSlideType;
+   this->bRateReferenceInput = bRateReferenceInput;
+   this->bPitchReferenceInput = bPitchReferenceInput;
+}
+
+TimeWarper *createTimeWarper(double t0, double t1, double duration, 
+                             double rateStart, double rateEnd, SlideType rateSlideType)
+{
+   TimeWarper *warper = NULL;
+   if (rateStart == rateEnd || rateSlideType == SlideConstant) {
+      warper = new LinearTimeWarper(t0, t0, t1, t0+duration);
+   } else if(rateSlideType == SlideLinearInputRate) {
+      warper = new LinearInputRateTimeWarper(t0, t1, rateStart, rateEnd);
+   } else if(rateSlideType == SlideLinearOutputRate) {
+      warper = new LinearOutputRateTimeWarper(t0, t1, rateStart, rateEnd);
+   } else if(rateSlideType == SlideLinearInputStretch) {
+      warper = new LinearInputStretchTimeWarper(t0, t1, rateStart, rateEnd);
+   } else if(rateSlideType == SlideLinearOutputStretch) {
+      warper = new LinearOutputStretchTimeWarper(t0, t1, rateStart, rateEnd);
+   } else if(rateSlideType == SlideGeometricInput) {
+      warper = new GeometricInputTimeWarper(t0, t1, rateStart, rateEnd);
+   } else if(rateSlideType == SlideGeometricOutput) {                
+      warper = new GeometricOutputTimeWarper(t0, t1, rateStart, rateEnd);
+   }
+   return warper;
+}
+
 // Labels inside the affected region are moved to match the audio; labels after
 // it are shifted along appropriately.
 bool EffectSBSMS::ProcessLabelTrack(Track *t)
 {
-   TimeWarper *warper = NULL;
-   if (rateStart == rateEnd)
-   {
-      warper = new LinearTimeWarper(mT0, mT0,
-            mT1, mT0+(mT1-mT0)*mTotalStretch);
-   } else
-   {
-      warper = new LogarithmicTimeWarper(mT0, mT1,
-            rateStart, rateEnd);
-   }
+   TimeWarper *warper = createTimeWarper(mT0,mT1,(mT1-mT0)*mTotalStretch,rateStart,rateEnd,rateSlideType);
    SetTimeWarper(new RegionTimeWarper(mT0, mT1, warper));
    LabelTrack *lt = (LabelTrack*)t;
    if (lt == NULL) return false;
@@ -144,16 +201,10 @@ bool EffectSBSMS::ProcessLabelTrack(Track *t)
 
 bool EffectSBSMS::Process()
 {
-   if(!bInit) {
-      sbsms_init(8192);
-      bInit = TRUE;
-   }
-   
    bool bGoodResult = true;
    
    //Iterate over each track
-   // Track::All is needed because this effect needs to introduce 
-   // silence in the group tracks to keep sync-lock.
+   //Track::All is needed because this effect needs to introduce silence in the group tracks to keep sync
    this->CopyInputTracks(Track::All); // Set up mOutputTracks.
    TrackListIterator iter(mOutputTracks);
    Track* t;
@@ -161,13 +212,11 @@ bool EffectSBSMS::Process()
 
    double maxDuration = 0.0;
 
-   if(rateStart == rateEnd)
-      mTotalStretch = 1.0/rateStart;
-   else
-      mTotalStretch = 1.0/(rateEnd-rateStart)*log(rateEnd/rateStart);
-
    // Must sync if selection length will change
-   bool mustSync = (mTotalStretch != 1.0);
+   bool mustSync = (rateStart != rateEnd);
+   Slide rateSlide(rateSlideType,rateStart,rateEnd);
+   Slide pitchSlide(pitchSlideType,pitchStart,pitchEnd);
+   mTotalStretch = rateSlide.getTotalStretch();
 
    t = iter.First();
    while (t != NULL) {
@@ -218,131 +267,116 @@ bool EffectSBSMS::Process()
                
                mCurTrackNum++; // Increment for rightTrack, too.	
             }
-            
+            sampleCount trackStart = leftTrack->TimeToLongSamples(leftTrack->GetStartTime());
             sampleCount trackEnd = leftTrack->TimeToLongSamples(leftTrack->GetEndTime());
 
             // SBSMS has a fixed sample rate - we just convert to its sample rate and then convert back
-            float srIn = leftTrack->GetRate();
-            // mchinen: srSBMS doesn't do the right thing when it was set to fixed 44100.  This seems to fix it.
-            float srSBSMS = leftTrack->GetRate();
-            
+            float srTrack = leftTrack->GetRate();
+            float srProcess = bLinkRatePitch?srTrack:44100.0;
+
             // the resampler needs a callback to supply its samples
-            resampleBuf rb;
+            ResampleBuf rb;
             sampleCount maxBlockSize = leftTrack->GetMaxBlockSize();
-            rb.block = maxBlockSize;
-            rb.buf = (audio*)calloc(rb.block,sizeof(audio));
+            rb.blockSize = maxBlockSize;
+            rb.buf = (audio*)calloc(rb.blockSize,sizeof(audio));
             rb.leftTrack = leftTrack;
             rb.rightTrack = rightTrack?rightTrack:leftTrack;
             rb.leftBuffer = (float*)calloc(maxBlockSize,sizeof(float));
             rb.rightBuffer = (float*)calloc(maxBlockSize,sizeof(float));
-            rb.offset = start;
-            rb.end = trackEnd;
-            rb.ratio = srSBSMS/srIn;
-            rb.resampler = new Resampler(resampleCB, &rb);
             
             // Samples in selection
             sampleCount samplesIn = end-start;
             
             // Samples for SBSMS to process after resampling
-            sampleCount samplesToProcess = (sampleCount) ((real)samplesIn*(srSBSMS/srIn));
+            sampleCount samplesToProcess = (sampleCount) ((float)samplesIn*(srProcess/srTrack));
+
+            SlideType outSlideType;
+            SBSMSResampleCB outResampleCB;
+
+            sampleCount processPresamples = 0;
+            sampleCount trackPresamples = 0;
+
+            if(bLinkRatePitch) {
+              rb.bPitch = true;
+              outSlideType = rateSlideType;
+              outResampleCB = resampleCB;
+              rb.offset = start;
+              rb.end = end;
+              rb.iface = new SBSMSInterfaceSliding(&rateSlide,&pitchSlide,
+                                                       bPitchReferenceInput,
+                                                       samplesToProcess,0,
+                                                       NULL);              
+            } else {
+              rb.bPitch = false;
+              outSlideType = (srProcess==srTrack?SlideIdentity:SlideConstant);
+              outResampleCB = postResampleCB;
+              rb.ratio = srProcess/srTrack;
+              rb.quality = new SBSMSQuality(&SBSMSQualityStandard);
+              rb.resampler = new Resampler(resampleCB, &rb, srProcess==srTrack?SlideIdentity:SlideConstant);
+              rb.sbsms = new SBSMS(rightTrack?2:1,rb.quality,true);
+              rb.SBSMSBlockSize = rb.sbsms->getInputFrameSize();
+              rb.SBSMSBuf = (audio*)calloc(rb.SBSMSBlockSize,sizeof(audio));
+
+              processPresamples = wxMin(rb.quality->getMaxPresamples(),
+                                        (long)((float)(start-trackStart)*(srProcess/srTrack)));
+              trackPresamples = wxMin(start-trackStart,
+                                      (long)((float)(processPresamples)*(srTrack/srProcess)));
+              rb.offset = start - trackPresamples;
+              rb.end = trackEnd;
+              rb.iface = new SBSMSEffectInterface(rb.resampler,
+                                                      &rateSlide,&pitchSlide,
+                                                      bPitchReferenceInput,
+                                                      samplesToProcess,processPresamples,
+                                                      rb.quality);              
+            }
+
+            Resampler resampler(outResampleCB,&rb,outSlideType);
             
+            audio outBuf[SBSMSOutBlockSize];
+            float outBufLeft[2*SBSMSOutBlockSize];
+            float outBufRight[2*SBSMSOutBlockSize];
+            
+            // Samples in output after SBSMS
+            sampleCount samplesToOutput = rb.iface->getSamplesToOutput();
+
             // Samples in output after resampling back
-            sampleCount samplesToGenerate = (sampleCount) ((real)samplesToProcess * mTotalStretch);
-            sampleCount samplesOut = (sampleCount) ((real)samplesIn * mTotalStretch);
+            sampleCount samplesOut = (sampleCount) ((float)samplesToOutput * (srTrack/srProcess));
+
+            // Duration in track time
             double duration =  (mCurT1-mCurT0) * mTotalStretch;
 
             if(duration > maxDuration)
                maxDuration = duration;
 
-            TimeWarper *warper = NULL;
-            if (rateStart == rateEnd)
-            {
-               warper = new LinearTimeWarper(mCurT0, mCurT0,
-                                             mCurT1, mCurT0+maxDuration);
-            } else
-            {
-               warper = new LogarithmicTimeWarper(mCurT0, mCurT1,
-                                                  rateStart, rateEnd);
-            }
+            TimeWarper *warper = createTimeWarper(mCurT0,mCurT1,maxDuration,rateStart,rateEnd,rateSlideType);
             SetTimeWarper(warper);
-            
-            sbsmsInfo si;
-            si.rs = rb.resampler;
-            si.samplesToProcess = samplesToProcess;
-            si.samplesToGenerate = samplesToGenerate;
-            si.rate0 = rateStart;
-            si.rate1 = rateEnd;
-            si.pitch0 = pitchStart;
-            si.pitch1 = pitchEnd;
-            
-            sbsms_quality quality = sbsms_quality_fast;
-            rb.sbsmser = sbsms_create(&samplesCB,&rateCBLinear,&pitchCBLinear,rightTrack?2:1,&quality,bPreAnalyze,true);
-            
+
             rb.outputLeftTrack = mFactory->NewWaveTrack(leftTrack->GetSampleFormat(),
                                                         leftTrack->GetRate());
             if(rightTrack)
                rb.outputRightTrack = mFactory->NewWaveTrack(rightTrack->GetSampleFormat(),
                                                             rightTrack->GetRate());
-            
-            
-            sampleCount blockSize = quality.maxoutframesize;
-            rb.outBuf = (audio*)calloc(blockSize,sizeof(audio));
-            rb.outputLeftBuffer = (float*)calloc(blockSize*2,sizeof(float));
-            if(rightTrack)
-               rb.outputRightBuffer = (float*)calloc(blockSize*2,sizeof(float));
-            
             long pos = 0;
             long outputCount = -1;
-            
-            // pre analysis
-            real fracPre = 0.0f;
-            if(bPreAnalyze) {
-               fracPre = 0.05f;
-               resampleBuf rbPre;
-               rbPre.block = maxBlockSize;
-               rbPre.buf = (audio*)calloc(rb.block,sizeof(audio));
-               rbPre.leftTrack = leftTrack;
-               rbPre.rightTrack = rightTrack?rightTrack:leftTrack;
-               rbPre.leftBuffer = (float*)calloc(maxBlockSize,sizeof(float));
-               rbPre.rightBuffer = (float*)calloc(maxBlockSize,sizeof(float));
-               rbPre.offset = start;
-               rbPre.end = end;
-               rbPre.ratio = srSBSMS/srIn;
-               rbPre.resampler = new Resampler(resampleCB, &rbPre);
-               si.rs = rbPre.resampler;
-               
-               long pos = 0;
-               long lastPos = 0;
-               long ret = 0;
-               while(lastPos<samplesToProcess) {
-                  ret = sbsms_pre_analyze(&samplesCB,&si,rb.sbsmser);
-                  lastPos = pos;
-                  pos += ret;
-                  real completion = (real)lastPos/(real)samplesToProcess;
-                  if (TrackProgress(0,fracPre*completion))
-                     return false;
-               }
-               sbsms_pre_analyze_complete(rb.sbsmser);
-               sbsms_reset(rb.sbsmser);
-               si.rs = rb.resampler;
-            }
-            
+
             // process
             while(pos<samplesOut && outputCount) {
-               outputCount = sbsms_read_frame(rb.outBuf, &si, rb.sbsmser, NULL, NULL);
-               if(pos+outputCount>samplesOut) {
-                  outputCount = samplesOut - pos;
+               long frames;
+               if(pos+SBSMSOutBlockSize>samplesOut) {
+                  frames = samplesOut - pos;
+               } else {
+                  frames = SBSMSOutBlockSize;
                }
-
+               outputCount = resampler.read(outBuf,frames);
                for(int i = 0; i < outputCount; i++) {
-                  rb.outputLeftBuffer[i] = rb.outBuf[i][0];
+                  outBufLeft[i] = outBuf[i][0];
                   if(rightTrack)
-                     rb.outputRightBuffer[i] = rb.outBuf[i][1];
+                     outBufRight[i] = outBuf[i][1];
                }
                pos += outputCount;
-               rb.outputLeftTrack->Append((samplePtr)rb.outputLeftBuffer, floatSample, outputCount);
+               rb.outputLeftTrack->Append((samplePtr)outBufLeft, floatSample, outputCount);
                if(rightTrack)
-                  rb.outputRightTrack->Append((samplePtr)rb.outputRightBuffer, floatSample, outputCount);
+                  rb.outputRightTrack->Append((samplePtr)outBufRight, floatSample, outputCount);
                
                double frac = (double)pos/(double)samplesOut;
                int nWhichTrack = mCurTrackNum;
@@ -356,7 +390,7 @@ bool EffectSBSMS::Process()
                      frac *= 2.0; // Show twice as far for each track, because we're doing 2 at once. 
                   }
                }
-               if (TrackProgress(nWhichTrack, fracPre + (1.0-fracPre)*frac))
+               if (TrackProgress(nWhichTrack, frac))
                   return false;
             }
             rb.outputLeftTrack->Flush();
diff --git a/src/effects/SBSMSEffect.h b/src/effects/SBSMSEffect.h
index 8f2f65c0d..336ac358d 100644
--- a/src/effects/SBSMSEffect.h
+++ b/src/effects/SBSMSEffect.h
@@ -21,22 +21,23 @@
 #include "sbsms.h"
 using namespace _sbsms_;
 
-class WaveTrack;
-
 class EffectSBSMS : public Effect {
  public:
-   static bool bInit;
    virtual bool Process();
-   void setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd, bool bPreAnalyze);
+   void setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd,
+                      SlideType rateSlideType, SlideType pitchSlideType,
+                      bool bLinkRatePitch, bool bRateReferenceInput, bool bPitchReferenceInput);
 
  private:
    bool ProcessLabelTrack(Track *track);
    double rateStart, rateEnd, pitchStart, pitchEnd;
-   bool bPreAnalyze;
+   bool bLinkRatePitch, bRateReferenceInput, bPitchReferenceInput;
+   SlideType rateSlideType;
+   SlideType pitchSlideType;
    int mCurTrackNum;
    double mCurT0;
    double mCurT1;
-   real mTotalStretch;
+   float mTotalStretch;
 };
 
 #endif
diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp
index 2e09d1ce2..674512bec 100644
--- a/src/effects/TimeScale.cpp
+++ b/src/effects/TimeScale.cpp
@@ -23,6 +23,7 @@
 #if USE_SBSMS
 
 #include "TimeScale.h"
+#include "sbsms.h"
 
 #include "../ShuttleGui.h"
 
@@ -103,12 +104,6 @@ bool EffectTimeScale::TransferParameters( Shuttle & shuttle )
    return true;
 }
 
-inline double InvertedPercentChangeToRatio(double percentChange)
-{
-   //mchinen hack: invert the ratio so it works with the sbsms bug which requires the reciprocal number.
-   return 1.0/(1.0 + percentChange / 100.0);
-}
-
 inline double PercentChangeToRatio(double percentChange)
 {
    return 1.0 + percentChange / 100.0;
@@ -121,19 +116,16 @@ inline double HalfStepsToPercentChange(double halfSteps)
 
 inline double PercentChangeToHalfSteps(double percentChange)
 {
-   // mchinen: hack: take the negative of this so the correct value is displayed
-   // (see the InvertedPercentChangeToRatio hack for why this is needed)
    return 17.312340490667560888319096172023 * log(PercentChangeToRatio(percentChange));
 }
 
 bool EffectTimeScale::Process()
 {
-   // The pitch part of sbsms is backwards, so use an inverted function
-   double pitchStart = InvertedPercentChangeToRatio(m_PitchPercentChangeStart);
-   double pitchEnd = InvertedPercentChangeToRatio(m_PitchPercentChangeEnd);
+   double pitchStart = PercentChangeToRatio(m_PitchPercentChangeStart);
+   double pitchEnd = PercentChangeToRatio(m_PitchPercentChangeEnd);
    double rateStart = PercentChangeToRatio(m_RatePercentChangeStart);
    double rateEnd = PercentChangeToRatio(m_RatePercentChangeEnd);
-   this->EffectSBSMS::setParameters(rateStart,rateEnd,pitchStart,pitchEnd,m_PreAnalyze);
+   this->EffectSBSMS::setParameters(rateStart,rateEnd,pitchStart,pitchEnd,SlideLinearOutputRate,SlideLinearOutputRate,false,false,false);
    return this->EffectSBSMS::Process();
 }
 
@@ -298,23 +290,8 @@ void TimeScaleDialog::PopulateOrExchange(ShuttleGui & S)
    }
    S.EndStatic();
    S.EndMultiColumn();
-   
-   S.StartStatic(_("Options"));
-   {
-      S.StartHorizontalLay(wxEXPAND);
-      {
-         S.SetStyle(wxSL_HORIZONTAL);
-         /* i18n-hint: Transients are sounds like the onset of cymbals or drums.
-            They can get 'blurred' by sound stretching.  This checkbox option
-            may make them sharper again. */
-         m_pCheckBox_PreAnalyze = S.Id(ID_CHECKBOX_PREANALYZE)
-            .AddCheckBox(_("Dynamic Transient Sharpening"), wxT("false"));
-      }
-      S.EndHorizontalLay();
-   }
-   S.EndStatic();
-   
-   return;
+	
+	return;
 }
 
 bool TimeScaleDialog::TransferDataToWindow()
diff --git a/src/effects/TimeWarper.cpp b/src/effects/TimeWarper.cpp
index ad73c50c2..9d82fbd0e 100644
--- a/src/effects/TimeWarper.cpp
+++ b/src/effects/TimeWarper.cpp
@@ -10,7 +10,8 @@
 
 \file TimeWarper.cpp
 \brief Contains definitions for IdentityTimeWarper, ShiftTimeWarper,
-LinearTimeWarper, LogarithmicTimeWarper classes
+LinearTimeWarper, LogarithmicTimeWarper, QuadraticTimeWarper, 
+Geometric TimeWarper classes
 
 *//*******************************************************************/
 
@@ -33,14 +34,14 @@ double LinearTimeWarper::Warp(double originalTime) const
    return originalTime*mScale + mShift;
 }
 
-double LogarithmicTimeWarper::Warp(double originalTime) const
+double LinearInputRateTimeWarper::Warp(double originalTime) const
 {
    double rate = mRateWarper.Warp(originalTime);
    return mTStart + mScale*log(rate/mRStart);
 }
 
-LogarithmicTimeWarper::LogarithmicTimeWarper(double tStart, double tEnd,
-                                             double rStart, double rEnd)
+LinearInputRateTimeWarper::LinearInputRateTimeWarper(double tStart, double tEnd,
+                                                     double rStart, double rEnd)
 : mRateWarper(tStart, rStart, tEnd, rEnd), mRStart(rStart),
   mTStart(tStart), mScale((tEnd-tStart)/(rEnd-rStart))
 {
@@ -48,6 +49,91 @@ LogarithmicTimeWarper::LogarithmicTimeWarper(double tStart, double tEnd,
    wxASSERT(tStart < tEnd);
 }
 
+double LinearOutputRateTimeWarper::Warp(double originalTime) const
+{
+   double scaledTime = mTimeWarper.Warp(originalTime);
+   return mTStart + mScale*(sqrt(mC1 + scaledTime * mC2) - mRStart);
+}
+
+LinearOutputRateTimeWarper::LinearOutputRateTimeWarper(double tStart, double tEnd,
+                                                       double rStart, double rEnd)
+: mTimeWarper(tStart, 0.0, tEnd, 1.0), 
+  mRStart(rStart), mTStart(tStart), 
+  mScale(2.0*(tEnd-tStart)/(rEnd*rEnd-rStart*rStart)),
+  mC1(rStart*rStart), mC2(rEnd*rEnd-rStart*rStart)
+{
+   wxASSERT(rStart != rEnd);
+   wxASSERT(rStart > 0.0);
+   wxASSERT(rEnd > 0.0);
+   wxASSERT(tStart < tEnd);
+}
+
+double LinearInputStretchTimeWarper::Warp(double originalTime) const
+{
+   double scaledTime = mTimeWarper.Warp(originalTime);
+   return mTStart + mC1 * scaledTime * (1.0 + mC2 * scaledTime);
+}
+
+LinearInputStretchTimeWarper::LinearInputStretchTimeWarper(double tStart, double tEnd,
+                                                           double rStart, double rEnd)
+: mTimeWarper(tStart, 0.0, tEnd, 1.0), mTStart(tStart), 
+  mC1((tEnd-tStart)/rStart), mC2(0.5*(rStart/rEnd - 1.0))
+{
+   wxASSERT(rStart > 0.0);
+   wxASSERT(rEnd > 0.0);
+   wxASSERT(tStart < tEnd);
+}
+
+double LinearOutputStretchTimeWarper::Warp(double originalTime) const
+{
+   double scaledTime = mTimeWarper.Warp(originalTime);
+   return mTStart + mC1 * (pow(mC2, scaledTime) - 1.0);
+}
+
+LinearOutputStretchTimeWarper::LinearOutputStretchTimeWarper(double tStart, double tEnd,
+                                                             double rStart, double rEnd)
+: mTimeWarper(tStart, 0.0, tEnd, 1.0), mTStart(tStart), 
+  mC1((tEnd-tStart)/(rStart*log(rStart/rEnd))), mC2(rStart/rEnd)
+{
+   wxASSERT(rStart != rEnd);
+   wxASSERT(rStart > 0.0);
+   wxASSERT(rEnd > 0.0);
+   wxASSERT(tStart < tEnd);
+}
+
+double GeometricInputTimeWarper::Warp(double originalTime) const
+{
+   double scaledTime = mTimeWarper.Warp(originalTime);
+   return mTStart + mScale*(pow(mRatio,scaledTime) - 1.0);
+}
+
+GeometricInputTimeWarper::GeometricInputTimeWarper(double tStart, double tEnd,
+                                                   double rStart, double rEnd)
+: mTimeWarper(tStart, 0.0, tEnd, 1.0), mTStart(tStart),
+  mScale((tEnd-tStart)/(log(rStart/rEnd)*rStart)), mRatio(rStart/rEnd)
+{
+   wxASSERT(rStart != rEnd);
+   wxASSERT(rStart > 0.0);
+   wxASSERT(rEnd > 0.0);
+   wxASSERT(tStart < tEnd);
+}
+
+double GeometricOutputTimeWarper::Warp(double originalTime) const
+{
+   double scaledTime = mTimeWarper.Warp(originalTime);
+   return mTStart + mScale*log(mC0 * scaledTime + 1.0);
+}
+
+GeometricOutputTimeWarper::GeometricOutputTimeWarper(double tStart, double tEnd,
+                                                     double rStart, double rEnd)
+: mTimeWarper(tStart, 0.0, tEnd, 1.0), mTStart(tStart),
+  mScale((tEnd-tStart)/(rEnd-rStart)), mC0((rEnd-rStart)/rStart)
+{
+   wxASSERT(rStart > 0.0);
+   wxASSERT(rEnd > 0.0);
+   wxASSERT(tStart < tEnd);
+}
+
 StepTimeWarper::StepTimeWarper(double tStep, double offset)
 : mTStep(tStep), mOffset(offset)
 { }
diff --git a/src/effects/TimeWarper.h b/src/effects/TimeWarper.h
index 1d1f8601d..dec0801fb 100644
--- a/src/effects/TimeWarper.h
+++ b/src/effects/TimeWarper.h
@@ -10,7 +10,9 @@
 
 \file TimeWarper.h
 \brief Contains declarations for TimeWarper, IdentityTimeWarper,
-ShiftTimeWarper, LinearTimeWarper, LogarithmicTimeWarper classes
+ShiftTimeWarper, LinearTimeWarper, LinearInputRateSlideTimeWarper,
+LinearOutputRateSlideTimeWarper, LinearInputInverseRateTimeWarper,
+GeometricInputRateTimeWarper, GeometricOutputRateTimeWarper classes
 
 \class TimeWarper
 \brief Transforms one point in time to another point. For example, a time
@@ -26,8 +28,20 @@ split points in the input.
 \class LinearTimeWarper
 \brief Linear scaling, initialised by giving two points on the line
 
-\class LogarithmicTimeWarper
-\brief TimeScale - rate varies linearly, so time changes logarithmically.
+\class LinearInputRateTimeWarper
+\brief TimeScale - rate varies linearly with input
+
+\class LinearOutputRateTimeWarper
+\brief TimeScale - rate varies linearly with output
+
+\class LinearInputInverseRateTimeWarper
+\brief TimeScale - inverse rate varies linearly with input
+
+\class GeometricInputRateTimeWarper
+\brief TimeScale - rate varies geometrically with input
+
+\class GeometricOutputRateTimeWarper
+\brief TimeScale - rate varies geometrically with output
 
 \class StepTimeWarper
 \brief Like identity but with a jump
@@ -82,7 +96,7 @@ public:
    virtual double Warp(double originalTime) const;
 };
 
-class LogarithmicTimeWarper : public TimeWarper
+class LinearInputRateTimeWarper : public TimeWarper
 {
 private:
    LinearTimeWarper mRateWarper;
@@ -90,8 +104,75 @@ private:
    double mTStart;
    double mScale;
 public:
-   LogarithmicTimeWarper(double tStart, double tEnd,
-                         double rStart, double rEnd);
+   LinearInputRateTimeWarper(double tStart, double tEnd,
+                             double rStart, double rEnd);
+   virtual double Warp(double originalTime) const;
+};
+
+class LinearOutputRateTimeWarper : public TimeWarper
+{
+private:
+   LinearTimeWarper mTimeWarper;
+   double mRStart;
+   double mTStart;                              
+   double mScale;
+   double mC1;
+   double mC2;
+public:
+   LinearOutputRateTimeWarper(double tStart, double tEnd,
+                              double rStart, double rEnd);
+   virtual double Warp(double originalTime) const;
+};
+
+class LinearInputStretchTimeWarper : public TimeWarper
+{
+private:
+   LinearTimeWarper mTimeWarper;
+   double mTStart;
+   double mC1;
+   double mC2;
+public:
+   LinearInputStretchTimeWarper(double tStart, double tEnd,
+                                double rStart, double rEnd);
+   virtual double Warp(double originalTime) const;
+};
+
+class LinearOutputStretchTimeWarper : public TimeWarper
+{
+private:
+   LinearTimeWarper mTimeWarper;
+   double mTStart;
+   double mC1;
+   double mC2;
+public:
+   LinearOutputStretchTimeWarper(double tStart, double tEnd,
+                                 double rStart, double rEnd);
+   virtual double Warp(double originalTime) const;
+};
+
+class GeometricInputTimeWarper : public TimeWarper
+{
+private:
+   LinearTimeWarper mTimeWarper;
+   double mTStart;
+   double mScale;
+   double mRatio;
+public:
+   GeometricInputTimeWarper(double tStart, double tEnd,
+                            double rStart, double rEnd);
+   virtual double Warp(double originalTime) const;
+};
+
+class GeometricOutputTimeWarper : public TimeWarper
+{
+private:
+   LinearTimeWarper mTimeWarper;
+   double mTStart;
+   double mScale;
+   double mC0;
+public:
+   GeometricOutputTimeWarper(double tStart, double tEnd,
+                             double rStart, double rEnd);
    virtual double Warp(double originalTime) const;
 };
 
diff --git a/win/Projects/Audacity/Audacity.vcproj b/win/Projects/Audacity/Audacity.vcproj
index 7db6787ee..5492cb58d 100644
--- a/win/Projects/Audacity/Audacity.vcproj
+++ b/win/Projects/Audacity/Audacity.vcproj
@@ -2563,7 +2563,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;"
+						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;&#x0D;&#x0A;"
 						Outputs="$(OutDir)\$(ParentName)\$(InputFileName)"
 					/>
 				</FileConfiguration>
@@ -2572,7 +2572,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;"
+						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;&#x0D;&#x0A;"
 						Outputs="$(OutDir)\$(ParentName)\$(InputFileName)"
 					/>
 				</FileConfiguration>
@@ -2581,7 +2581,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;"
+						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;&#x0D;&#x0A;"
 						Outputs="$(OutDir)\$(ParentName)\$(InputFileName)"
 					/>
 				</FileConfiguration>
@@ -2590,7 +2590,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;"
+						CommandLine="copy /Y &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(OutDir)\$(ParentName)\$(InputFileName)&quot;&#x0D;&#x0A;"
 						Outputs="$(OutDir)\$(ParentName)\$(InputFileName)"
 					/>
 				</FileConfiguration>
diff --git a/win/Projects/sbsms/sbsms.vcproj b/win/Projects/sbsms/sbsms.vcproj
index e1041d295..753f7923f 100644
--- a/win/Projects/sbsms/sbsms.vcproj
+++ b/win/Projects/sbsms/sbsms.vcproj
@@ -285,11 +285,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\audio.cpp"
+				RelativePath="..\..\..\lib-src\sbsms\src\buffer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\buffer.cpp"
+				RelativePath="..\..\..\lib-src\sbsms\src\dBTable.cpp"
 				>
 			</File>
 			<File
@@ -300,10 +300,6 @@
 				RelativePath="..\..\..\lib-src\sbsms\src\grain.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\peak.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\lib-src\sbsms\src\resample.cpp"
 				>
@@ -312,6 +308,10 @@
 				RelativePath="..\..\..\lib-src\sbsms\src\sbsms.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\slide.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\lib-src\sbsms\src\sms.cpp"
 				>
@@ -328,10 +328,6 @@
 				RelativePath="..\..\..\lib-src\sbsms\src\trackpoint.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\utils.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -339,11 +335,11 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\audio.h"
+				RelativePath="..\..\..\lib-src\sbsms\src\buffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\buffer.h"
+				RelativePath="..\..\..\lib-src\sbsms\src\dBTable.h"
 				>
 			</File>
 			<File
@@ -354,10 +350,6 @@
 				RelativePath="..\..\..\lib-src\sbsms\src\grain.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\lib-src\sbsms\src\peak.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\lib-src\sbsms\src\real.h"
 				>
@@ -370,10 +362,18 @@
 				RelativePath="..\..\..\lib-src\sbsms\src\sms.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\sse.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\lib-src\sbsms\src\subband.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\synthTable.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\lib-src\sbsms\src\track.h"
 				>