-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Nov 30, 2008, at 01:22 AM, Mark Sapiro wrote:

>Vote: Abstain code
>So far, I've just eyeballed the diffs, but they look good with one exception. In configure.in, minimum Python version should be 2.4 as the sibling lists feature in CalcRecips.py uses sets.
>
>Also, paths.py.in suppressed the string exception warning for python 2.5 with
>
>    # Supress Python 2.5 warning about string exceptions.
>    filterwarnings('ignore', '.* string exception', DeprecationWarning)
>
>which can now be removed.
>
>I still intend to do an actual build of the branch and test it.

Cool, thanks for the comments.  I've pushed an update to the branch, and here
is the incremental diff.  It includes some autoconf cleanups.

- -Barry

=== modified file 'configure'
- --- configure	2008-11-04 02:25:20 +0000
+++ configure	2008-11-30 17:07:11 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # From configure.in Revision: 8122 .
 # Guess values for system-dependent variables and create Makefiles.
- -# Generated by GNU Autoconf 2.62.
+# Generated by GNU Autoconf 2.61.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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.
 ## --------------------- ##
@@ -16,7 +16,7 @@
 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
@@ -38,45 +38,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
- -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
- -if (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
- -
 # 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.
@@ -92,6 +64,8 @@
 # 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.
@@ -114,7 +88,7 @@
   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
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -127,10 +101,17 @@
 PS4='+ '
 
 # NLS nuisances.
- -LC_ALL=C
- -export LC_ALL
- -LANGUAGE=C
- -export LANGUAGE
+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
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -152,7 +133,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- -$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -178,7 +159,7 @@
   as_have_required=no
 fi
 
- -  if test $as_have_required = yes &&	 (eval ":
+  if test $as_have_required = yes && 	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -260,7 +241,7 @@
 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
@@ -281,7 +262,7 @@
 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
@@ -361,10 +342,10 @@
 
       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+"$@"}
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -433,10 +414,9 @@
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
- -  echo Please tell <email address hidden> about your system,
- -  echo including any error possibly output before this message.
- -  echo This can help us improve future autoconf versions.
- -  echo Configuration will now proceed without shell functions.
+  echo Please tell <email address hidden> about your system,
+  echo including any error possibly output before this
+  echo message
 }
 
 
@@ -472,7 +452,7 @@
       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
+    { 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
@@ -500,6 +480,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -512,22 +493,19 @@
   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
@@ -552,10 +530,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
- -	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
- -	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -705,20 +683,6 @@
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
- -ac_user_opts='
- -enable_option_checking
- -with_python
- -with_gcc
- -with_var_prefix
- -with_permcheck
- -with_username
- -with_groupname
- -with_mail_gid
- -with_cgi_gid
- -with_cgi_ext
- -with_mailhost
- -with_urlhost
- -'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -733,8 +697,6 @@
 # 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
@@ -833,21 +795,13 @@
     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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
- -    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 ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -860,21 +814,13 @@
     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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
- -    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 ;;
+    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- \
@@ -1065,38 +1011,22 @@
     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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
- -    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 ;;
+    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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
- -    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 ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1116,7 +1046,7 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
- -  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1125,16 +1055,16 @@
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- -      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { 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}
     ;;
 
@@ -1143,38 +1073,22 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- -  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+  { 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_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
- -   { (exit 1); exit 1; }; } ;;
- -    *)     $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_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1189,7 +1103,7 @@
 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.
+    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
@@ -1205,10 +1119,10 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- -  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+  { 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_echo "$as_me: error: pwd does not report name of working directory" >&2
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1216,12 +1130,12 @@
 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
@@ -1248,12 +1162,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- -  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { 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_echo "$as_me: error: $ac_msg" >&2
+	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=.
@@ -1302,9 +1216,9 @@
 
 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
@@ -1314,25 +1228,25 @@
 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
@@ -1378,17 +1292,15 @@
 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/ ;;
@@ -1424,7 +1336,7 @@
       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
@@ -1434,10 +1346,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
- -generated by GNU Autoconf 2.62
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- -2002, 2003, 2004, 2005, 2006, 2007, 2008 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.
 _ACEOF
@@ -1448,7 +1360,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
- -generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -1484,7 +1396,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
- -  $as_echo "PATH: $as_dir"
+  echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1519,7 +1431,7 @@
     | -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) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1571,12 +1483,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
- -      *_cv_*) { $as_echo "$as_me:$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= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1606,9 +1517,9 @@
     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
 
@@ -1623,9 +1534,9 @@
       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
@@ -1641,8 +1552,8 @@
       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 &&
@@ -1684,24 +1595,21 @@
 
 
 # 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
- -  ac_site_file1=$CONFIG_SITE
+  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 -r "$ac_site_file"; then
- -    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- -$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    { 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"
   fi
@@ -1711,16 +1619,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
- -    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
- -$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { 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:$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
 
@@ -1734,38 +1642,29 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
- -      { $as_echo "$as_me:$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:$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:$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:$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:$LINENO:   former value:  \`$ac_old_val'" >&5
- -$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
- -	{ $as_echo "$as_me:$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
@@ -1775,10 +1674,10 @@
   fi
 done
 if $ac_cache_corrupted; then
- -  { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { 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
 
@@ -1812,8 +1711,8 @@
 
 
 # Check for Python!  Better be found on $PATH
- -{ $as_echo "$as_me:$LINENO: checking for --with-python" >&5
- -$as_echo_n "checking for --with-python... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-python" >&5
+echo $ECHO_N "checking for --with-python... $ECHO_C" >&6; }
 
 # Check whether --with-python was given.
 if test "${with_python+set}" = set; then
@@ -1824,17 +1723,17 @@
     "") ans="no";;
     *)  ans="$with_python"
 esac
- -{ $as_echo "$as_me:$LINENO: result: $ans" >&5
- -$as_echo "$ans" >&6; }
+{ echo "$as_me:$LINENO: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6; }
 
 if test -z "$with_python"
 then
         # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
- -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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_with_python+set}" = set; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $with_python in
   [\\/]* | ?:[\\/]*)
@@ -1849,7 +1748,7 @@
   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_with_python="$as_dir/$ac_word$ac_exec_ext"
- -    $as_echo "$as_me:$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
@@ -1862,26 +1761,26 @@
 fi
 with_python=$ac_cv_path_with_python
 if test -n "$with_python"; then
- -  { $as_echo "$as_me:$LINENO: result: $with_python" >&5
- -$as_echo "$with_python" >&6; }
+  { echo "$as_me:$LINENO: result: $with_python" >&5
+echo "${ECHO_T}$with_python" >&6; }
 else
- -  { $as_echo "$as_me:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
- -fi
- -
- -
- -fi
- -
- -{ $as_echo "$as_me:$LINENO: checking Python interpreter" >&5
- -$as_echo_n "checking Python interpreter... " >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+
+{ echo "$as_me:$LINENO: checking Python interpreter" >&5
+echo $ECHO_N "checking Python interpreter... $ECHO_C" >&6; }
 if test ! -x $with_python
 then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 
 ***** No Python interpreter found!
 ***** Try including the configure option
 ***** --with-python=/path/to/python/interpreter" >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 
 ***** No Python interpreter found!
 ***** Try including the configure option
@@ -1890,12 +1789,12 @@
 fi
 
 PYTHON=$with_python
- -{ $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
- -$as_echo "$PYTHON" >&6; }
+{ echo "$as_me:$LINENO: result: $PYTHON" >&5
+echo "${ECHO_T}$PYTHON" >&6; }
 
 # See if Python is new enough.
- -{ $as_echo "$as_me:$LINENO: checking Python version" >&5
- -$as_echo_n "checking Python version... " >&6; }
+{ echo "$as_me:$LINENO: checking Python version" >&5
+echo $ECHO_N "checking Python version... $ECHO_C" >&6; }
 
 cat > conftest.py <<EOF
 import sys
@@ -1903,7 +1802,7 @@
     v = sys.hexversion
 except AttributeError:
     v = 0
- -if v >= 0x2030000:
+if v >= 0x2040000:
     s = sys.version.split()[0]
 else:
     s = ""
@@ -1917,22 +1816,22 @@
 rm -f conftest.out conftest.py
 if test -z "$version"
 then
- -    { { $as_echo "$as_me:$LINENO: error:
- -
- -***** $PYTHON is too old (or broken)
- -***** Python 2.3 or newer is required" >&5
- -$as_echo "$as_me: error:
- -
- -***** $PYTHON is too old (or broken)
- -***** Python 2.3 or newer is required" >&2;}
+    { { echo "$as_me:$LINENO: error:
+
+***** $PYTHON is too old (or broken)
+***** Python 2.4 or newer is required" >&5
+echo "$as_me: error:
+
+***** $PYTHON is too old (or broken)
+***** Python 2.4 or newer is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
- -{ $as_echo "$as_me:$LINENO: result: $version" >&5
- -$as_echo "$version" >&6; }
+{ echo "$as_me:$LINENO: result: $version" >&5
+echo "${ECHO_T}$version" >&6; }
 
 # Check the email package version.
- -{ $as_echo "$as_me:$LINENO: checking Python's email package" >&5
- -$as_echo_n "checking Python's email package... " >&6; }
+{ echo "$as_me:$LINENO: checking Python's email package" >&5
+echo $ECHO_N "checking Python's email package... $ECHO_C" >&6; }
 
 cat > conftest.py <<EOF
 import sys
@@ -1942,7 +1841,7 @@
     res = "not ok"
 else:
     provided = (2, 5, 8)
- -    version = tuple([int(v) for v in email.__version__.split('.')])
+    version = tuple(int(v) for v in email.__version__.split('.'))
     if provided > version:
         res = "not ok"
     else:
@@ -1964,14 +1863,14 @@
 else
     EMAILPKG=email-2.5.8
 fi
- -{ $as_echo "$as_me:$LINENO: result: $needemailpkg" >&5
- -$as_echo "$needemailpkg" >&6; }
+{ echo "$as_me:$LINENO: result: $needemailpkg" >&5
+echo "${ECHO_T}$needemailpkg" >&6; }
 
 
 # Make sure distutils is available.  Some Linux Python packages split
 # distutils into the "-devel" package, so they need both.
- -{ $as_echo "$as_me:$LINENO: checking that Python has a working distutils" >&5
- -$as_echo_n "checking that Python has a working distutils... " >&6; }
+{ echo "$as_me:$LINENO: checking that Python has a working distutils" >&5
+echo $ECHO_N "checking that Python has a working distutils... $ECHO_C" >&6; }
 
 cat > conftest.py <<EOF
 try:
@@ -2003,14 +1902,14 @@
 rm -f conftest.out conftest.py
 if test "$havedistutils" != "yes"
 then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 
 ***** Distutils is not available or is incomplete for $PYTHON
 ***** If you installed Python from RPM (or other package manager)
 ***** be sure to install the -devel package, or install Python
 ***** from source.  See sec. 15.1 of the Installation Manual for
 ***** details" >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 
 ***** Distutils is not available or is incomplete for $PYTHON
 ***** If you installed Python from RPM (or other package manager)
@@ -2019,8 +1918,8 @@
 ***** details" >&2;}
    { (exit 1); exit 1; }; }
 fi
- -{ $as_echo "$as_me:$LINENO: result: $havedistutils" >&5
- -$as_echo "$havedistutils" >&6; }
+{ echo "$as_me:$LINENO: result: $havedistutils" >&5
+echo "${ECHO_T}$havedistutils" >&6; }
 
 # Checks for programs.
 ac_aux_dir=
@@ -2040,8 +1939,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
- -  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
- -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$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
 
@@ -2067,12 +1966,11 @@
 # 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:$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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2101,29 +1999,17 @@
 	    # 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
 IFS=$as_save_IFS
 
- -rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2136,8 +2022,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
- -{ $as_echo "$as_me:$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.
@@ -2147,12 +2033,11 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
- -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- -set x ${MAKE-make}
- -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2169,21 +2054,21 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- -  { $as_echo "$as_me:$LINENO: result: yes" >&5
- -$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
- -  { $as_echo "$as_me:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Extract the first word of "true", so it can be a program name with args.
 set dummy true; ac_word=$2
- -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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_TRUE+set}" = set; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $TRUE in
   [\\/]* | ?:[\\/]*)
@@ -2199,7 +2084,7 @@
   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_TRUE="$as_dir/$ac_word$ac_exec_ext"
- -    $as_echo "$as_me:$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
@@ -2212,18 +2097,18 @@
 fi
 TRUE=$ac_cv_path_TRUE
 if test -n "$TRUE"; then
- -  { $as_echo "$as_me:$LINENO: result: $TRUE" >&5
- -$as_echo "$TRUE" >&6; }
+  { echo "$as_me:$LINENO: result: $TRUE" >&5
+echo "${ECHO_T}$TRUE" >&6; }
 else
- -  { $as_echo "$as_me:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 
 # Find compiler, allow alternatives to gcc
- -{ $as_echo "$as_me:$LINENO: checking for --without-gcc" >&5
- -$as_echo_n "checking for --without-gcc... " >&6; }
+{ echo "$as_me:$LINENO: checking for --without-gcc" >&5
+echo $ECHO_N "checking for --without-gcc... $ECHO_C" >&6; }
 
 # Check whether --with-gcc was given.
 if test "${with_gcc+set}" = set; then
@@ -2240,15 +2125,15 @@
   without_gcc=no;
 fi
 
- -{ $as_echo "$as_me:$LINENO: result: $without_gcc" >&5
- -$as_echo "$without_gcc" >&6; }
+{ echo "$as_me:$LINENO: result: $without_gcc" >&5
+echo "${ECHO_T}$without_gcc" >&6; }
 
 # If the user switches compilers, we can't believe the cache
 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
 then
- -  { { $as_echo "$as_me:$LINENO: error: cached CC is different -- throw away $cache_file
+  { { echo "$as_me:$LINENO: error: cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling)" >&5
- -$as_echo "$as_me: error: cached CC is different -- throw away $cache_file
+echo "$as_me: error: cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling)" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2261,10 +2146,10 @@
 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:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2277,7 +2162,7 @@
   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:$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
@@ -2288,11 +2173,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- -  { $as_echo "$as_me:$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:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2301,10 +2186,10 @@
   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:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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
- -  $as_echo_n "(cached) " >&6
+  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.
@@ -2317,7 +2202,7 @@
   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:$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
@@ -2328,11 +2213,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
- -  { $as_echo "$as_me:$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:$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
@@ -2340,10 +2225,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
- -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ 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 <email address hidden>." >&5
- -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+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 <email address hidden>." >&2;}
 ac_tool_warned=yes ;;
@@ -2358,10 +2243,10 @@
           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:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2374,7 +2259,7 @@
   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:$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
@@ -2385,11 +2270,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- -  { $as_echo "$as_me:$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:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2398,10 +2283,10 @@
 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:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2419,7 +2304,7 @@
        continue
      fi
     ac_cv_prog_CC="cc"
- -    $as_echo "$as_me:$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
@@ -2442,11 +2327,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- -  { $as_echo "$as_me:$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:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2457,10 +2342,10 @@
   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:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2473,7 +2358,7 @@
   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:$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
@@ -2484,11 +2369,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- -  { $as_echo "$as_me:$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:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2501,10 +2386,10 @@
 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:$LINENO: checking for $ac_word" >&5
- -$as_echo_n "checking for $ac_word... " >&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
- -  $as_echo_n "(cached) " >&6
+  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.
@@ -2517,7 +2402,7 @@
   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:$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
@@ -2528,11 +2413,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
- -  { $as_echo "$as_me:$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:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2544,10 +2429,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
- -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ 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 <email address hidden>." >&5
- -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+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 <email address hidden>." >&2;}
 ac_tool_warned=yes ;;
@@ -2559,48 +2444,44 @@
 fi
 
 
- -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
- -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+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:$LINENO: checking for C compiler version" >&5
- -set X $ac_compile
- -ac_compiler=$2
+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:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2619,22 +2500,27 @@
 }
 _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:$LINENO: checking for C compiler default output file name" >&5
- -$as_echo_n "checking for C compiler default output file name... " >&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
@@ -2645,11 +2531,10 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$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:$LINENO: \$? = $ac_status" >&5
+  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'
@@ -2660,7 +2545,7 @@
 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
@@ -2687,15 +2572,15 @@
   ac_file=''
 fi
 
- -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
- -$as_echo "$ac_file" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
 if test -z "$ac_file"; then
- -  $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:$LINENO: error: C compiler cannot create executables
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
- -$as_echo "$as_me: error: C compiler cannot create executables
+echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
@@ -2704,8 +2589,8 @@
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
- -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- -$as_echo_n "checking whether the C compiler works... " >&6; }
+{ 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
@@ -2714,51 +2599,49 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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
- -	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { 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
- -$as_echo "$as_me: error: cannot run C compiled programs.
+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
- -{ $as_echo "$as_me:$LINENO: result: yes" >&5
- -$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
- -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
- -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- -$as_echo_n "checking whether we are cross compiling... " >&6; }
- -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
- -$as_echo "$cross_compiling" >&6; }
+{ 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; }
 
- -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
- -$as_echo_n "checking for suffix of executables... " >&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:$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:$LINENO: \$? = $ac_status" >&5
+  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
@@ -2767,31 +2650,31 @@
 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:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
- -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+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$ac_cv_exeext
- -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
- -$as_echo "$ac_cv_exeext" >&6; }
+{ 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
- -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
- -$as_echo_n "checking for suffix of object files... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2814,41 +2697,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$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:$LINENO: \$? = $ac_status" >&5
+  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:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
- -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+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:$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:$LINENO: checking whether we are using the GNU C compiler" >&5
- -$as_echo_n "checking whether we are using the GNU C compiler... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2874,21 +2756,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2898,19 +2779,15 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
- -{ $as_echo "$as_me:$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:$LINENO: checking whether $CC accepts -g" >&5
- -$as_echo_n "checking whether $CC accepts -g... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2937,21 +2814,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2976,21 +2852,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3016,21 +2891,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3045,8 +2919,8 @@
 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:$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
@@ -3062,10 +2936,10 @@
     CFLAGS=
   fi
 fi
- -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
- -$as_echo_n "checking for $CC option to accept ISO C89... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3136,21 +3010,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3166,15 +3039,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
- -    { $as_echo "$as_me:$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:$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:$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
 
 
@@ -3202,10 +3075,10 @@
 fi
 
 # We better be able to execute interpreters
- -{ $as_echo "$as_me:$LINENO: checking whether #! works in shell scripts" >&5
- -$as_echo_n "checking whether #! works in shell scripts... " >&6; }
+{ echo "$as_me:$LINENO: checking whether #! works in shell scripts" >&5
+echo $ECHO_N "checking whether #! works in shell scripts... $ECHO_C" >&6; }
 if test "${ac_cv_sys_interpreter+set}" = set; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo '#! /bin/cat
 exit 69
@@ -3219,17 +3092,17 @@
 fi
 rm -f conftest
 fi
- -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_interpreter" >&5
- -$as_echo "$ac_cv_sys_interpreter" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_interpreter" >&5
+echo "${ECHO_T}$ac_cv_sys_interpreter" >&6; }
 interpval=$ac_cv_sys_interpreter
 
 if test "$ac_cv_sys_interpreter" != "yes"
 then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 
 ***** Cannot execute interpreter scripts?
 ***** Are you sure you system doesn't support this?" >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 
 ***** Cannot execute interpreter scripts?
 ***** Are you sure you system doesn't support this?" >&2;}
@@ -3240,8 +3113,8 @@
 # Check for an alternate data directory, separate from installation dir.
 default_var_prefix="/var/mailman"
 
- -{ $as_echo "$as_me:$LINENO: checking for --with-var-prefix" >&5
- -$as_echo_n "checking for --with-var-prefix... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-var-prefix" >&5
+echo $ECHO_N "checking for --with-var-prefix... $ECHO_C" >&6; }
 
 # Check whether --with-var-prefix was given.
 if test "${with_var_prefix+set}" = set; then
@@ -3253,11 +3126,11 @@
         ""|no)  VAR_PREFIX="$prefix"; ans="no";;
         *)      VAR_PREFIX="$with_var_prefix"; ans=$VAR_PREFIX;
 esac
- -{ $as_echo "$as_me:$LINENO: result: $ans" >&5
- -$as_echo "$ans" >&6; }
+{ echo "$as_me:$LINENO: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6; }
 
- -{ $as_echo "$as_me:$LINENO: checking for --with-permcheck" >&5
- -$as_echo_n "checking for --with-permcheck... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-permcheck" >&5
+echo $ECHO_N "checking for --with-permcheck... $ECHO_C" >&6; }
 
 # Check whether --with-permcheck was given.
 if test "${with_permcheck+set}" = set; then
@@ -3268,8 +3141,8 @@
 then
         with_permcheck="yes"
 fi
- -{ $as_echo "$as_me:$LINENO: result: $with_permcheck" >&5
- -$as_echo "$with_permcheck" >&6; }
+{ echo "$as_me:$LINENO: result: $with_permcheck" >&5
+echo "${ECHO_T}$with_permcheck" >&6; }
 # Now make sure that $prefix is set up correctly.  It must be group
 # owned by the target group, it must have the group sticky bit set, and
 # it must be a+rx
@@ -3289,8 +3162,8 @@
 
 
 # Check for some other uid to use than `mailman'
- -{ $as_echo "$as_me:$LINENO: checking for --with-username" >&5
- -$as_echo_n "checking for --with-username... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-username" >&5
+echo $ECHO_N "checking for --with-username... $ECHO_C" >&6; }
 
 # Check whether --with-username was given.
 if test "${with_username+set}" = set; then
@@ -3303,13 +3176,13 @@
         with_username="mailman"
 fi
 USERNAME=$with_username
- -{ $as_echo "$as_me:$LINENO: result: $USERNAME" >&5
- -$as_echo "$USERNAME" >&6; }
+{ echo "$as_me:$LINENO: result: $USERNAME" >&5
+echo "${ECHO_T}$USERNAME" >&6; }
 
 # User `mailman' must exist
 
- -{ $as_echo "$as_me:$LINENO: checking for user name \"$USERNAME\"" >&5
- -$as_echo_n "checking for user name \"$USERNAME\"... " >&6; }
+{ echo "$as_me:$LINENO: checking for user name \"$USERNAME\"" >&5
+echo $ECHO_N "checking for user name \"$USERNAME\"... $ECHO_C" >&6; }
 
 # MAILMAN_USER == variable name
 # $USERNAME == user id to check for
@@ -3343,12 +3216,12 @@
 then
   if test "$with_permcheck" = "yes"
   then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 ***** No \"$USERNAME\" user found!
 ***** Your system must have a \"$USERNAME\" user defined
 ***** (usually in your /etc/passwd file).  Please see the INSTALL
 ***** file for details." >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 ***** No \"$USERNAME\" user found!
 ***** Your system must have a \"$USERNAME\" user defined
 ***** (usually in your /etc/passwd file).  Please see the INSTALL
@@ -3356,13 +3229,13 @@
    { (exit 1); exit 1; }; }
   fi
 fi
- -{ $as_echo "$as_me:$LINENO: result: okay" >&5
- -$as_echo "okay" >&6; }
+{ echo "$as_me:$LINENO: result: okay" >&5
+echo "${ECHO_T}okay" >&6; }
 
 
 # Check for some other gid to use than `mailman'
- -{ $as_echo "$as_me:$LINENO: checking for --with-groupname" >&5
- -$as_echo_n "checking for --with-groupname... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-groupname" >&5
+echo $ECHO_N "checking for --with-groupname... $ECHO_C" >&6; }
 
 # Check whether --with-groupname was given.
 if test "${with_groupname+set}" = set; then
@@ -3375,14 +3248,14 @@
         with_groupname="mailman"
 fi
 GROUPNAME=$with_groupname
- -{ $as_echo "$as_me:$LINENO: result: $GROUPNAME" >&5
- -$as_echo "$GROUPNAME" >&6; }
+{ echo "$as_me:$LINENO: result: $GROUPNAME" >&5
+echo "${ECHO_T}$GROUPNAME" >&6; }
 
 
 # Target group must exist
 
- -{ $as_echo "$as_me:$LINENO: checking for group name \"$GROUPNAME\"" >&5
- -$as_echo_n "checking for group name \"$GROUPNAME\"... " >&6; }
+{ echo "$as_me:$LINENO: checking for group name \"$GROUPNAME\"" >&5
+echo $ECHO_N "checking for group name \"$GROUPNAME\"... $ECHO_C" >&6; }
 
 # MAILMAN_GROUP == variable name
 # $GROUPNAME == user id to check for
@@ -3416,12 +3289,12 @@
 then
   if test "$with_permcheck" = "yes"
   then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 ***** No \"$GROUPNAME\" group found!
 ***** Your system must have a \"$GROUPNAME\" group defined
 ***** (usually in your /etc/group file).  Please see the INSTALL
 ***** file for details." >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 ***** No \"$GROUPNAME\" group found!
 ***** Your system must have a \"$GROUPNAME\" group defined
 ***** (usually in your /etc/group file).  Please see the INSTALL
@@ -3429,12 +3302,12 @@
    { (exit 1); exit 1; }; }
   fi
 fi
- -{ $as_echo "$as_me:$LINENO: result: okay" >&5
- -$as_echo "okay" >&6; }
- -
- -
- -{ $as_echo "$as_me:$LINENO: checking permissions on $prefixcheck" >&5
- -$as_echo_n "checking permissions on $prefixcheck... " >&6; }
+{ echo "$as_me:$LINENO: result: okay" >&5
+echo "${ECHO_T}okay" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking permissions on $prefixcheck" >&5
+echo $ECHO_N "checking permissions on $prefixcheck... $ECHO_C" >&6; }
 
 cat > conftest.py <<EOF
 import os, grp
@@ -3477,10 +3350,10 @@
 then
     if test "$status" != "okay"
     then
- -        { { $as_echo "$as_me:$LINENO: error:
+        { { echo "$as_me:$LINENO: error:
 ***** Installation directory $prefixcheck is not configured properly!
 $status" >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 ***** Installation directory $prefixcheck is not configured properly!
 $status" >&2;}
    { (exit 1); exit 1; }; }
@@ -3488,14 +3361,14 @@
 else
     status="skipped"
 fi
- -{ $as_echo "$as_me:$LINENO: result: $status" >&5
- -$as_echo "$status" >&6; }
+{ echo "$as_me:$LINENO: result: $status" >&5
+echo "${ECHO_T}$status" >&6; }
 
 
 # Now find the UIDs and GIDs
 # Support --with-mail-gid and --with-cgi-gid
- -{ $as_echo "$as_me:$LINENO: checking for mail wrapper group; i.e. --with-mail-gid" >&5
- -$as_echo_n "checking for mail wrapper group; i.e. --with-mail-gid... " >&6; }
+{ echo "$as_me:$LINENO: checking for mail wrapper group; i.e. --with-mail-gid" >&5
+echo $ECHO_N "checking for mail wrapper group; i.e. --with-mail-gid... $ECHO_C" >&6; }
 
 # Check whether --with-mail-gid was given.
 if test "${with_mail_gid+set}" = set; then
@@ -3539,14 +3412,14 @@
 then
   if test "$with_permcheck" = "yes"
   then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 ***** No group name \"$with_mail_gid\" found for the mail wrapper program.
 ***** This is the group that your mail server will use to run Mailman's
 ***** programs.  You should specify an existing group with the
 ***** --with-mail-gid configure option, or use --without-permcheck to
 ***** skip this verification step.  See also your mail server's documentation,
 ***** and Mailman's INSTALL file for details" >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 ***** No group name \"$with_mail_gid\" found for the mail wrapper program.
 ***** This is the group that your mail server will use to run Mailman's
 ***** programs.  You should specify an existing group with the
@@ -3558,12 +3431,12 @@
     MAIL_GROUP=$with_mail_gid
   fi
 fi
- -{ $as_echo "$as_me:$LINENO: result: $MAIL_GROUP" >&5
- -$as_echo "$MAIL_GROUP" >&6; }
- -
- -
- -{ $as_echo "$as_me:$LINENO: checking for CGI wrapper group; i.e. --with-cgi-gid" >&5
- -$as_echo_n "checking for CGI wrapper group; i.e. --with-cgi-gid... " >&6; }
+{ echo "$as_me:$LINENO: result: $MAIL_GROUP" >&5
+echo "${ECHO_T}$MAIL_GROUP" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking for CGI wrapper group; i.e. --with-cgi-gid" >&5
+echo $ECHO_N "checking for CGI wrapper group; i.e. --with-cgi-gid... $ECHO_C" >&6; }
 
 # Check whether --with-cgi-gid was given.
 if test "${with_cgi_gid+set}" = set; then
@@ -3608,14 +3481,14 @@
 then
   if test "$with_permcheck" = "yes"
   then
- -    { { $as_echo "$as_me:$LINENO: error:
+    { { echo "$as_me:$LINENO: error:
 ***** No group name \"$with_cgi_gid\" found for the CGI wrapper program.
 ***** This is the group that your web server will use to run Mailman's
 ***** programs.  You should specify an existing group with the
 ***** --with-cgi-gid configure option, or use --without-permcheck to
 ***** skip this verification step.  See also your web server's documentation,
 ***** and Mailman's INSTALL file for details" >&5
- -$as_echo "$as_me: error:
+echo "$as_me: error:
 ***** No group name \"$with_cgi_gid\" found for the CGI wrapper program.
 ***** This is the group that your web server will use to run Mailman's
 ***** programs.  You should specify an existing group with the
@@ -3627,14 +3500,14 @@
     CGI_GROUP=$with_cgi_gid
   fi
 fi
- -{ $as_echo "$as_me:$LINENO: result: $CGI_GROUP" >&5
- -$as_echo "$CGI_GROUP" >&6; }
+{ echo "$as_me:$LINENO: result: $CGI_GROUP" >&5
+echo "${ECHO_T}$CGI_GROUP" >&6; }
 
 
 # Check for CGI extensions, required by some Web servers
 
- -{ $as_echo "$as_me:$LINENO: checking for CGI extensions" >&5
- -$as_echo_n "checking for CGI extensions... " >&6; }
+{ echo "$as_me:$LINENO: checking for CGI extensions" >&5
+echo $ECHO_N "checking for CGI extensions... $ECHO_C" >&6; }
 
 # Check whether --with-cgi-ext was given.
 if test "${with_cgi_ext+set}" = set; then
@@ -3648,14 +3521,14 @@
 else
         CGIEXT=$with_cgi_ext
 fi
- -{ $as_echo "$as_me:$LINENO: result: $with_cgi_ext" >&5
- -$as_echo "$with_cgi_ext" >&6; }
+{ echo "$as_me:$LINENO: result: $with_cgi_ext" >&5
+echo "${ECHO_T}$with_cgi_ext" >&6; }
 
 
 # figure out the default mail hostname and url host component
 
- -{ $as_echo "$as_me:$LINENO: checking for --with-mailhost" >&5
- -$as_echo_n "checking for --with-mailhost... " >&6; }
+{ echo "$as_me:$LINENO: checking for --with-mailhost" >&5
+echo $ECHO_N "checking for --with-mailhost... $ECHO_C" >&6; }
 
 # Check whether --with-mailhost was given.
 if test "${with_mailhost+set}" = set; then
@@ -3669,12 +3542,12 @@
 else
         MAILHOST=$with_mailhost
 fi
- -{ $as_echo "$as_me:$LINENO: result: $with_mailhost" >&5
- -$as_echo "$with_mailhost" >&6; }
- -
- -
- -{ $as_echo "$as_me:$LINENO: checking for --with-urlhost" >&5
- -$as_echo_n "checking for --with-urlhost... " >&6; }
+{ echo "$as_me:$LINENO: result: $with_mailhost" >&5
+echo "${ECHO_T}$with_mailhost" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking for --with-urlhost" >&5
+echo $ECHO_N "checking for --with-urlhost... $ECHO_C" >&6; }
 
 # Check whether --with-urlhost was given.
 if test "${with_urlhost+set}" = set; then
@@ -3688,8 +3561,8 @@
 else
         URLHOST=$with_urlhost
 fi
- -{ $as_echo "$as_me:$LINENO: result: $with_urlhost" >&5
- -$as_echo "$with_urlhost" >&6; }
+{ echo "$as_me:$LINENO: result: $with_urlhost" >&5
+echo "${ECHO_T}$with_urlhost" >&6; }
 
 
 
@@ -3704,22 +3577,22 @@
 EOF
 $PYTHON conftest.py
 
- -{ $as_echo "$as_me:$LINENO: checking for default mail host name" >&5
- -$as_echo_n "checking for default mail host name... " >&6; }
+{ echo "$as_me:$LINENO: checking for default mail host name" >&5
+echo $ECHO_N "checking for default mail host name... $ECHO_C" >&6; }
 if test -z "$MAILHOST"
 then
     MAILHOST=`sed q conftest.out`
 fi
- -{ $as_echo "$as_me:$LINENO: result: $MAILHOST" >&5
- -$as_echo "$MAILHOST" >&6; }
- -{ $as_echo "$as_me:$LINENO: checking for default URL host component" >&5
- -$as_echo_n "checking for default URL host component... " >&6; }
+{ echo "$as_me:$LINENO: result: $MAILHOST" >&5
+echo "${ECHO_T}$MAILHOST" >&6; }
+{ echo "$as_me:$LINENO: checking for default URL host component" >&5
+echo $ECHO_N "checking for default URL host component... $ECHO_C" >&6; }
 if test -z "$URLHOST"
 then
     URLHOST=`sed -n '$p' conftest.out`
 fi
- -{ $as_echo "$as_me:$LINENO: result: $URLHOST" >&5
- -$as_echo "$URLHOST" >&6; }
+{ echo "$as_me:$LINENO: result: $URLHOST" >&5
+echo "${ECHO_T}$URLHOST" >&6; }
 rm -f conftest.out conftest.py
 
 # Checks for libraries.
@@ -3729,11 +3602,11 @@
 
 for ac_func in strerror setregid syslog
 do
- -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
- -$as_echo_n "checking for $ac_func... " >&6; }
+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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3786,41 +3659,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_exeext && {
- -	 test "$cross_compiling" = yes ||
- -	 $as_test_x conftest$ac_exeext
- -       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
- -rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
- -ac_res=`eval 'as_val=${'$as_ac_var'}
- -		 $as_echo "$as_val"'`
- -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- -$as_echo "$ac_res" >&6; }
- -if test `eval 'as_val=${'$as_ac_var'}
- -		 $as_echo "$as_val"'` = yes; then
+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
@@ -3832,8 +3699,8 @@
   # one of several _real_ functions in syslog.h, so we need to do the test
   # with the appropriate include.
   for lib in bsd socket inet; do
- -    { $as_echo "$as_me:$LINENO: checking for syslog in -l$lib" >&5
- -$as_echo_n "checking for syslog in -l$lib... " >&6; }
+    { echo "$as_me:$LINENO: checking for syslog in -l$lib" >&5
+echo $ECHO_N "checking for syslog in -l$lib... $ECHO_C" >&6; }
     Mailman_LIBS_save="$LIBS"; LIBS="$LIBS -l$lib"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3856,38 +3723,34 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_exeext && {
- -	 test "$cross_compiling" = yes ||
- -	 $as_test_x conftest$ac_exeext
- -       }; then
- -  { $as_echo "$as_me:$LINENO: result: yes" >&5
- -$as_echo "yes" >&6; }
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
       cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYSLOG 1
 _ACEOF
 
       break
 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:$LINENO: result: no" >&5
- -$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
       LIBS="$Mailman_LIBS_save"
 fi
 
- -rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     unset Mailman_LIBS_save
@@ -3900,15 +3763,15 @@
 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
- -{ $as_echo "$as_me:$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; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3940,21 +3803,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3978,14 +3840,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3993,7 +3854,7 @@
   # Broken: success on invalid input.
 continue
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4018,8 +3879,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
- -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
- -$as_echo "$CPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4047,21 +3908,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4085,14 +3945,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4100,7 +3959,7 @@
   # Broken: success on invalid input.
 continue
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4116,9 +3975,9 @@
 if $ac_preproc_ok; then
   :
 else
- -  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
- -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4130,37 +3989,42 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
- -{ $as_echo "$as_me:$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
- -else
- -  if test -z "$GREP"; then
+{ 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
   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_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
     ac_count=`expr $ac_count + 1`
@@ -4175,60 +4039,74 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
- -      $ac_path_GREP_found && break 3
- -    done
+
+    $ac_path_GREP_found && break 3
   done
 done
+
+done
 IFS=$as_save_IFS
- -  if test -z "$ac_cv_path_GREP"; then
- -    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+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
+fi
+
 else
   ac_cv_path_GREP=$GREP
 fi
 
+
 fi
- -{ $as_echo "$as_me:$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:$LINENO: checking for egrep" >&5
- -$as_echo_n "checking for egrep... " >&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
- -  $as_echo_n "(cached) " >&6
+  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_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
     ac_count=`expr $ac_count + 1`
@@ -4243,31 +4121,40 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
- -      $ac_path_EGREP_found && break 3
- -    done
+
+    $ac_path_EGREP_found && break 3
   done
 done
+
+done
 IFS=$as_save_IFS
- -  if test -z "$ac_cv_path_EGREP"; then
- -    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+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
+fi
+
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
+
    fi
 fi
- -{ $as_echo "$as_me:$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:$LINENO: checking for ANSI C header files" >&5
- -$as_echo_n "checking for ANSI C header files... " >&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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4294,21 +4181,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_header_stdc=yes
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4400,40 +4286,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$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:$LINENO: \$? = $ac_status" >&5
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
- -  $as_echo "$as_me: program exited with status $ac_status" >&5
- -$as_echo "$as_me: failed program was:" >&5
+  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 -rf conftest.dSYM
 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:$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
 
 cat >>confdefs.h <<\_ACEOF
@@ -4455,11 +4338,11 @@
 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`
- -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- -$as_echo_n "checking for $ac_header... " >&6; }
+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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4477,21 +4360,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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
   eval "$as_ac_Header=yes"
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4499,14 +4381,12 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
- -ac_res=`eval 'as_val=${'$as_ac_Header'}
- -		 $as_echo "$as_val"'`
- -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- -$as_echo "$ac_res" >&6; }
- -if test `eval 'as_val=${'$as_ac_Header'}
- -		 $as_echo "$as_val"'` = yes; then
+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
@@ -4517,21 +4397,20 @@
 
 for ac_header in syslog.h
 do
- -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- -$as_echo_n "checking for $ac_header... " >&6; }
- -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- -  $as_echo_n "(cached) " >&6
+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 'as_val=${'$as_ac_Header'}
- -		 $as_echo "$as_val"'`
- -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- -$as_echo "$ac_res" >&6; }
+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?
- -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- -$as_echo_n "checking $ac_header usability... " >&6; }
+{ 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
@@ -4547,33 +4426,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_header_compiler=yes
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  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
- -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- -$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
- -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- -$as_echo_n "checking $ac_header presence... " >&6; }
+{ 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
@@ -4587,72 +4465,69 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  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
- -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- -$as_echo "$ac_header_preproc" >&6; }
+{ 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_c_preproc_warn_flag in
   yes:no: )
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { 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:* )
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
- -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
- -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { 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
- -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- -$as_echo_n "checking for $ac_header... " >&6; }
+{ 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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
- -ac_res=`eval 'as_val=${'$as_ac_Header'}
- -		 $as_echo "$as_val"'`
- -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- -$as_echo "$ac_res" >&6; }
+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 'as_val=${'$as_ac_Header'}
- -		 $as_echo "$as_val"'` = yes; then
+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
@@ -4661,10 +4536,10 @@
 
 
 # Checks for typedefs, structures, and compiler characteristics.
- -{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
- -$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
 if test "${ac_cv_type_uid_t+set}" = set; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4684,8 +4559,8 @@
 rm -f conftest*
 
 fi
- -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
- -$as_echo "$ac_cv_type_uid_t" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4699,10 +4574,10 @@
 
 fi
 
- -{ $as_echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
- -$as_echo_n "checking type of array argument to getgroups... " >&6; }
+{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
+echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
 if test "${ac_cv_type_getgroups+set}" = set; then
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_type_getgroups=cross
@@ -4743,32 +4618,29 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$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:$LINENO: \$? = $ac_status" >&5
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
- -  $as_echo "$as_me: program exited with status $ac_status" >&5
- -$as_echo "$as_me: failed program was:" >&5
+  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_type_getgroups=int
 fi
- -rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -4793,8 +4665,8 @@
 
 fi
 fi
- -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
- -$as_echo "$ac_cv_type_getgroups" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
+echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define GETGROUPS_T $ac_cv_type_getgroups
@@ -4806,11 +4678,11 @@
 
 for ac_func in vsnprintf
 do
- -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
- -$as_echo_n "checking for $ac_func... " >&6; }
+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
- -  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4863,41 +4735,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
- -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- -$as_echo "$ac_try_echo") >&5
+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
- -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_exeext && {
- -	 test "$cross_compiling" = yes ||
- -	 $as_test_x conftest$ac_exeext
- -       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
- -  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
- -rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
- -ac_res=`eval 'as_val=${'$as_ac_var'}
- -		 $as_echo "$as_val"'`
- -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- -$as_echo "$ac_res" >&6; }
- -if test `eval 'as_val=${'$as_ac_var'}
- -		 $as_echo "$as_val"'` = yes; then
+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
@@ -4997,12 +4863,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
- -      *_cv_*) { $as_echo "$as_me:$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= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -5035,12 +4900,12 @@
 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:$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:$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
@@ -5057,12 +4922,6 @@
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
- -:mline
- -/\\$/{
- - N
- - s,\\\n,,
- - b mline
- -}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -5092,7 +4951,7 @@
 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.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -5105,12 +4964,11 @@
 
 
 : ${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:$LINENO: creating $CONFIG_STATUS" >&5
- -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
- -cat >$CONFIG_STATUS <<_ACEOF || ac_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.
@@ -5123,7 +4981,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
- -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -5133,7 +4991,7 @@
 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
@@ -5155,45 +5013,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
- -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
- -if (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
- -
 # 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.
@@ -5209,6 +5039,8 @@
 # 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.
@@ -5231,7 +5063,7 @@
   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
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -5244,10 +5076,17 @@
 PS4='+ '
 
 # NLS nuisances.
- -LC_ALL=C
- -export LC_ALL
- -LANGUAGE=C
- -export LANGUAGE
+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
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -5269,7 +5108,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- -$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -5320,7 +5159,7 @@
       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
+    { 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
@@ -5348,6 +5187,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -5360,22 +5200,19 @@
   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
@@ -5400,10 +5237,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
- -	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
- -	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -5426,7 +5263,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
- -generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5439,14 +5276,14 @@
 
 _ACEOF
 
- -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_commands="$ac_config_commands"
 
 _ACEOF
 
- -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -5459,7 +5296,7 @@
   -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
+		   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -5470,24 +5307,24 @@
 Report bugs to <email address hidden>."
 
 _ACEOF
- -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
- -configured by $0, generated by GNU Autoconf 2.62,
- -  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
- -Copyright (C) 2008 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
@@ -5509,24 +5346,21 @@
   -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 ;;
+    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"` ;;
- -    esac
- -    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --he | --h |  --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_echo "$as_me: error: unrecognized option: $1
+  -*) { echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -5545,32 +5379,30 @@
 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
@@ -5605,8 +5437,8 @@
     "$SCRIPTS") CONFIG_FILES="$CONFIG_FILES $SCRIPTS" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
- -  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { 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
@@ -5646,142 +5478,131 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
- -   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   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=''
- -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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- -   { (exit 1); exit 1; }; }
- -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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- -   { (exit 1); exit 1; }; }
+  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
+with_python!$with_python$ac_delim
+PYTHON!$PYTHON$ac_delim
+EMAILPKG!$EMAILPKG$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+TRUE!$TRUE$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
+OPT!$OPT$ac_delim
+VAR_PREFIX!$VAR_PREFIX$ac_delim
+MAILMAN_USER!$MAILMAN_USER$ac_delim
+MAILMAN_GROUP!$MAILMAN_GROUP$ac_delim
+MAIL_GROUP!$MAIL_GROUP$ac_delim
+CGI_GROUP!$CGI_GROUP$ac_delim
+CGIEXT!$CGIEXT$ac_delim
+MAILHOST!$MAILHOST$ac_delim
+URLHOST!$URLHOST$ac_delim
+CPP!$CPP$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+SCRIPTS!$SCRIPTS$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
 
- -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
     break
   elif $ac_last_try; then
- -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { 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 &&
- -_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_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
- -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- -   { (exit 1); exit 1; }; }
- -_ACEOF
+
+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 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
@@ -5798,21 +5619,19 @@
 }'
 fi
 
- -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
 
- -eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
- -shift
- -for ac_tag
+for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
- -  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
- -$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :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;;
@@ -5841,38 +5660,26 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
- -	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
- -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { 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
- -      ac_file_inputs="$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:$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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
- -$as_echo "$as_me: error: could not create $ac_file" >&2;}
- -   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$tmp/stdin";;
     esac
     ;;
   esac
@@ -5882,7 +5689,7 @@
 	 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
@@ -5908,7 +5715,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
- -      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -5917,7 +5724,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- -$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5938,17 +5745,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
- -  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || 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/ ;;
@@ -5988,13 +5795,12 @@
   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
 }
@@ -6003,14 +5809,13 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
- -'
- -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- -  { $as_echo "$as_me:$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
@@ -6024,16 +5829,15 @@
 # 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
@@ -6043,33 +5847,26 @@
 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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
- -$as_echo "$as_me: error: could not create $ac_file" >&2;}
- -   { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.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:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { 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
- -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
- -$as_echo "$as_me: error: could not create $ac_file" >&2;}
- -   { (exit 1); exit 1; }; }
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
  ;;
 
 
- -  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
- -$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -6086,11 +5883,6 @@
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
- -test $ac_write_fail = 0 ||
- -  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
- -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- -   { (exit 1); exit 1; }; }
- -
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -6112,10 +5904,6 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
- -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- -  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
- -$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
- -fi
 
 
 # Make sure all the build scripts are executable.

=== modified file 'configure.in'
- --- configure.in	2008-11-04 02:25:20 +0000
+++ configure.in	2008-11-30 17:07:05 +0000
@@ -1,4 +1,4 @@
- -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -61,7 +61,7 @@
     v = sys.hexversion
 except AttributeError:
     v = 0
- -if v >= 0x2030000:
+if v >= 0x2040000:
     s = sys.version.split()[0]
 else:
     s = ""
@@ -78,7 +78,7 @@
     AC_MSG_ERROR([
 
 ***** $PYTHON is too old (or broken)
- -***** Python 2.3 or newer is required])
+***** Python 2.4 or newer is required])
 fi
 AC_MSG_RESULT($version)
 
@@ -93,7 +93,7 @@
     res = "not ok"
 else:
     provided = (2, 5, 8)
- -    version = tuple([int(v) for v in email.__version__.split('.')])
+    version = tuple(int(v) for v in email.__version__.split('.'))
     if provided > version:
         res = "not ok"
     else:
@@ -249,7 +249,7 @@
 fi
 
 # new macro for finding group names
- -AC_DEFUN(MM_FIND_GROUP_NAME, [
+AC_DEFUN([MM_FIND_GROUP_NAME], [
 # $1 == variable name
 # $2 == user id to check for
 AC_SUBST($1)
@@ -281,7 +281,7 @@
 
 
 # new macro for finding UIDs
- -AC_DEFUN(MM_FIND_USER_NAME, [
+AC_DEFUN([MM_FIND_USER_NAME], [
 # $1 == variable name
 # $2 == user id to check for
 AC_SUBST($1)
@@ -583,7 +583,7 @@
 
 dnl Expand PYTHON path in the scripts, output into build/scriptname
 
- -AC_DEFUN(MM_SCRIPTS, [dnl
+AC_DEFUN([MM_SCRIPTS], [dnl
 bin/add_members \
 bin/arch \
 bin/change_pw \

=== removed file 'messages/docstring.files'
- --- messages/docstring.files	2008-06-06 18:38:58 +0000
+++ messages/docstring.files	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
- -bin/add_members
- -bin/arch
- -bin/b4b5-archfix
- -bin/change_pw
- -bin/check_db
- -bin/check_perms
- -bin/cleanarch
- -bin/clone_member
- -bin/config_list
- -bin/convert.py
- -bin/discard
- -bin/dumpdb
- -bin/export.py
- -bin/find_member
- -bin/fix_url.py
- -bin/genaliases
- -bin/inject
- -bin/list_admins
- -bin/list_lists
- -bin/list_members
- -bin/list_owners
- -bin/mailmanctl
- -bin/mmsitepass
- -bin/msgfmt.py
- -bin/newlist
- -bin/qrunner
- -bin/rb-archfix
- -bin/remove_members
- -bin/reset_pw.py
- -bin/rmlist
- -bin/show_qfiles
- -bin/sync_members
- -bin/transcheck
- -bin/unshunt
- -bin/update
- -bin/version
- -bin/withlist
- -cron/bumpdigests
- -cron/checkdbs
- -cron/cull_bad_shunt
- -cron/disabled
- -cron/gate_news
- -cron/mailpasswds
- -cron/nightly_gzip
- -cron/senddigests
- -Mailman/Commands/cmd_confirm.py
- -Mailman/Commands/cmd_echo.py
- -Mailman/Commands/cmd_end.py
- -Mailman/Commands/cmd_help.py
- -Mailman/Commands/cmd_info.py
- -Mailman/Commands/cmd_join.py
- -Mailman/Commands/cmd_leave.py
- -Mailman/Commands/cmd_lists.py
- -Mailman/Commands/cmd_password.py
- -Mailman/Commands/cmd_remove.py
- -Mailman/Commands/cmd_set.py
- -Mailman/Commands/cmd_stop.py
- -Mailman/Commands/cmd_subscribe.py
- -Mailman/Commands/cmd_unsubscribe.py
- -Mailman/Commands/cmd_who.py

=== removed file 'messages/marked.files'
- --- messages/marked.files	2007-11-18 21:27:53 +0000
+++ messages/marked.files	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
- -Mailman/Archiver/Archiver.py
- -Mailman/Archiver/HyperArch.py
- -Mailman/Archiver/HyperDatabase.py
- -Mailman/Archiver/pipermail.py
- -Mailman/Archiver/__init__.py
- -Mailman/Autoresponder.py
- -Mailman/Bouncer.py
- -Mailman/Bouncers/BouncerAPI.py
- -Mailman/Bouncers/Caiwireless.py
- -Mailman/Bouncers/Compuserve.py
- -Mailman/Bouncers/DSN.py
- -Mailman/Bouncers/Exchange.py
- -Mailman/Bouncers/Exim.py
- -Mailman/Bouncers/GroupWise.py
- -Mailman/Bouncers/LLNL.py
- -Mailman/Bouncers/Microsoft.py
- -Mailman/Bouncers/Netscape.py
- -Mailman/Bouncers/Postfix.py
- -Mailman/Bouncers/Qmail.py
- -Mailman/Bouncers/SimpleMatch.py
- -Mailman/Bouncers/SimpleWarning.py
- -Mailman/Bouncers/Sina.py
- -Mailman/Bouncers/SMTP32.py
- -Mailman/Bouncers/Yahoo.py
- -Mailman/Bouncers/Yale.py
- -Mailman/Bouncers/__init__.py
- -Mailman/Cgi/admin.py
- -Mailman/Cgi/admindb.py
- -Mailman/Cgi/Auth.py
- -Mailman/Cgi/confirm.py
- -Mailman/Cgi/create.py
- -Mailman/Cgi/edithtml.py
- -Mailman/Cgi/listinfo.py
- -Mailman/Cgi/options.py
- -Mailman/Cgi/private.py
- -Mailman/Cgi/rmlist.py
- -Mailman/Cgi/roster.py
- -Mailman/Cgi/subscribe.py
- -Mailman/Cgi/__init__.py
- -Mailman/Commands/__init__.py
- -Mailman/Defaults.py
- -Mailman/Deliverer.py
- -Mailman/Digester.py
- -Mailman/Errors.py
- -Mailman/GatewayManager.py
- -Mailman/Gui/Archive.py
- -Mailman/Gui/Autoresponse.py
- -Mailman/Gui/Bounce.py
- -Mailman/Gui/ContentFilter.py
- -Mailman/Gui/Digest.py
- -Mailman/Gui/General.py
- -Mailman/Gui/GUIBase.py
- -Mailman/Gui/Language.py
- -Mailman/Gui/Membership.py
- -Mailman/Gui/NonDigest.py
- -Mailman/Gui/Passwords.py
- -Mailman/Gui/Privacy.py
- -Mailman/Gui/Topics.py
- -Mailman/Gui/Usenet.py
- -Mailman/Gui/__init__.py
- -Mailman/Handlers/Acknowledge.py
- -Mailman/Handlers/AfterDelivery.py
- -Mailman/Handlers/Approve.py
- -Mailman/Handlers/AvoidDuplicates.py
- -Mailman/Handlers/CalcRecips.py
- -Mailman/Handlers/Cleanse.py
- -Mailman/Handlers/CleanseDKIM.py
- -Mailman/Handlers/CookHeaders.py
- -Mailman/Handlers/Decorate.py
- -Mailman/Handlers/Emergency.py
- -Mailman/Handlers/FileRecips.py
- -Mailman/Handlers/Hold.py
- -Mailman/Handlers/MimeDel.py
- -Mailman/Handlers/Moderate.py
- -Mailman/Handlers/OwnerRecips.py
- -Mailman/Handlers/Replybot.py
- -Mailman/Handlers/Scrubber.py
- -Mailman/Handlers/Sendmail.py
- -Mailman/Handlers/SMTPDirect.py
- -Mailman/Handlers/SpamDetect.py
- -Mailman/Handlers/Tagger.py
- -Mailman/Handlers/ToArchive.py
- -Mailman/Handlers/ToDigest.py
- -Mailman/Handlers/ToOutgoing.py
- -Mailman/Handlers/ToUsenet.py
- -Mailman/Handlers/__init__.py
- -Mailman/htmlformat.py
- -Mailman/HTMLFormatter.py
- -Mailman/i18n.py
- -Mailman/ListAdmin.py
- -Mailman/LockFile.py
- -Mailman/Logging/Logger.py
- -Mailman/Logging/MultiLogger.py
- -Mailman/Logging/StampedLogger.py
- -Mailman/Logging/Syslog.py
- -Mailman/Logging/Utils.py
- -Mailman/Logging/__init__.py
- -Mailman/Mailbox.py
- -Mailman/MailList.py
- -Mailman/MemberAdaptor.py
- -Mailman/Message.py
- -Mailman/MTA/Manual.py
- -Mailman/MTA/Postfix.py
- -Mailman/MTA/Utils.py
- -Mailman/MTA/__init__.py
- -Mailman/OldStyleMemberships.py
- -Mailman/Pending.py
- -Mailman/Post.py
- -Mailman/Queue/ArchRunner.py
- -Mailman/Queue/BounceRunner.py
- -Mailman/Queue/CommandRunner.py
- -Mailman/Queue/IncomingRunner.py
- -Mailman/Queue/MaildirRunner.py
- -Mailman/Queue/NewsRunner.py
- -Mailman/Queue/OutgoingRunner.py
- -Mailman/Queue/RetryRunner.py
- -Mailman/Queue/Runner.py
- -Mailman/Queue/sbcache.py
- -Mailman/Queue/Switchboard.py
- -Mailman/Queue/VirginRunner.py
- -Mailman/Queue/__init__.py
- -Mailman/SafeDict.py
- -Mailman/SecurityManager.py
- -Mailman/Site.py
- -Mailman/TopicMgr.py
- -Mailman/UserDesc.py
- -Mailman/Utils.py
- -Mailman/Version.py
- -Mailman/versions.py
- -Mailman/__init__.py

=== modified file 'misc/paths.py.in'
- --- misc/paths.py.in	2007-10-18 20:29:49 +0000
+++ misc/paths.py.in	2008-11-30 17:00:38 +0000
@@ -1,6 +1,6 @@
 # -*- python -*-
 
- -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -36,9 +36,6 @@
 if exec_prefix == '${prefix}':
     exec_prefix = prefix
 
- -# Supress Python 2.5 warning about string exceptions.
- -filterwarnings('ignore', '.* string exception', DeprecationWarning)
- -
 # Check if ja/ko codecs are available before changing path.
 try:
     s = unicode('OK', 'iso-2022-jp')

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkkyyXcACgkQ2YZpQepbvXGPpgCgiEAGe4eGS2t75Bjd3iumb54M
WQEAoKuYnilvZyjlWpUPd9BPCHf8wqyf
=s5qn
-----END PGP SIGNATURE-----