merge with m50

132 files changed, 13705 insertions, 23759 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 2a954fbba32e..680f52ac3929 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -118,7 +118,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
   dnl in 1.5.
   m4_define([_AM_PYTHON_INTERPRETER_LIST],
-            [python python2 python2.4 python2.3 python2.2 dnl
+            [python python2 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
 python2.1 python2.0 python1.6 python1.5])
 
   m4_if([$1],[],[
diff --git a/configure b/configure
index fe88d7f8b789..892eeb138bb4 100755
--- a/configure
+++ b/configure
@@ -1,146 +1,62 @@
 #! /bin/sh
 # From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
+# Generated by GNU Autoconf 2.57.
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-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=';'
-  }
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
 fi
 
 # Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# 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.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
 # Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 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 -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -148,450 +64,206 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
 
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
 
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
 	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org 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.
-}
-
-
-
+	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
     sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
       N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
       t loop
-      s/-\n.*//
+      s,-$,,
+      s,^['$as_cr_digits']*\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
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
   # Exit status is that of the last command.
   exit
 }
 
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-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
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
     as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
   fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
 
-exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
+exec 6>&1
+
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
-ac_clean_files=
 ac_config_libobj_dir=.
-LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
 # Identity of this package.
 PACKAGE_NAME=
 PACKAGE_TARNAME=
@@ -602,598 +274,46 @@ PACKAGE_BUGREPORT=
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-BUILD_TYPE
-LOCAL_SOLVER
-VERBOSE
-ENABLE_LAYOUT
-ENABLE_STATIC_GTK
-UNIXWRAPPERNAME
-OOO_VENDOR
-ABOUT_BITMAPS
-INTRO_BITMAPS
-WITH_DICT
-WITH_POOR_HELP_LOCALIZATIONS
-WITH_LANG
-ANT_LIB
-ANT_HOME
-ANT
-XINERAMA_LINK
-USE_XINERAMA
-SCPDEFS
-WITH_WRITER2LATEX
-WITHOUT_AFMS
-WITHOUT_PPDS
-WITH_FONTS
-SYSTEM_MSPACK
-WITH_FONTOOO
-ENABLE_KAB
-ENABLE_EVOAB2
-GOBJECT_LIBS
-GOBJECT_CFLAGS
-ENABLE_LOCKDOWN
-KDE_LIBS
-KDE_CFLAGS
-MOC
-COMMONS_LOGGING_JAR
-COMMONS_HTTPCLIENT_JAR
-COMMONS_LANG_JAR
-COMMONS_CODEC_JAR
-SYSTEM_APACHE_COMMONS
-LIBSERIALIZER_JAR
-LIBFONTS_JAR
-LIBREPOSITORY_JAR
-LIBFORMULA_JAR
-LIBLOADER_JAR
-LIBLAYOUT_JAR
-LIBBASE_JAR
-JFREEREPORT_JAR
-FLUTE_JAR
-LIBXML_JAR
-SAC_JAR
-SYSTEM_JFREEREPORT
-ENABLE_REPORTBUILDER
-SERVLETAPI_JAR
-SYSTEM_SERVLETAPI
-ENABLE_MEDIAWIKI
-SYSTEM_POPPLER
-ENABLE_PDFIMPORT
-POPPLER_LIBS
-POPPLER_CFLAGS
-ENABLE_PRESENTER_SCREEN
-ENABLE_MINIMIZER
-ENABLE_OPENGL
-SYSTEM_CAIRO
-BUILD_PIXMAN
-ENABLE_CAIRO
-CAIRO_LIBS
-CAIRO_CFLAGS
-ENABLE_SYSTRAY_GTK
-ENABLE_DBUS
-ENABLE_GIO
-GIO_LIBS
-GIO_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-ENABLE_GNOMEVFS
-GNOMEVFS_LIBS
-GNOMEVFS_CFLAGS
-ENABLE_GCONF
-GCONF_LIBS
-GCONF_CFLAGS
-ENABLE_KDE
-ENABLE_GTK
-WITH_GPC
-ZIP_HOME
-UNZIP
-ZIP
-ASM_HOME
-ML_EXE
-CYGWIN_PATH
-GNUPATCH
-GNUCP
-PATCH
-FLEX
-BISON
-NSIS_PATH
-DIRECTXSDK_LIB
-DIRECTXSDK_HOME
-WINDOWS_VISTA_PSDK
-PSDK_HOME
-SYSTEM_LPSOLVE
-SYSTEM_MYTHES
-HYPHEN_LIB
-SYSTEM_HYPH
-SYSTEM_HUNSPELL
-HUNSPELL_LIBS
-HUNSPELL_CFLAGS
-SYSTEM_REDLAND
-REDLAND_LIBS
-REDLAND_CFLAGS
-AGG_VERSION
-SYSTEM_AGG
-AGG_LIBS
-AGG_CFLAGS
-ENABLE_AGG
-NEON_VERSION
-SYSTEM_NEON
-SYSTEM_OPENSSL
-OPENSSL_LIBS
-OPENSSL_CFLAGS
-NEON_LIBS
-NEON_CFLAGS
-DISABLE_NEON
-ENABLE_RANDR
-XRANDR_DLOPEN
-XRANDR_LIBS
-XRANDR_CFLAGS
-XRENDER_LINK
-SYSTEM_XRENDER_HEADERS
-DISABLE_XAW
-XAU_LIBS
-XLIB
-XINC
-X_EXTRA_LIBS
-X_LIBS
-X_PRE_LIBS
-X_CFLAGS
-XMKMF
-SYSTEM_ICU
-SYSTEM_GENCMN
-SYSTEM_GENCCODE
-SYSTEM_GENBRK
-SYSTEM_SANE_HEADER
-MOZ_LDAP_CFLAGS
-MOZ_LIB_XPCOM
-MOZ_LIB
-MOZ_INC
-MOZ_FLAVOUR
-SYSTEM_MOZILLA
-BUILD_MOZAB
-MOZLIBREQ_LIBS
-MOZLIBREQ_CFLAGS
-MOZGTK2_LIBS
-MOZGTK2_CFLAGS
-MOZILLA_TOOLKIT
-MOZILLA_VERSION
-MOZILLAXPCOM_LIBS
-MOZILLAXPCOM_CFLAGS
-NSPR_LIB
-MOZ_NSPR_LIBS
-MOZ_NSPR_CFLAGS
-NSS_LIB
-MOZ_NSS_LIBS
-MOZ_NSS_CFLAGS
-WITH_OPENLDAP
-WITH_LDAP
-WITH_MOZILLA
-SYSTEM_ODBC_HEADERS
-SYSTEM_VIGRA
-SYSTEM_BOOST
-CURL_LIBS
-CURL_CFLAGS
-SYSTEM_CURL
-CURLCONFIG
-SAXON_JAR
-SYSTEM_SAXON
-SERIALIZER_JAR
-BSH_JAR
-SYSTEM_BSH
-HSQLDB_JAR
-SYSTEM_HSQLDB
-LUCENE_ANALYZERS_JAR
-LUCENE_CORE_JAR
-SYSTEM_LUCENE
-DB_JAR
-DB_INCLUDES
-DB_VERSION
-SYSTEM_DB
-HOME
-PYTHON_LIBS
-PYTHON_CFLAGS
-SYSTEM_PYTHON
-BZIP2
-pkgpyexecdir
-pyexecdir
-pkgpythondir
-pythondir
-PYTHON_PLATFORM
-PYTHON_EXEC_PREFIX
-PYTHON_PREFIX
-PYTHON_VERSION
-PYTHON
-SYSTEM_LIBXML
-LIBXML_LIBS
-LIBXML_CFLAGS
-SYSTEM_LIBXSLT
-XSLTPROC
-LIBXSLT_LIBS
-LIBXSLT_CFLAGS
-USE_FT_EMBOLDEN
-FREETYPE_LIBS
-FREETYPE_CFLAGS
-SYSTEM_LIBWPD
-LIBWPD_LIBS
-LIBWPD_CFLAGS
-PKG_CONFIG
-SYSTEM_EXPAT
-SYSTEM_JPEG
-SYSTEM_ZLIB
-SYSTEM_STDLIBS
-BUILD_QADEVOOO
-BUILD_UNOWINREG
-MINGWSTRIP
-MINGWCXX
-GPERF
-RPM
-PKGFORMAT
-BUILD_EPM
-PKGMK
-DPKG
-EPM
-BUILD_DMAKE
-DMAKE
-JAVAFLAGS
-JDK
-JAVA_HOME
-JAVAAOTCOMPILER
-AWTLIB
-JAVADOC
-JAVACISGCJ
-JAVACOMPILER
-JAVAINTERPRETER
-SOLAR_JAVA
-BUILD_VER_STRING
-ALLOC
-HAVE_GCC_VISIBILITY_FEATURE
-USE_SYSTEM_STL
-STLPORT_VER
-STLPORT4
-MINGW_LIB_INCLUDE_PATH
-GXX_INCLUDE_PATH
-CRYPT_LINK
-PAM_LINK
-NEW_SHADOW_API
-PAM
-VBA_EXTENSION
-ENABLE_VBA
-LFS_CFLAGS
-WORDS_BIGENDIAN
-SIZEOF_LONG
-CXXCPP
-ac_ct_CXX
-CXXFLAGS
-CXX
-CPP
-FRAME_HOME
-CSC_PATH
-MIDL_PATH
-USE_MINGW
-COMEX
-MSPDB_PATH
-PERL
-HAVE_LD_HASH_STYLE
-_cc
-GNUMAKE
-ENABLE_PCH
-GCCVER
-COMPATH
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-GCC_HOME
-SHELLPATH
-WITH_MINGWIN
-USE_SHELL
-THES_SYSTEM_DIR
-HYPH_SYSTEM_DIR
-DICT_SYSTEM_DIR
-SYSTEM_DICTS
-WITH_MYSPELL_DICTS
-ENABLE_RPATH
-DISABLE_ATL
-DISABLE_ACTIVEX
-ENABLE_DIRECTX
-WITH_BINFILTER
-ENABLE_FONTCONFIG
-ENABLE_CUPS
-DISABLE_STRIP
-ENABLE_SYMBOLS
-PROEXT
-PROFULLSWITCH
-PRODUCT
-ENABLE_DEBUG
-ENABLE_WERROR
-VC_STANDARD
-ENABLE_CRASHDUMP
-PTHREAD_LIBS
-PTHREAD_CFLAGS
-OSVERSION
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-SOURCEVERSION
-UPD
-_solenv
-LOCAL_SOLENV
-SED
-AWK
-EGREP
-GREP
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH STLPORT4 STLPORT_VER USE_SYSTEM_STL HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_KDE GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_gnu_patch
-with_agg
-with_gnu_cp
-with_gpc
-enable_ldap
-with_openldap
-enable_lockdown
-enable_vba
-with_vba_package_format
-enable_pch
-enable_mozilla
-with_fonts
-with_ppds
-with_afms
-enable_epm
-with_epm
-with_package_format
-enable_odk
-enable_qadevooo
-enable_fontooo
-enable_mathmldtd
-enable_evolution2
-with_system_stdlibs
-with_system_mspack
-enable_cups
-enable_fontconfig
-enable_directx
-enable_activex
-enable_atl
-enable_symbols
-enable_strip_solver
-enable_werror
-enable_debug
-enable_dbgutil
-enable_crashdump
-enable_cl_standard
-enable_gtk
-enable_systray
-enable_cairo
-with_system_cairo
-enable_opengl
-enable_dbus
-enable_gconf
-enable_gnome_vfs
-enable_gio
-enable_static_gtk
-enable_layout
-enable_build_mozilla
-with_mozilla_version
-with_mozilla_toolkit
-enable_kde
-enable_kdeab
-enable_binfilter
-enable_rpath
-enable_pam
-enable_pam_link
-enable_crypt_link
-enable_xrender_link
-enable_randr
-enable_randr_link
-with_myspell_dicts
-with_system_dicts
-with_external_dict_dir
-with_external_hyph_dir
-with_external_thes_dir
-with_writer2latex
-with_system_libs
-with_system_headers
-with_system_jars
-with_system_zlib
-with_system_openssl
-with_system_jpeg
-with_system_expat
-with_system_libwpd
-with_system_libxml
-with_system_python
-with_system_icu
-with_system_poppler
-with_system_db
-with_system_lucene
-with_lucene_core_jar
-with_lucene_analyzers_jar
-with_system_hsqldb
-with_hsqldb_jar
-with_system_beanshell
-with_beanshell_jar
-enable_minimizer
-enable_presenter_console
-enable_pdfimport
-enable_wiki_publisher
-with_commons_codec_jar
-with_commons_lang_jar
-with_commons_httpclient_jar
-with_commons_logging_jar
-with_servlet_api_jar
-enable_report_builder
-with_system_jfreereport
-with_sac_jar
-with_libxml_jar
-with_flute_jar
-with_jfreereport_jar
-with_liblayout_jar
-with_libloader_jar
-with_libformula_jar
-with_librepository_jar
-with_libfonts_jar
-with_libserializer_jar
-with_libbase_jar
-with_system_saxon
-with_saxon_jar
-with_system_libxslt
-with_system_odbc
-with_system_sane
-with_system_xrender
-with_system_curl
-with_system_boost
-with_system_vigra
-enable_neon
-enable_Xaw
-with_system_neon
-with_system_agg
-with_system_hunspell
-with_system_mythes
-with_system_altlinuxhyph
-with_system_lpsolve
-with_system_mozilla
-with_stlport
-with_jdk_home
-with_gxx_include_path
-with_java
-enable_gcjaot
-with_ant_home
-with_perl_home
-with_cl_home
-with_mspdb_path
-with_midl_path
-with_csc_path
-with_nsis_path
-with_frame_home
-with_psdk_home
-with_directx_home
-with_local_solenv
-with_local_solver
-enable_check_only
-with_lang
-with_poor_help_localizations
-with_dict
-with_intro_bitmaps
-with_about_bitmaps
-with_vendor
-with_unix_wrapper
-with_asm_home
-with_os_version
-with_unzip_home
-with_zip_home
-with_mingwin
-with_use_shell
-with_build_version
-enable_sgistl
-with_alloc
-enable_verbose
-enable_largefile
-with_x
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-XMKMF'
-
 
 # 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
@@ -1216,48 +336,34 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
 
 ac_prev=
-ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
+    eval "$ac_prev=\$ac_option"
     ac_prev=
     continue
   fi
 
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -1279,61 +385,33 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad)
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
     datadir=$ac_optarg ;;
 
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    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
-   { (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 ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
 
   -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
-   { (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=', ';;
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
     esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1360,12 +438,6 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -1390,16 +462,13 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -1464,16 +533,6 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -1524,38 +583,26 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&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=', ';;
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
     esac
-    eval with_$ac_useropt=\$ac_optarg ;;
+    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
-   { (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 ;;
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1575,7 +622,7 @@ do
   | --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; }; }
     ;;
@@ -1584,16 +631,17 @@ Try \`$0 --help' for more information." >&2
     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
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    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}
     ;;
 
@@ -1602,39 +650,31 @@ done
 
 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.
-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
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
 do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
+  eval ac_val=$`echo $ac_var`
   case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
-  # Be sure to have absolute directory names.
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
   case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1648,7 +688,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    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
@@ -1661,76 +701,86 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 
 
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_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
-   { (exit 1); exit 1; }; }
-
-
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$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; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 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
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&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
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
+  fi
 fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
 
 #
 # Report the --help message.
@@ -1759,6 +809,9 @@ Configuration:
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
+_ACEOF
+
+  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
@@ -1773,25 +826,18 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --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]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1812,7 +858,6 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
@@ -2075,10 +1120,6 @@ Optional Packages:
 
   --with-external-thes-dir Specify external thesaurus dir
 
-  --without-writer2latex Removes writer2latex from openoffice.org installation
-                          set, for people building for specific distributions
-                          where writer2latex is known to be already available
-
   --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla and
                           odbc/sane/xrender-header(s)
@@ -2377,101 +1418,97 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
-  XMKMF       Path to xmkmf, Makefile generator for X Window System
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 _ACEOF
-ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
   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|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_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/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
 case $srcdir in
-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.
     ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+           test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
   done
 fi
 
-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.63
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit
+  exit 0
 fi
-cat >config.log <<_ACEOF
+exec 5>config.log
+cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
-exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -2490,7 +1527,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -2502,9 +1539,8 @@ for as_dir in $PATH
 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
 
 } >&5
 
@@ -2526,6 +1562,7 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
+ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -2536,29 +1573,31 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -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'" ;;
     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
+        ac_must_keep_next=false # Got value, back to normal.
       else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
       ;;
     esac
   done
@@ -2569,8 +1608,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -2583,35 +1622,20 @@ trap 'exit_status=$?
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    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;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
+{
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
     *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
-    esac |
-    sort
-)
+    esac;
+}
     echo
 
     cat <<\_ASBOX
@@ -2622,28 +1646,22 @@ _ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
+## ------------- ##
+## Output files. ##
+## ------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	eval ac_val=$`echo $ac_var`
+        echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -2655,24 +1673,26 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
-      cat confdefs.h
+      sed "/^$/d" confdefs.h | sort
       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 &&
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+     ' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -2702,24 +1722,18 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
   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
@@ -2729,61 +1743,54 @@ if test -r "$cache_file"; then
   # 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";;
+      [\\/]* | ?:[\\/]* ) . $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
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
+for ac_var in `(set) 2>&1 |
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  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
@@ -2793,15 +1800,19 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $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
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 
 
@@ -2818,1017 +1829,1006 @@ fi
 
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 echo "$@" >config.parms
 
-# Check whether --with-gnu-patch was given.
+# Check whether --with-gnu-patch or --without-gnu-patch was given.
 if test "${with_gnu_patch+set}" = set; then
-  withval=$with_gnu_patch;
-fi
+  withval="$with_gnu_patch"
 
+fi;
 
-# Check whether --with-agg was given.
+# Check whether --with-agg or --without-agg was given.
 if test "${with_agg+set}" = set; then
-  withval=$with_agg;
+  withval="$with_agg"
+
 else
   with_agg=yes
-fi
-
+fi;
 
-# Check whether --with-gnu-cp was given.
+# Check whether --with-gnu-cp or --without-gnu-cp was given.
 if test "${with_gnu_cp+set}" = set; then
-  withval=$with_gnu_cp;
-fi
+  withval="$with_gnu_cp"
 
+fi;
 
-# Check whether --with-gpc was given.
+# Check whether --with-gpc or --without-gpc was given.
 if test "${with_gpc+set}" = set; then
-  withval=$with_gpc;
+  withval="$with_gpc"
+
 else
   if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi
-fi
-
-# Check whether --enable-ldap was given.
+fi;
+# Check whether --enable-ldap or --disable-ldap was given.
 if test "${enable_ldap+set}" = set; then
-  enableval=$enable_ldap;
-fi
+  enableval="$enable_ldap"
 
+fi;
 
-# Check whether --with-openldap was given.
+# Check whether --with-openldap or --without-openldap was given.
 if test "${with_openldap+set}" = set; then
-  withval=$with_openldap;
-fi
+  withval="$with_openldap"
 
-# Check whether --enable-lockdown was given.
+fi;
+# Check whether --enable-lockdown or --disable-lockdown was given.
 if test "${enable_lockdown+set}" = set; then
-  enableval=$enable_lockdown;
-fi
+  enableval="$enable_lockdown"
 
-# Check whether --enable-vba was given.
+fi;
+# Check whether --enable-vba or --disable-vba was given.
 if test "${enable_vba+set}" = set; then
-  enableval=$enable_vba;
-fi
+  enableval="$enable_vba"
 
+fi;
 
-# Check whether --with-vba-package-format was given.
+# Check whether --with-vba-package-format or --without-vba-package-format was given.
 if test "${with_vba_package_format+set}" = set; then
-  withval=$with_vba_package_format;
-fi
+  withval="$with_vba_package_format"
 
-# Check whether --enable-pch was given.
+fi;
+# Check whether --enable-pch or --disable-pch was given.
 if test "${enable_pch+set}" = set; then
-  enableval=$enable_pch;
-fi
+  enableval="$enable_pch"
 
-# Check whether --enable-mozilla was given.
+fi;
+# Check whether --enable-mozilla or --disable-mozilla was given.
 if test "${enable_mozilla+set}" = set; then
-  enableval=$enable_mozilla;
+  enableval="$enable_mozilla"
+
 else
   enable_mozilla="yes"
-fi
+fi;
 
-
-# Check whether --with-fonts was given.
+# Check whether --with-fonts or --without-fonts was given.
 if test "${with_fonts+set}" = set; then
-  withval=$with_fonts;
-fi
+  withval="$with_fonts"
 
+fi;
 
-# Check whether --with-ppds was given.
+# Check whether --with-ppds or --without-ppds was given.
 if test "${with_ppds+set}" = set; then
-  withval=$with_ppds;
-fi
+  withval="$with_ppds"
 
+fi;
 
-# Check whether --with-afms was given.
+# Check whether --with-afms or --without-afms was given.
 if test "${with_afms+set}" = set; then
-  withval=$with_afms;
-fi
+  withval="$with_afms"
 
-# Check whether --enable-epm was given.
+fi;
+# Check whether --enable-epm or --disable-epm was given.
 if test "${enable_epm+set}" = set; then
-  enableval=$enable_epm;
+  enableval="$enable_epm"
+
 else
   enable_epm="yes"
-fi
+fi;
 
-
-# Check whether --with-epm was given.
+# Check whether --with-epm or --without-epm was given.
 if test "${with_epm+set}" = set; then
-  withval=$with_epm;
-fi
+  withval="$with_epm"
 
+fi;
 
-# Check whether --with-package-format was given.
+# Check whether --with-package-format or --without-package-format was given.
 if test "${with_package_format+set}" = set; then
-  withval=$with_package_format;
-fi
+  withval="$with_package_format"
 
-# Check whether --enable-odk was given.
+fi;
+# Check whether --enable-odk or --disable-odk was given.
 if test "${enable_odk+set}" = set; then
-  enableval=$enable_odk;
+  enableval="$enable_odk"
+
 else
   enable_odk="yes"
-fi
-
-# Check whether --enable-qadevooo was given.
+fi;
+# Check whether --enable-qadevooo or --disable-qadevooo was given.
 if test "${enable_qadevooo+set}" = set; then
-  enableval=$enable_qadevooo;
+  enableval="$enable_qadevooo"
+
 else
   enable_qadevooo="yes"
-fi
-
-# Check whether --enable-fontooo was given.
+fi;
+# Check whether --enable-fontooo or --disable-fontooo was given.
 if test "${enable_fontooo+set}" = set; then
-  enableval=$enable_fontooo;
+  enableval="$enable_fontooo"
+
 else
   enable_fontooo="yes"
-fi
-
-# Check whether --enable-mathmldtd was given.
+fi;
+# Check whether --enable-mathmldtd or --disable-mathmldtd was given.
 if test "${enable_mathmldtd+set}" = set; then
-  enableval=$enable_mathmldtd;
+  enableval="$enable_mathmldtd"
+
 else
   enable_mathmldtd="yes"
-fi
-
-# Check whether --enable-evolution2 was given.
+fi;
+# Check whether --enable-evolution2 or --disable-evolution2 was given.
 if test "${enable_evolution2+set}" = set; then
-  enableval=$enable_evolution2;
-fi
+  enableval="$enable_evolution2"
 
+fi;
 
-# Check whether --with-system-stdlibs was given.
+# Check whether --with-system-stdlibs or --without-system-stdlibs was given.
 if test "${with_system_stdlibs+set}" = set; then
-  withval=$with_system_stdlibs;
+  withval="$with_system_stdlibs"
+
 else
   checkforprelink=yes
-fi
-
+fi;
 
-# Check whether --with-system-mspack was given.
+# Check whether --with-system-mspack or --without-system-mspack was given.
 if test "${with_system_mspack+set}" = set; then
-  withval=$with_system_mspack;
-fi
+  withval="$with_system_mspack"
 
-# Check whether --enable-cups was given.
+fi;
+# Check whether --enable-cups or --disable-cups was given.
 if test "${enable_cups+set}" = set; then
-  enableval=$enable_cups;
+  enableval="$enable_cups"
+
 else
   enable_cups=yes
-fi
-
-# Check whether --enable-fontconfig was given.
+fi;
+# Check whether --enable-fontconfig or --disable-fontconfig was given.
 if test "${enable_fontconfig+set}" = set; then
-  enableval=$enable_fontconfig;
+  enableval="$enable_fontconfig"
+
 else
   enable_fontconfig=yes
-fi
-
-# Check whether --enable-directx was given.
+fi;
+# Check whether --enable-directx or --disable-directx was given.
 if test "${enable_directx+set}" = set; then
-  enableval=$enable_directx;
+  enableval="$enable_directx"
+
 else
   enable_directx=yes
-fi
-
-# Check whether --enable-activex was given.
+fi;
+# Check whether --enable-activex or --disable-activex was given.
 if test "${enable_activex+set}" = set; then
-  enableval=$enable_activex;
-fi
+  enableval="$enable_activex"
 
+fi;
 
-# Check whether --enable-atl was given.
+# Check whether --enable-atl or --disable-atl was given.
 if test "${enable_atl+set}" = set; then
-  enableval=$enable_atl;
-fi
+  enableval="$enable_atl"
 
+fi;
 
-# Check whether --enable-symbols was given.
+# Check whether --enable-symbols or --disable-symbols was given.
 if test "${enable_symbols+set}" = set; then
-  enableval=$enable_symbols;
-fi
+  enableval="$enable_symbols"
 
-# Check whether --enable-strip-solver was given.
+fi;
+# Check whether --enable-strip-solver or --disable-strip-solver was given.
 if test "${enable_strip_solver+set}" = set; then
-  enableval=$enable_strip_solver;
-fi
+  enableval="$enable_strip_solver"
 
-# Check whether --enable-werror was given.
+fi;
+# Check whether --enable-werror or --disable-werror was given.
 if test "${enable_werror+set}" = set; then
-  enableval=$enable_werror;
-fi
+  enableval="$enable_werror"
 
-# Check whether --enable-debug was given.
+fi;
+# Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
-fi
+  enableval="$enable_debug"
 
-# Check whether --enable-dbgutil was given.
+fi;
+# Check whether --enable-dbgutil or --disable-dbgutil was given.
 if test "${enable_dbgutil+set}" = set; then
-  enableval=$enable_dbgutil;
-fi
+  enableval="$enable_dbgutil"
 
-# Check whether --enable-crashdump was given.
+fi;
+# Check whether --enable-crashdump or --disable-crashdump was given.
 if test "${enable_crashdump+set}" = set; then
-  enableval=$enable_crashdump;
+  enableval="$enable_crashdump"
+
 else
   enable_crashdump=no
-fi
-
-# Check whether --enable-cl-standard was given.
+fi;
+# Check whether --enable-cl-standard or --disable-cl-standard was given.
 if test "${enable_cl_standard+set}" = set; then
-  enableval=$enable_cl_standard;
-fi
+  enableval="$enable_cl_standard"
 
-# Check whether --enable-gtk was given.
+fi;
+# Check whether --enable-gtk or --disable-gtk was given.
 if test "${enable_gtk+set}" = set; then
-  enableval=$enable_gtk;
+  enableval="$enable_gtk"
+
 else
   enable_gtk=yes
-fi
-
-# Check whether --enable-systray was given.
+fi;
+# Check whether --enable-systray or --disable-systray was given.
 if test "${enable_systray+set}" = set; then
-  enableval=$enable_systray;
+  enableval="$enable_systray"
+
 else
   enable_systray=yes
-fi
-
-# Check whether --enable-cairo was given.
+fi;
+# Check whether --enable-cairo or --disable-cairo was given.
 if test "${enable_cairo+set}" = set; then
-  enableval=$enable_cairo;
+  enableval="$enable_cairo"
+
 else
   enable_cairo=no
-fi
-
+fi;
 
-# Check whether --with-system-cairo was given.
+# Check whether --with-system-cairo or --without-system-cairo was given.
 if test "${with_system_cairo+set}" = set; then
-  withval=$with_system_cairo;
-fi
+  withval="$with_system_cairo"
 
-# Check whether --enable-opengl was given.
+fi;
+# Check whether --enable-opengl or --disable-opengl was given.
 if test "${enable_opengl+set}" = set; then
-  enableval=$enable_opengl;
+  enableval="$enable_opengl"
+
 else
   enable_opengl=no
-fi
-
-# Check whether --enable-dbus was given.
+fi;
+# Check whether --enable-dbus or --disable-dbus was given.
 if test "${enable_dbus+set}" = set; then
-  enableval=$enable_dbus;
+  enableval="$enable_dbus"
+
 else
   enable_dbus=no
-fi
-
-# Check whether --enable-gconf was given.
+fi;
+# Check whether --enable-gconf or --disable-gconf was given.
 if test "${enable_gconf+set}" = set; then
-  enableval=$enable_gconf;
+  enableval="$enable_gconf"
+
 else
   enable_gconf=yes
-fi
-
-# Check whether --enable-gnome-vfs was given.
+fi;
+# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given.
 if test "${enable_gnome_vfs+set}" = set; then
-  enableval=$enable_gnome_vfs;
+  enableval="$enable_gnome_vfs"
+
 else
   enable_gnome_vfs=yes
-fi
-
-# Check whether --enable-gio was given.
+fi;
+# Check whether --enable-gio or --disable-gio was given.
 if test "${enable_gio+set}" = set; then
-  enableval=$enable_gio;
+  enableval="$enable_gio"
+
 else
   enable_gio=no
-fi
-
-# Check whether --enable-static-gtk was given.
+fi;
+# Check whether --enable-static-gtk or --disable-static-gtk was given.
 if test "${enable_static_gtk+set}" = set; then
-  enableval=$enable_static_gtk;
-fi
+  enableval="$enable_static_gtk"
 
-# Check whether --enable-layout was given.
+fi;
+# Check whether --enable-layout or --disable-layout was given.
 if test "${enable_layout+set}" = set; then
-  enableval=$enable_layout;
-fi
+  enableval="$enable_layout"
 
-# Check whether --enable-build-mozilla was given.
+fi;
+# Check whether --enable-build-mozilla or --disable-build-mozilla was given.
 if test "${enable_build_mozilla+set}" = set; then
-  enableval=$enable_build_mozilla;
-fi
+  enableval="$enable_build_mozilla"
 
+fi;
 
-# Check whether --with-mozilla-version was given.
+# Check whether --with-mozilla-version or --without-mozilla-version was given.
 if test "${with_mozilla_version+set}" = set; then
-  withval=$with_mozilla_version;
-fi
+  withval="$with_mozilla_version"
 
+fi;
 
-# Check whether --with-mozilla-toolkit was given.
+# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given.
 if test "${with_mozilla_toolkit+set}" = set; then
-  withval=$with_mozilla_toolkit;
-fi
+  withval="$with_mozilla_toolkit"
 
-# Check whether --enable-kde was given.
+fi;
+# Check whether --enable-kde or --disable-kde was given.
 if test "${enable_kde+set}" = set; then
-  enableval=$enable_kde;
-fi
+  enableval="$enable_kde"
 
-# Check whether --enable-kdeab was given.
+fi;
+# Check whether --enable-kdeab or --disable-kdeab was given.
 if test "${enable_kdeab+set}" = set; then
-  enableval=$enable_kdeab;
+  enableval="$enable_kdeab"
+
 else
   if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi
-fi
-
-# Check whether --enable-binfilter was given.
+fi;
+# Check whether --enable-binfilter or --disable-binfilter was given.
 if test "${enable_binfilter+set}" = set; then
-  enableval=$enable_binfilter;
+  enableval="$enable_binfilter"
+
 else
   if ! test -d ./binfilter; then enable_binfilter=no; fi
-fi
-
-# Check whether --enable-rpath was given.
+fi;
+# Check whether --enable-rpath or --disable-rpath was given.
 if test "${enable_rpath+set}" = set; then
-  enableval=$enable_rpath;
-fi
+  enableval="$enable_rpath"
 
-# Check whether --enable-pam was given.
+fi;
+# Check whether --enable-pam or --disable-pam was given.
 if test "${enable_pam+set}" = set; then
-  enableval=$enable_pam;
-fi
+  enableval="$enable_pam"
 
-# Check whether --enable-pam-link was given.
+fi;
+# Check whether --enable-pam-link or --disable-pam-link was given.
 if test "${enable_pam_link+set}" = set; then
-  enableval=$enable_pam_link;
-fi
+  enableval="$enable_pam_link"
 
-# Check whether --enable-crypt-link was given.
+fi;
+# Check whether --enable-crypt-link or --disable-crypt-link was given.
 if test "${enable_crypt_link+set}" = set; then
-  enableval=$enable_crypt_link;
+  enableval="$enable_crypt_link"
+
 else
   enable_crypt_link=yes
-fi
-
-# Check whether --enable-xrender-link was given.
+fi;
+# Check whether --enable-xrender-link or --disable-xrender-link was given.
 if test "${enable_xrender_link+set}" = set; then
-  enableval=$enable_xrender_link;
-fi
+  enableval="$enable_xrender_link"
 
-# Check whether --enable-randr was given.
+fi;
+# Check whether --enable-randr or --disable-randr was given.
 if test "${enable_randr+set}" = set; then
-  enableval=$enable_randr;
+  enableval="$enable_randr"
+
 else
   enable_randr=yes
-fi
-
-# Check whether --enable-randr-link was given.
+fi;
+# Check whether --enable-randr-link or --disable-randr-link was given.
 if test "${enable_randr_link+set}" = set; then
-  enableval=$enable_randr_link;
+  enableval="$enable_randr_link"
+
 else
   enable_randr_link=yes
-fi
-
+fi;
 
-# Check whether --with-myspell-dicts was given.
+# Check whether --with-myspell-dicts or --without-myspell-dicts was given.
 if test "${with_myspell_dicts+set}" = set; then
-  withval=$with_myspell_dicts;
-fi
+  withval="$with_myspell_dicts"
 
+fi;
 
-# Check whether --with-system-dicts was given.
+# Check whether --with-system-dicts or --without-system-dicts was given.
 if test "${with_system_dicts+set}" = set; then
-  withval=$with_system_dicts;
-fi
+  withval="$with_system_dicts"
 
+fi;
 
-# Check whether --with-external-dict-dir was given.
+# Check whether --with-external-dict-dir or --without-external-dict-dir was given.
 if test "${with_external_dict_dir+set}" = set; then
-  withval=$with_external_dict_dir;
-fi
+  withval="$with_external_dict_dir"
 
+fi;
 
-# Check whether --with-external-hyph-dir was given.
+# Check whether --with-external-hyph-dir or --without-external-hyph-dir was given.
 if test "${with_external_hyph_dir+set}" = set; then
-  withval=$with_external_hyph_dir;
-fi
+  withval="$with_external_hyph_dir"
 
+fi;
 
-# Check whether --with-external-thes-dir was given.
+# Check whether --with-external-thes-dir or --without-external-thes-dir was given.
 if test "${with_external_thes_dir+set}" = set; then
-  withval=$with_external_thes_dir;
-fi
-
-
-# Check whether --with-writer2latex was given.
-if test "${with_writer2latex+set}" = set; then
-  withval=$with_writer2latex;
-fi
+  withval="$with_external_thes_dir"
 
+fi;
 
-# Check whether --with-system-libs was given.
+# Check whether --with-system-libs or --without-system-libs was given.
 if test "${with_system_libs+set}" = set; then
-  withval=$with_system_libs;
-fi
+  withval="$with_system_libs"
 
+fi;
 
-# Check whether --with-system-headers was given.
+# Check whether --with-system-headers or --without-system-headers was given.
 if test "${with_system_headers+set}" = set; then
-  withval=$with_system_headers;
-fi
+  withval="$with_system_headers"
 
+fi;
 
-# Check whether --with-system-jars was given.
+# Check whether --with-system-jars or --without-system-jars was given.
 if test "${with_system_jars+set}" = set; then
-  withval=$with_system_jars;
-fi
+  withval="$with_system_jars"
 
+fi;
 
-# Check whether --with-system-zlib was given.
+# Check whether --with-system-zlib or --without-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then
-  withval=$with_system_zlib;
-fi
+  withval="$with_system_zlib"
 
+fi;
 
-# Check whether --with-system-openssl was given.
+# Check whether --with-system-openssl or --without-system-openssl was given.
 if test "${with_system_openssl+set}" = set; then
-  withval=$with_system_openssl;
-fi
+  withval="$with_system_openssl"
 
+fi;
 
-# Check whether --with-system-jpeg was given.
+# Check whether --with-system-jpeg or --without-system-jpeg was given.
 if test "${with_system_jpeg+set}" = set; then
-  withval=$with_system_jpeg;
-fi
+  withval="$with_system_jpeg"
 
+fi;
 
-# Check whether --with-system-expat was given.
+# Check whether --with-system-expat or --without-system-expat was given.
 if test "${with_system_expat+set}" = set; then
-  withval=$with_system_expat;
-fi
+  withval="$with_system_expat"
 
+fi;
 
-# Check whether --with-system-libwpd was given.
+# Check whether --with-system-libwpd or --without-system-libwpd was given.
 if test "${with_system_libwpd+set}" = set; then
-  withval=$with_system_libwpd;
-fi
+  withval="$with_system_libwpd"
 
+fi;
 
-# Check whether --with-system-libxml was given.
+# Check whether --with-system-libxml or --without-system-libxml was given.
 if test "${with_system_libxml+set}" = set; then
-  withval=$with_system_libxml;
-fi
+  withval="$with_system_libxml"
 
+fi;
 
-# Check whether --with-system-python was given.
+# Check whether --with-system-python or --without-system-python was given.
 if test "${with_system_python+set}" = set; then
-  withval=$with_system_python;
-fi
+  withval="$with_system_python"
 
+fi;
 
-# Check whether --with-system-icu was given.
+# Check whether --with-system-icu or --without-system-icu was given.
 if test "${with_system_icu+set}" = set; then
-  withval=$with_system_icu;
-fi
+  withval="$with_system_icu"
 
+fi;
 
-# Check whether --with-system-poppler was given.
+# Check whether --with-system-poppler or --without-system-poppler was given.
 if test "${with_system_poppler+set}" = set; then
-  withval=$with_system_poppler;
-fi
+  withval="$with_system_poppler"
 
+fi;
 
-# Check whether --with-system-db was given.
+# Check whether --with-system-db or --without-system-db was given.
 if test "${with_system_db+set}" = set; then
-  withval=$with_system_db;
-fi
+  withval="$with_system_db"
 
+fi;
 
-# Check whether --with-system-lucene was given.
+# Check whether --with-system-lucene or --without-system-lucene was given.
 if test "${with_system_lucene+set}" = set; then
-  withval=$with_system_lucene;
-fi
+  withval="$with_system_lucene"
 
+fi;
 
-# Check whether --with-lucene-core-jar was given.
+# Check whether --with-lucene-core-jar or --without-lucene-core-jar was given.
 if test "${with_lucene_core_jar+set}" = set; then
-  withval=$with_lucene_core_jar;  LUCENE_CORE_JAR="$withval"
-
-fi
+  withval="$with_lucene_core_jar"
+   LUCENE_CORE_JAR="$withval"
 
+fi;
 
-# Check whether --with-lucene-analyzers-jar was given.
+# Check whether --with-lucene-analyzers-jar or --without-lucene-analyzers-jar was given.
 if test "${with_lucene_analyzers_jar+set}" = set; then
-  withval=$with_lucene_analyzers_jar;  LUCENE_ANALYZERS_JAR="$withval"
-
-fi
+  withval="$with_lucene_analyzers_jar"
+   LUCENE_ANALYZERS_JAR="$withval"
 
+fi;
 
-# Check whether --with-system-hsqldb was given.
+# Check whether --with-system-hsqldb or --without-system-hsqldb was given.
 if test "${with_system_hsqldb+set}" = set; then
-  withval=$with_system_hsqldb;
-fi
+  withval="$with_system_hsqldb"
 
+fi;
 
-# Check whether --with-hsqldb-jar was given.
+# Check whether --with-hsqldb-jar or --without-hsqldb-jar was given.
 if test "${with_hsqldb_jar+set}" = set; then
-  withval=$with_hsqldb_jar;  HSQLDB_JAR="$withval"
-
-fi
+  withval="$with_hsqldb_jar"
+   HSQLDB_JAR="$withval"
 
+fi;
 
-# Check whether --with-system-beanshell was given.
+# Check whether --with-system-beanshell or --without-system-beanshell was given.
 if test "${with_system_beanshell+set}" = set; then
-  withval=$with_system_beanshell;
-fi
+  withval="$with_system_beanshell"
 
+fi;
 
-# Check whether --with-beanshell-jar was given.
+# Check whether --with-beanshell-jar or --without-beanshell-jar was given.
 if test "${with_beanshell_jar+set}" = set; then
-  withval=$with_beanshell_jar;  BSH_JAR="$withval"
-
-fi
+  withval="$with_beanshell_jar"
+   BSH_JAR="$withval"
 
-# Check whether --enable-minimizer was given.
+fi;
+# Check whether --enable-minimizer or --disable-minimizer was given.
 if test "${enable_minimizer+set}" = set; then
-  enableval=$enable_minimizer;
-fi
+  enableval="$enable_minimizer"
 
-# Check whether --enable-presenter-console was given.
+fi;
+# Check whether --enable-presenter-console or --disable-presenter-console was given.
 if test "${enable_presenter_console+set}" = set; then
-  enableval=$enable_presenter_console;
-fi
+  enableval="$enable_presenter_console"
 
-# Check whether --enable-pdfimport was given.
+fi;
+# Check whether --enable-pdfimport or --disable-pdfimport was given.
 if test "${enable_pdfimport+set}" = set; then
-  enableval=$enable_pdfimport;
-fi
+  enableval="$enable_pdfimport"
 
-# Check whether --enable-wiki-publisher was given.
+fi;
+# Check whether --enable-wiki-publisher or --disable-wiki-publisher was given.
 if test "${enable_wiki_publisher+set}" = set; then
-  enableval=$enable_wiki_publisher;
-fi
+  enableval="$enable_wiki_publisher"
 
+fi;
 
-# Check whether --with-commons-codec-jar was given.
+# Check whether --with-commons-codec-jar or --without-commons-codec-jar was given.
 if test "${with_commons_codec_jar+set}" = set; then
-  withval=$with_commons_codec_jar;  COMMONS_CODEC_JAR="$withval"
+  withval="$with_commons_codec_jar"
+   COMMONS_CODEC_JAR="$withval"
 
-fi
+fi;
 
-
-# Check whether --with-commons-lang-jar was given.
+# Check whether --with-commons-lang-jar or --without-commons-lang-jar was given.
 if test "${with_commons_lang_jar+set}" = set; then
-  withval=$with_commons_lang_jar;  COMMONS_LANG_JAR="$withval"
-
-fi
+  withval="$with_commons_lang_jar"
+   COMMONS_LANG_JAR="$withval"
 
+fi;
 
-# Check whether --with-commons-httpclient-jar was given.
+# Check whether --with-commons-httpclient-jar or --without-commons-httpclient-jar was given.
 if test "${with_commons_httpclient_jar+set}" = set; then
-  withval=$with_commons_httpclient_jar;  COMMONS_HTTPCLIENT_JAR="$withval"
-
-fi
+  withval="$with_commons_httpclient_jar"
+   COMMONS_HTTPCLIENT_JAR="$withval"
 
+fi;
 
-# Check whether --with-commons-logging-jar was given.
+# Check whether --with-commons-logging-jar or --without-commons-logging-jar was given.
 if test "${with_commons_logging_jar+set}" = set; then
-  withval=$with_commons_logging_jar;  COMMONS_LOGGING_JAR="$withval"
-
-fi
+  withval="$with_commons_logging_jar"
+   COMMONS_LOGGING_JAR="$withval"
 
+fi;
 
-# Check whether --with-servlet-api-jar was given.
+# Check whether --with-servlet-api-jar or --without-servlet-api-jar was given.
 if test "${with_servlet_api_jar+set}" = set; then
-  withval=$with_servlet_api_jar;  SERVLETAPI_JAR="$withval"
-
-fi
+  withval="$with_servlet_api_jar"
+   SERVLETAPI_JAR="$withval"
 
-# Check whether --enable-report-builder was given.
+fi;
+# Check whether --enable-report-builder or --disable-report-builder was given.
 if test "${enable_report_builder+set}" = set; then
-  enableval=$enable_report_builder;
-fi
+  enableval="$enable_report_builder"
 
+fi;
 
-# Check whether --with-system-jfreereport was given.
+# Check whether --with-system-jfreereport or --without-system-jfreereport was given.
 if test "${with_system_jfreereport+set}" = set; then
-  withval=$with_system_jfreereport;
-fi
+  withval="$with_system_jfreereport"
 
+fi;
 
-# Check whether --with-sac-jar was given.
+# Check whether --with-sac-jar or --without-sac-jar was given.
 if test "${with_sac_jar+set}" = set; then
-  withval=$with_sac_jar;  SAC_JAR="$withval"
+  withval="$with_sac_jar"
+   SAC_JAR="$withval"
 
-fi
+fi;
 
-
-# Check whether --with-libxml-jar was given.
+# Check whether --with-libxml-jar or --without-libxml-jar was given.
 if test "${with_libxml_jar+set}" = set; then
-  withval=$with_libxml_jar;  LIBXML_JAR="$withval"
-
-fi
+  withval="$with_libxml_jar"
+   LIBXML_JAR="$withval"
 
+fi;
 
-# Check whether --with-flute-jar was given.
+# Check whether --with-flute-jar or --without-flute-jar was given.
 if test "${with_flute_jar+set}" = set; then
-  withval=$with_flute_jar;  FLUTE_JAR="$withval"
-
-fi
+  withval="$with_flute_jar"
+   FLUTE_JAR="$withval"
 
+fi;
 
-# Check whether --with-jfreereport-jar was given.
+# Check whether --with-jfreereport-jar or --without-jfreereport-jar was given.
 if test "${with_jfreereport_jar+set}" = set; then
-  withval=$with_jfreereport_jar;  JFREEREPORT_JAR="$withval"
+  withval="$with_jfreereport_jar"
+   JFREEREPORT_JAR="$withval"
 
-fi
+fi;
 
-
-# Check whether --with-liblayout-jar was given.
+# Check whether --with-liblayout-jar or --without-liblayout-jar was given.
 if test "${with_liblayout_jar+set}" = set; then
-  withval=$with_liblayout_jar;  LIBLAYOUT_JAR="$withval"
-
-fi
+  withval="$with_liblayout_jar"
+   LIBLAYOUT_JAR="$withval"
 
+fi;
 
-# Check whether --with-libloader-jar was given.
+# Check whether --with-libloader-jar or --without-libloader-jar was given.
 if test "${with_libloader_jar+set}" = set; then
-  withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
-
-fi
+  withval="$with_libloader_jar"
+   LIBLOADER_JAR="$withval"
 
+fi;
 
-# Check whether --with-libloader-jar was given.
+# Check whether --with-libloader-jar or --without-libloader-jar was given.
 if test "${with_libloader_jar+set}" = set; then
-  withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
-
-fi
+  withval="$with_libloader_jar"
+   LIBLOADER_JAR="$withval"
 
+fi;
 
-# Check whether --with-libformula-jar was given.
+# Check whether --with-libformula-jar or --without-libformula-jar was given.
 if test "${with_libformula_jar+set}" = set; then
-  withval=$with_libformula_jar;  LIBFORMULA_JAR="$withval"
-
-fi
+  withval="$with_libformula_jar"
+   LIBFORMULA_JAR="$withval"
 
+fi;
 
-# Check whether --with-librepository-jar was given.
+# Check whether --with-librepository-jar or --without-librepository-jar was given.
 if test "${with_librepository_jar+set}" = set; then
-  withval=$with_librepository_jar;  LIBREPOSITORY_JAR="$withval"
-
-fi
+  withval="$with_librepository_jar"
+   LIBREPOSITORY_JAR="$withval"
 
+fi;
 
-# Check whether --with-libfonts-jar was given.
+# Check whether --with-libfonts-jar or --without-libfonts-jar was given.
 if test "${with_libfonts_jar+set}" = set; then
-  withval=$with_libfonts_jar;  LIBFONTS_JAR="$withval"
-
-fi
+  withval="$with_libfonts_jar"
+   LIBFONTS_JAR="$withval"
 
+fi;
 
-# Check whether --with-libserializer-jar was given.
+# Check whether --with-libserializer-jar or --without-libserializer-jar was given.
 if test "${with_libserializer_jar+set}" = set; then
-  withval=$with_libserializer_jar;  LIBSERIALIZER_JAR="$withval"
-
-fi
+  withval="$with_libserializer_jar"
+   LIBSERIALIZER_JAR="$withval"
 
+fi;
 
-# Check whether --with-libbase-jar was given.
+# Check whether --with-libbase-jar or --without-libbase-jar was given.
 if test "${with_libbase_jar+set}" = set; then
-  withval=$with_libbase_jar;  LIBBASE_JAR="$withval"
-
-fi
+  withval="$with_libbase_jar"
+   LIBBASE_JAR="$withval"
 
+fi;
 
-# Check whether --with-system-saxon was given.
+# Check whether --with-system-saxon or --without-system-saxon was given.
 if test "${with_system_saxon+set}" = set; then
-  withval=$with_system_saxon;
-fi
+  withval="$with_system_saxon"
 
+fi;
 
-# Check whether --with-saxon-jar was given.
+# Check whether --with-saxon-jar or --without-saxon-jar was given.
 if test "${with_saxon_jar+set}" = set; then
-  withval=$with_saxon_jar;  SAXON_JAR="$withval"
-
-fi
+  withval="$with_saxon_jar"
+   SAXON_JAR="$withval"
 
+fi;
 
-# Check whether --with-system-libxslt was given.
+# Check whether --with-system-libxslt or --without-system-libxslt was given.
 if test "${with_system_libxslt+set}" = set; then
-  withval=$with_system_libxslt;
-fi
+  withval="$with_system_libxslt"
 
+fi;
 
-# Check whether --with-system-odbc was given.
+# Check whether --with-system-odbc or --without-system-odbc was given.
 if test "${with_system_odbc+set}" = set; then
-  withval=$with_system_odbc;
-fi
+  withval="$with_system_odbc"
 
+fi;
 
-# Check whether --with-system-sane was given.
+# Check whether --with-system-sane or --without-system-sane was given.
 if test "${with_system_sane+set}" = set; then
-  withval=$with_system_sane;
-fi
+  withval="$with_system_sane"
 
+fi;
 
-# Check whether --with-system-xrender was given.
+# Check whether --with-system-xrender or --without-system-xrender was given.
 if test "${with_system_xrender+set}" = set; then
-  withval=$with_system_xrender;
-fi
+  withval="$with_system_xrender"
 
+fi;
 
-# Check whether --with-system-curl was given.
+# Check whether --with-system-curl or --without-system-curl was given.
 if test "${with_system_curl+set}" = set; then
-  withval=$with_system_curl;
-fi
+  withval="$with_system_curl"
 
+fi;
 
-# Check whether --with-system-boost was given.
+# Check whether --with-system-boost or --without-system-boost was given.
 if test "${with_system_boost+set}" = set; then
-  withval=$with_system_boost;
-fi
+  withval="$with_system_boost"
 
+fi;
 
-# Check whether --with-system-vigra was given.
+# Check whether --with-system-vigra or --without-system-vigra was given.
 if test "${with_system_vigra+set}" = set; then
-  withval=$with_system_vigra;
-fi
+  withval="$with_system_vigra"
 
-# Check whether --enable-neon was given.
+fi;
+# Check whether --enable-neon or --disable-neon was given.
 if test "${enable_neon+set}" = set; then
-  enableval=$enable_neon;
-fi
+  enableval="$enable_neon"
 
-# Check whether --enable-Xaw was given.
+fi;
+# Check whether --enable-Xaw or --disable-Xaw was given.
 if test "${enable_Xaw+set}" = set; then
-  enableval=$enable_Xaw;
-fi
+  enableval="$enable_Xaw"
 
+fi;
 
-# Check whether --with-system-neon was given.
+# Check whether --with-system-neon or --without-system-neon was given.
 if test "${with_system_neon+set}" = set; then
-  withval=$with_system_neon;
-fi
+  withval="$with_system_neon"
 
+fi;
 
-# Check whether --with-system-agg was given.
+# Check whether --with-system-agg or --without-system-agg was given.
 if test "${with_system_agg+set}" = set; then
-  withval=$with_system_agg;
-fi
+  withval="$with_system_agg"
 
+fi;
 
-# Check whether --with-system-hunspell was given.
+# Check whether --with-system-hunspell or --without-system-hunspell was given.
 if test "${with_system_hunspell+set}" = set; then
-  withval=$with_system_hunspell;
-fi
+  withval="$with_system_hunspell"
 
+fi;
 
-# Check whether --with-system-mythes was given.
+# Check whether --with-system-mythes or --without-system-mythes was given.
 if test "${with_system_mythes+set}" = set; then
-  withval=$with_system_mythes;
-fi
+  withval="$with_system_mythes"
 
+fi;
 
-# Check whether --with-system-altlinuxhyph was given.
+# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given.
 if test "${with_system_altlinuxhyph+set}" = set; then
-  withval=$with_system_altlinuxhyph;
-fi
+  withval="$with_system_altlinuxhyph"
 
+fi;
 
-# Check whether --with-system-lpsolve was given.
+# Check whether --with-system-lpsolve or --without-system-lpsolve was given.
 if test "${with_system_lpsolve+set}" = set; then
-  withval=$with_system_lpsolve;
-fi
+  withval="$with_system_lpsolve"
 
+fi;
 
-# Check whether --with-system-mozilla was given.
+# Check whether --with-system-mozilla or --without-system-mozilla was given.
 if test "${with_system_mozilla+set}" = set; then
-  withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval
+  withval="$with_system_mozilla"
+  WITH_SYSTEM_MOZILLA=$withval
 else
   WITH_SYSTEM_MOZILLA=no
-fi
-
+fi;
 
-# Check whether --with-stlport was given.
+# Check whether --with-stlport or --without-stlport was given.
 if test "${with_stlport+set}" = set; then
-  withval=$with_stlport; WITH_STLPORT=$withval
+  withval="$with_stlport"
+  WITH_STLPORT=$withval
 else
   WITH_STLPORT=auto
-fi
+fi;
 
-
-# Check whether --with-jdk-home was given.
+# Check whether --with-jdk-home or --without-jdk-home was given.
 if test "${with_jdk_home+set}" = set; then
-  withval=$with_jdk_home;
-fi
+  withval="$with_jdk_home"
 
+fi;
 
-# Check whether --with-gxx_include_path was given.
+# Check whether --with-gxx_include_path or --without-gxx_include_path was given.
 if test "${with_gxx_include_path+set}" = set; then
-  withval=$with_gxx_include_path;
-fi
+  withval="$with_gxx_include_path"
 
+fi;
 
-# Check whether --with-java was given.
+# Check whether --with-java or --without-java was given.
 if test "${with_java+set}" = set; then
-  withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi
+  withval="$with_java"
+  if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi
 else
   WITH_JAVA=java
-fi
-
-# Check whether --enable-gcjaot was given.
+fi;
+# Check whether --enable-gcjaot or --disable-gcjaot was given.
 if test "${enable_gcjaot+set}" = set; then
-  enableval=$enable_gcjaot;
-fi
+  enableval="$enable_gcjaot"
 
+fi;
 
-# Check whether --with-ant-home was given.
+# Check whether --with-ant-home or --without-ant-home was given.
 if test "${with_ant_home+set}" = set; then
-  withval=$with_ant_home;
-fi
+  withval="$with_ant_home"
 
+fi;
 
-# Check whether --with-perl-home was given.
+# Check whether --with-perl-home or --without-perl-home was given.
 if test "${with_perl_home+set}" = set; then
-  withval=$with_perl_home;
-fi
+  withval="$with_perl_home"
 
+fi;
 
-# Check whether --with-cl-home was given.
+# Check whether --with-cl-home or --without-cl-home was given.
 if test "${with_cl_home+set}" = set; then
-  withval=$with_cl_home;
-fi
+  withval="$with_cl_home"
 
+fi;
 
-# Check whether --with-mspdb-path was given.
+# Check whether --with-mspdb-path or --without-mspdb-path was given.
 if test "${with_mspdb_path+set}" = set; then
-  withval=$with_mspdb_path;
-fi
+  withval="$with_mspdb_path"
 
+fi;
 
-# Check whether --with-midl-path was given.
+# Check whether --with-midl-path or --without-midl-path was given.
 if test "${with_midl_path+set}" = set; then
-  withval=$with_midl_path;
-fi
+  withval="$with_midl_path"
 
+fi;
 
-# Check whether --with-csc-path was given.
+# Check whether --with-csc-path or --without-csc-path was given.
 if test "${with_csc_path+set}" = set; then
-  withval=$with_csc_path;
-fi
+  withval="$with_csc_path"
 
+fi;
 
-# Check whether --with-nsis-path was given.
+# Check whether --with-nsis-path or --without-nsis-path was given.
 if test "${with_nsis_path+set}" = set; then
-  withval=$with_nsis_path;
-fi
+  withval="$with_nsis_path"
 
+fi;
 
-# Check whether --with-frame-home was given.
+# Check whether --with-frame-home or --without-frame-home was given.
 if test "${with_frame_home+set}" = set; then
-  withval=$with_frame_home;
-fi
+  withval="$with_frame_home"
 
+fi;
 
-# Check whether --with-psdk-home was given.
+# Check whether --with-psdk-home or --without-psdk-home was given.
 if test "${with_psdk_home+set}" = set; then
-  withval=$with_psdk_home;
-fi
+  withval="$with_psdk_home"
 
+fi;
 
-# Check whether --with-directx-home was given.
+# Check whether --with-directx-home or --without-directx-home was given.
 if test "${with_directx_home+set}" = set; then
-  withval=$with_directx_home;
-fi
+  withval="$with_directx_home"
 
+fi;
 
-# Check whether --with-local-solenv was given.
+# Check whether --with-local-solenv or --without-local-solenv was given.
 if test "${with_local_solenv+set}" = set; then
-  withval=$with_local_solenv;
-fi
+  withval="$with_local_solenv"
 
+fi;
 
-# Check whether --with-local-solver was given.
+# Check whether --with-local-solver or --without-local-solver was given.
 if test "${with_local_solver+set}" = set; then
-  withval=$with_local_solver;
-fi
+  withval="$with_local_solver"
 
-# Check whether --enable-check-only was given.
+fi;
+# Check whether --enable-check-only or --disable-check-only was given.
 if test "${enable_check_only+set}" = set; then
-  enableval=$enable_check_only;
-fi
+  enableval="$enable_check_only"
 
+fi;
 
-# Check whether --with-lang was given.
+# Check whether --with-lang or --without-lang was given.
 if test "${with_lang+set}" = set; then
-  withval=$with_lang;
-fi
+  withval="$with_lang"
 
+fi;
 
-# Check whether --with-poor-help-localizations was given.
+# Check whether --with-poor-help-localizations or --without-poor-help-localizations was given.
 if test "${with_poor_help_localizations+set}" = set; then
-  withval=$with_poor_help_localizations;
-fi
+  withval="$with_poor_help_localizations"
 
+fi;
 
-# Check whether --with-dict was given.
+# Check whether --with-dict or --without-dict was given.
 if test "${with_dict+set}" = set; then
-  withval=$with_dict;
-fi
+  withval="$with_dict"
 
+fi;
 
-# Check whether --with-intro-bitmaps was given.
+# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given.
 if test "${with_intro_bitmaps+set}" = set; then
-  withval=$with_intro_bitmaps;
-fi
+  withval="$with_intro_bitmaps"
 
+fi;
 
-# Check whether --with-about-bitmaps was given.
+# Check whether --with-about-bitmaps or --without-about-bitmaps was given.
 if test "${with_about_bitmaps+set}" = set; then
-  withval=$with_about_bitmaps;
-fi
+  withval="$with_about_bitmaps"
 
+fi;
 
-# Check whether --with-vendor was given.
+# Check whether --with-vendor or --without-vendor was given.
 if test "${with_vendor+set}" = set; then
-  withval=$with_vendor;
-fi
+  withval="$with_vendor"
 
+fi;
 
-# Check whether --with-unix-wrapper was given.
+# Check whether --with-unix-wrapper or --without-unix-wrapper was given.
 if test "${with_unix_wrapper+set}" = set; then
-  withval=$with_unix_wrapper;
-fi
+  withval="$with_unix_wrapper"
 
+fi;
 
-# Check whether --with-asm-home was given.
+# Check whether --with-asm-home or --without-asm-home was given.
 if test "${with_asm_home+set}" = set; then
-  withval=$with_asm_home;
-fi
+  withval="$with_asm_home"
 
+fi;
 
-# Check whether --with-os-version was given.
+# Check whether --with-os-version or --without-os-version was given.
 if test "${with_os_version+set}" = set; then
-  withval=$with_os_version;
-fi
+  withval="$with_os_version"
 
+fi;
 
-# Check whether --with-unzip-home was given.
+# Check whether --with-unzip-home or --without-unzip-home was given.
 if test "${with_unzip_home+set}" = set; then
-  withval=$with_unzip_home;
-fi
+  withval="$with_unzip_home"
 
+fi;
 
-# Check whether --with-zip-home was given.
+# Check whether --with-zip-home or --without-zip-home was given.
 if test "${with_zip_home+set}" = set; then
-  withval=$with_zip_home;
-fi
+  withval="$with_zip_home"
 
+fi;
 
-# Check whether --with-mingwin was given.
+# Check whether --with-mingwin or --without-mingwin was given.
 if test "${with_mingwin+set}" = set; then
-  withval=$with_mingwin; WITH_MINGWIN=$withval
+  withval="$with_mingwin"
+  WITH_MINGWIN=$withval
 else
   WITH_MINGWIN=0
-fi
-
+fi;
 
-# Check whether --with-use-shell was given.
+# Check whether --with-use-shell or --without-use-shell was given.
 if test "${with_use_shell+set}" = set; then
-  withval=$with_use_shell; with_use_shell=$withval
+  withval="$with_use_shell"
+  with_use_shell=$withval
 else
   with_use_shell="tcsh"
-fi
-
+fi;
 
-# Check whether --with-build-version was given.
+# Check whether --with-build-version or --without-build-version was given.
 if test "${with_build_version+set}" = set; then
-  withval=$with_build_version; with_build_version=$withval
-fi
-
-# Check whether --enable-sgistl was given.
+  withval="$with_build_version"
+  with_build_version=$withval
+fi;
+# Check whether --enable-sgistl or --disable-sgistl was given.
 if test "${enable_sgistl+set}" = set; then
-  enableval=$enable_sgistl;
-fi
+  enableval="$enable_sgistl"
 
+fi;
 
-# Check whether --with-alloc was given.
+# Check whether --with-alloc or --without-alloc was given.
 if test "${with_alloc+set}" = set; then
-  withval=$with_alloc;
-fi
+  withval="$with_alloc"
 
-# Check whether --enable-verbose was given.
+fi;
+# Check whether --enable-verbose or --disable-verbose was given.
 if test "${enable_verbose+set}" = set; then
-  enableval=$enable_verbose;
-fi
+  enableval="$enable_verbose"
 
+fi;
 
 BUILD_TYPE="OOo"
 
@@ -3855,148 +2855,29 @@ echo "*                                                                  *"
 echo "********************************************************************"
 echo ""
 cat /dev/null > warn
-{ $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
-  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
-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.
-  # 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"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_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`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $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;}
-   { (exit 1); exit 1; }; }
-  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; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-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
-  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
-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.
-  # 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"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_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`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $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;}
-   { (exit 1); exit 1; }; }
-  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; }
- EGREP="$ac_cv_path_EGREP"
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
 
 
 for ac_prog in gawk mawk nawk awk
 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_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -4007,36 +2888,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&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
 
-
   test -n "$AWK" && break
 done
 
 # Extract the first word of "$AWK", so it can be a program name with args.
 set dummy $AWK; 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_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $AWK in
   [\\/]* | ?:[\\/]*)
@@ -4049,31 +2928,30 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_AWK="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 AWK=$ac_cv_path_AWK
+
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&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 -z "$AWK"; then
-   { { $as_echo "$as_me:$LINENO: error: install awk to run this script" >&5
-$as_echo "$as_me: error: install awk to run this script" >&2;}
+   { { echo "$as_me:$LINENO: error: install awk to run this script" >&5
+echo "$as_me: error: install awk to run this script" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -4081,10 +2959,10 @@ for ac_prog in sed
 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_path_SED+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SED in
   [\\/]* | ?:[\\/]*)
@@ -4097,47 +2975,46 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SED="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SED=$ac_cv_path_SED
+
 if test -n "$SED"; then
-  { $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
+  echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&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
 
-
   test -n "$SED" && break
 done
 
 if test -z "$SED"; then
-   { { $as_echo "$as_me:$LINENO: error: install sed to run this script" >&5
-$as_echo "$as_me: error: install sed to run this script" >&2;}
+   { { echo "$as_me:$LINENO: error: install sed to run this script" >&5
+echo "$as_me: error: install sed to run this script" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for solenv environment" >&5
-$as_echo_n "checking for solenv environment... " >&6; }
+echo "$as_me:$LINENO: checking for solenv environment" >&5
+echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6
 if test -z "$with_local_solenv"; then
    LOCAL_SOLENV="DEFAULT"
-   { $as_echo "$as_me:$LINENO: result: default" >&5
-$as_echo "default" >&6; }
+   echo "$as_me:$LINENO: result: default" >&5
+echo "${ECHO_T}default" >&6
 else
    LOCAL_SOLENV=$with_local_solenv
-   { $as_echo "$as_me:$LINENO: result: $with_local_solenv" >&5
-$as_echo "$with_local_solenv" >&6; }
+   echo "$as_me:$LINENO: result: $with_local_solenv" >&5
+echo "${ECHO_T}$with_local_solenv" >&6
 fi
 
 
@@ -4155,160 +3032,110 @@ if test -e $_solenv/inc/minor.mk; then
    SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
 
 else
-   { { $as_echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5
-$as_echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;}
+   { { echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5
+echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f "$ac_dir/install.sh"; then
+  elif test -f $ac_dir/install.sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f "$ac_dir/shtool"; then
+  elif test -f $ac_dir/shtool; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   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
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
-fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+  ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+  ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
-fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
 # The aliases save the names the user supplied, while $host etc.
@@ -4319,20 +3146,20 @@ test -n "$target_alias" &&
   program_prefix=${target_alias}-
 if test "$build" != "$host" -o "$build" != "$target" \
   -o "$host" != "$target"; then
-	{ $as_echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5
-$as_echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;}
+	{ echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5
+echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;}
 	echo "cross-compiling by any means is not supported (yet)!" >> warn
 fi
 
 if echo "$build_os" | grep cygwin; then
-   { $as_echo "$as_me:$LINENO: checking Cygwin version" >&5
-$as_echo_n "checking Cygwin version... " >&6; }
+   echo "$as_me:$LINENO: checking Cygwin version" >&5
+echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6
    CygwinVer=`uname -r`
-   { $as_echo "$as_me:$LINENO: result: $CygwinVer" >&5
-$as_echo "$CygwinVer" >&6; }
+   echo "$as_me:$LINENO: result: $CygwinVer" >&5
+echo "${ECHO_T}$CygwinVer" >&6
    if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
-      { { $as_echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5
-$as_echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;}
+      { { echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5
+echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;}
    { (exit 1); exit 1; }; }
    fi
 else
@@ -4348,27 +3175,73 @@ case "$build_os" in
         test_randr=yes
 		test_freetype=yes
 		_os=SunOS
+		# Extract the first word of "gtar", so it can be a program name with args.
+set dummy gtar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GNUTAR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GNUTAR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GNUTAR="$GNUTAR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sfw/bin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+GNUTAR=$ac_cv_path_GNUTAR
+
+if test -n "$GNUTAR"; then
+  echo "$as_me:$LINENO: result: $GNUTAR" >&5
+echo "${ECHO_T}$GNUTAR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+		if test -z "$GNUTAR"; then
+			{ { echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5
+echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+
 
-						   		{ $as_echo "$as_me:$LINENO: checking the Solaris operating system release" >&5
-$as_echo_n "checking the Solaris operating system release... " >&6; }
+						   		echo "$as_me:$LINENO: checking the Solaris operating system release" >&5
+echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6
    		_os_release=`echo $build_os | $SED -e s/solaris2\.//`
 		if test "$_os_release" -lt "6"; then
-      			{ { $as_echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5
-$as_echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;}
+      			{ { echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5
+echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;}
    { (exit 1); exit 1; }; }
    		else
-      			{ $as_echo "$as_me:$LINENO: result: ok ($_os_release)" >&5
-$as_echo "ok ($_os_release)" >&6; }
+      			echo "$as_me:$LINENO: result: ok ($_os_release)" >&5
+echo "${ECHO_T}ok ($_os_release)" >&6
    		fi
 
-   		   		{ $as_echo "$as_me:$LINENO: checking the processor type" >&5
-$as_echo_n "checking the processor type... " >&6; }
+   		   		echo "$as_me:$LINENO: checking the processor type" >&5
+echo $ECHO_N "checking the processor type... $ECHO_C" >&6
    		if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
-      			{ $as_echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5
-$as_echo "ok ($build_cpu)" >&6; }
+      			echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5
+echo "${ECHO_T}ok ($build_cpu)" >&6
    		else
-      			{ { $as_echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5
-$as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
+      			{ { echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5
+echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
    { (exit 1); exit 1; }; }
    		fi
 		;;
@@ -4402,8 +3275,8 @@ $as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
 		test_freetype=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         { $as_echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5
-$as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;}
+         { echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5
+echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;}
          echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
          enable_systray=no
       fi
@@ -4423,17 +3296,17 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		{ $as_echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5
-$as_echo_n "checking the FreeBSD operating system release... " >&6; }
+		echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5
+echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
 		else
 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
 		fi
-		{ $as_echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5
-$as_echo "found OSVERSION=$OSVERSION" >&6; }
-		{ $as_echo "$as_me:$LINENO: checking which thread library to use" >&5
-$as_echo_n "checking which thread library to use... " >&6; }
+		echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5
+echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6
+		echo "$as_me:$LINENO: checking which thread library to use" >&5
+echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6
 		if test "$OSVERSION" -lt "500016"; then
 			PTHREAD_CFLAGS="-D_THREAD_SAFE"
 			PTHREAD_LIBS="-pthread"
@@ -4444,8 +3317,8 @@ $as_echo_n "checking which thread library to use... " >&6; }
 			PTHREAD_CFLAGS=""
 			PTHREAD_LIBS="-pthread"
 		fi
-		{ $as_echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5
-$as_echo "$PTHREAD_LIBS" >&6; }
+		echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5
+echo "${ECHO_T}$PTHREAD_LIBS" >&6
 		_os=FreeBSD
 		;;
 	osf)
@@ -4479,8 +3352,8 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		_os=AIX
 		;;
    *)
-   { { $as_echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5
-$as_echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;}
+   { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5
+echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;}
    { (exit 1); exit 1; }; }
    ;;
 esac
@@ -4489,27 +3362,27 @@ esac
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
-$as_echo_n "checking whether to enable crashdump feature... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
+echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6
 if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
    ENABLE_CRASHDUMP="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    BUILD_TYPE="$BUILD_TYPE CRASHREP"
 else
    if test "$enable_crashdump" = "STATIC"; then
       ENABLE_CRASHDUMP="STATIC"
-      { $as_echo "$as_me:$LINENO: result: yes, STATIC" >&5
-$as_echo "yes, STATIC" >&6; }
+      echo "$as_me:$LINENO: result: yes, STATIC" >&5
+echo "${ECHO_T}yes, STATIC" >&6
       BUILD_TYPE="$BUILD_TYPE CRASHREP"
    else
       if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
          ENABLE_CRASHDUMP=""
-	 { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+	 echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
       else
-         { { $as_echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5
-$as_echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;}
+         { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5
+echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
@@ -4521,89 +3394,89 @@ if test "$_os" = "WINNT"; then
 fi
 
 if test "$_os" = "WINNT"; then
-            { $as_echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5
-$as_echo_n "checking whether to use the standard non-optimizing compiler... " >&6; }
+            echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5
+echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6
    if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
       VC_STANDARD=""
-      { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    else
       VC_STANDARD="TRUE"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    fi
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5
-$as_echo_n "checking whether to turn warnings to errors... " >&6; }
+echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5
+echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6
 if test -n "$enable_werror" && test "$enable_werror" != "no"; then
    ENABLE_WERROR="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-   { $as_echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5
-$as_echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;}
-   { $as_echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5
-$as_echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;}
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+   { echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5
+echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;}
+   { echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5
+echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;}
    echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn
 else
    ENABLE_WERROR="FALSE"
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to do a debug build" >&5
-$as_echo_n "checking whether to do a debug build... " >&6; }
+echo "$as_me:$LINENO: checking whether to do a debug build" >&5
+echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6
 if test -n "$enable_debug" && test "$enable_debug" != "no"; then
    ENABLE_DEBUG="TRUE"
    if test -z "$enable_symbols"; then
       enable_symbols="yes"
    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
 else
    ENABLE_DEBUG="FALSE"
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5
-$as_echo_n "checking whether to build with additional debug utilities... " >&6; }
+echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5
+echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6
 if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
    PROEXT=""
    PRODUCT=""
    PROFULLSWITCH=""
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
    PRODUCT="full"
    PROFULLSWITCH="product=full"
    PROEXT=".pro"
-   { $as_echo "$as_me:$LINENO: result: no, full product build" >&5
-$as_echo "no, full product build" >&6; }
+   echo "$as_me:$LINENO: result: no, full product build" >&5
+echo "${ECHO_T}no, full product build" >&6
 fi
 
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5
-$as_echo_n "checking whether to include symbols into final build... " >&6; }
+echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5
+echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6
 if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
 	if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
 		ENABLE_SYMBOLS="TRUE"
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+		echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 	else
 		if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
 			ENABLE_SYMBOLS="SMALL"
-			{ $as_echo "$as_me:$LINENO: result: yes, small ones" >&5
-$as_echo "yes, small ones" >&6; }
+			echo "$as_me:$LINENO: result: yes, small ones" >&5
+echo "${ECHO_T}yes, small ones" >&6
 		else if test "$enable_symbols" != "no" ; then
 			     echo enable symbols is: $enable_symbols
-			     { { $as_echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5
-$as_echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;}
+			     { { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5
+echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;}
    { (exit 1); exit 1; }; }
            	     else
               		     ENABLE_SYMBOLS=
@@ -4612,21 +3485,21 @@ $as_echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as par
 	fi
 else
    ENABLE_SYMBOLS=
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5
-$as_echo_n "checking whether to strip the solver or not.... " >&6; }
+echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5
+echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6
 if test -n "$enable_strip_solver"; then
    if test "$enable_strip_solver" = "yes"; then
       DISABLE_STRIP=
    else if test "$enable_strip_solver" = "no"; then
            DISABLE_STRIP="TRUE"
         else
-           { { $as_echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5
-$as_echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;}
+           { { echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5
+echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;}
    { (exit 1); exit 1; }; }
         fi
    fi
@@ -4639,151 +3512,151 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5
-$as_echo_n "checking whether to enable native CUPS support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5
+echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6
 if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
    ENABLE_CUPS="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
    ENABLE_CUPS=""
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5
-$as_echo_n "checking whether to enable fontconfig support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5
+echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
    ENABLE_FONTCONFIG="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
    ENABLE_FONTCONFIG=""
-   { $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
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
-$as_echo_n "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
+echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6
 if test "$enable_binfilter" = "no"; then
    WITH_BINFILTER="NO"
-   { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 else
    WITH_BINFILTER="YES"
    BUILD_TYPE="$BUILD_TYPE BINFILTER"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:$LINENO: checking whether to use DirectX" >&5
-$as_echo_n "checking whether to use DirectX... " >&6; }
+   echo "$as_me:$LINENO: checking whether to use DirectX" >&5
+echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6
    if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
       ENABLE_DIRECTX="TRUE"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
       ENABLE_DIRECTX=""
-      { $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
 
 
-   { $as_echo "$as_me:$LINENO: checking whether to use ActiveX" >&5
-$as_echo_n "checking whether to use ActiveX... " >&6; }
+   echo "$as_me:$LINENO: checking whether to use ActiveX" >&5
+echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6
    if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
       DISABLE_ACTIVEX=""
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
       DISABLE_ACTIVEX="TRUE"
-      { $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
 
 
-   { $as_echo "$as_me:$LINENO: checking whether to use ATL" >&5
-$as_echo_n "checking whether to use ATL... " >&6; }
+   echo "$as_me:$LINENO: checking whether to use ATL" >&5
+echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6
    if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
       DISABLE_ATL=""
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
       DISABLE_ATL="TRUE"
-      { $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
 
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5
-$as_echo_n "checking whether to use RPATH in shared libraries... " >&6; }
+echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5
+echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6
 if test "$enable_rpath" = "no"; then
    ENABLE_RPATH="no"
 else
    ENABLE_RPATH="yes"
 fi
-{ $as_echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5
-$as_echo "$ENABLE_RPATH" >&6; }
+echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5
+echo "${ECHO_T}$ENABLE_RPATH" >&6
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5
-$as_echo_n "checking whether to include MySpell dictionaries... " >&6; }
+echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5
+echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6
 if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "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
   WITH_MYSPELL_DICTS=YES
   BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
 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
   WITH_MYSPELL_DICTS=NO
 fi
 
 
 if test "$WITH_MYSPELL_DICTS" = "NO"; then
-  { $as_echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5
-$as_echo_n "checking whether to use dicts from external paths... " >&6; }
+  echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5
+echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6
   if test -n "$with_system_dicts" -a "$with_system_dicts" = "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
 	SYSTEM_DICTS=YES
-	{ $as_echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5
-$as_echo_n "checking for spelling dictionary directory... " >&6; }
+	echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5
+echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6
 	if test -n "$with_external_dict_dir"; then
 		DICT_SYSTEM_DIR=file://$with_external_dict_dir
 	else
 		DICT_SYSTEM_DIR=file:///usr/share/hunspell
 	fi
-	{ $as_echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5
-$as_echo "$DICT_SYSTEM_DIR" >&6; }
-	{ $as_echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5
-$as_echo_n "checking for hyphenation patterns directory... " >&6; }
+	echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5
+echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6
+	echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5
+echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6
 	if test -n "$with_external_hyph_dir"; then
 		HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
 	else
 		HYPH_SYSTEM_DIR=file:///usr/share/hyphen
 	fi
-	{ $as_echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5
-$as_echo "$HYPH_SYSTEM_DIR" >&6; }
-	{ $as_echo "$as_me:$LINENO: checking for thesaurus directory" >&5
-$as_echo_n "checking for thesaurus directory... " >&6; }
+	echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5
+echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6
+	echo "$as_me:$LINENO: checking for thesaurus directory" >&5
+echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6
 	if test -n "$with_external_thes_dir"; then
 		THES_SYSTEM_DIR=file://$with_external_thes_dir
 	else
 		THES_SYSTEM_DIR=file:///usr/share/mythes
 	fi
-	{ $as_echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5
-$as_echo "$THES_SYSTEM_DIR" >&6; }
+	echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5
+echo "${ECHO_T}$THES_SYSTEM_DIR" >&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
   	SYSTEM_DICTS=NO
   fi
 fi
@@ -4792,19 +3665,19 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which shell to use" >&5
-$as_echo_n "checking which shell to use... " >&6; }
+echo "$as_me:$LINENO: checking which shell to use" >&5
+echo $ECHO_N "checking which shell to use... $ECHO_C" >&6
 if test $_os = "WINNT"; then
       if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
-      { { $as_echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5
-$as_echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;}
+      { { echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5
+echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;}
    { (exit 1); exit 1; }; }
    fi
                      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         { { $as_echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink!
+         { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink!
 Native windows programs cannot use cygwin symlinks. Remove the symbolic
 link, and copy the program to the name of the link." >&5
-$as_echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink!
+echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink!
 Native windows programs cannot use cygwin symlinks. Remove the symbolic
 link, and copy the program to the name of the link." >&2;}
    { (exit 1); exit 1; }; }
@@ -4827,32 +3700,32 @@ link, and copy the program to the name of the link." >&2;}
    fi
 elif test $_os = "OS2"; then
    if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then
-      { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5
-$as_echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;}
+      { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5
+echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;}
    { (exit 1); exit 1; }; }
    fi
 else
             if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
-$as_echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
+      { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
+echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
 USE_SHELL="$with_use_shell"
-{ $as_echo "$as_me:$LINENO: result: $USE_SHELL" >&5
-$as_echo "$USE_SHELL" >&6; }
+echo "$as_me:$LINENO: result: $USE_SHELL" >&5
+echo "${ECHO_T}$USE_SHELL" >&6
 
 
 
 if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then
-   { $as_echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
-$as_echo_n "checking for cygwin gcc/g++... " >&6; }
+   echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
+echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6
    if which gcc > /dev/null && which g++ > /dev/null ; then
-      { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      { { $as_echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5
-$as_echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;}
+      { { echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5
+echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
@@ -4861,10 +3734,10 @@ fi
 if test "$with_use_shell" = "tcsh"; then
    # Extract the first word of "tcsh", so it can be a program name with args.
 set dummy tcsh; 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_SHELLPATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SHELLPATH in
   [\\/]* | ?:[\\/]*)
@@ -4877,31 +3750,30 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SHELLPATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
+
 if test -n "$SHELLPATH"; then
-  { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-$as_echo "$SHELLPATH" >&6; }
+  echo "$as_me:$LINENO: result: $SHELLPATH" >&5
+echo "${ECHO_T}$SHELLPATH" >&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 -z "$SHELLPATH"; then
-      { { $as_echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5
-$as_echo "$as_me: error: tcsh not found in \$PATH" >&2;}
+      { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5
+echo "$as_me: error: tcsh not found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
    else
       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"`
@@ -4909,10 +3781,10 @@ $as_echo "$as_me: error: tcsh not found in \$PATH" >&2;}
 elif test "$with_use_shell" = "bash"; then
    # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; 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_SHELLPATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SHELLPATH in
   [\\/]* | ?:[\\/]*)
@@ -4925,51 +3797,50 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SHELLPATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
+
 if test -n "$SHELLPATH"; then
-  { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-$as_echo "$SHELLPATH" >&6; }
+  echo "$as_me:$LINENO: result: $SHELLPATH" >&5
+echo "${ECHO_T}$SHELLPATH" >&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 -z "$SHELLPATH"; then
-      { { $as_echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5
-$as_echo "$as_me: error: bash not found in \$PATH" >&2;}
+      { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5
+echo "$as_me: error: bash not found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
    else
       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
    fi
 else
-   { $as_echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5
-$as_echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;}
+   { echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5
+echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;}
    SHELLPATH="NO_SHELLPATH_NEEDED"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking gcc home" >&5
-$as_echo_n "checking gcc home... " >&6; }
+echo "$as_me:$LINENO: checking gcc home" >&5
+echo $ECHO_N "checking gcc home... $ECHO_C" >&6
 if test -z "$with_gcc_home"; then
 	GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
 else
 	GCC_HOME="$with_gcc_home"
 fi
-{ $as_echo "$as_me:$LINENO: result: $GCC_HOME" >&5
-$as_echo "$GCC_HOME" >&6; }
+echo "$as_me:$LINENO: result: $GCC_HOME" >&5
+echo "${ECHO_T}$GCC_HOME" >&6
 
 
 if test -n "$with_gcc_home"; then
@@ -4987,10 +3858,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$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.
@@ -5001,36 +3872,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$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
 done
-IFS=$as_save_IFS
 
 fi
 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
 
-
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $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.
@@ -5041,49 +3910,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$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
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+  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.
@@ -5094,36 +3952,76 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$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
 done
-IFS=$as_save_IFS
 
 fi
 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
 
-
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $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.
@@ -5135,18 +4033,17 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
-IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -5164,25 +4061,24 @@ fi
 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
 
-
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
+  for ac_prog in cl
   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.
@@ -5193,40 +4089,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$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
 done
-IFS=$as_save_IFS
 
 fi
 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
 
-
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl.exe
+  for ac_prog in cl
 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.
@@ -5237,93 +4131,62 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$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
 
-
   test -n "$ac_ct_CC" && break
 done
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (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
-{ (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 "$ac_compiler --version >&5") 2>&5
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&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 "$ac_compiler -v >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&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 "$ac_compiler -V >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5339,150 +4202,111 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$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.*"
-
-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_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link_default") 2>&5
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&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'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
 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 | *.o | *.obj )
+        ;;
+    conftest.$ac_ext )
+        # This is the source file.
+        ;;
     [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
+        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        # FIXME: I believe we export ac_cv_exeext for Libtool,
+        # but it would be cool to find out if it's true.  Does anybody
+        # maintain Libtool? --akim.
+        export ac_cv_exeext
+        break;;
     * )
-	break;;
+        break;;
   esac
 done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
 else
-  ac_file=''
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$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: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
 
-# Check that the compiler produces executables we can run.  If not, either
+# Check 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
   if { ac_try='./$ac_file'
-  { (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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (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
+# Check 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; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&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 "$ac_link") 2>&5
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
@@ -5491,35 +4315,35 @@ $as_echo "$ac_try_echo") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
+          export ac_cv_exeext
+          break;;
     * ) break;;
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5535,50 +4359,42 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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;
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   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 ) ;;
     *) 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: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5597,93 +4413,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+ac_compiler_gnu=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 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; }
+CFLAGS="-g"
+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
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  (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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5699,82 +4463,28 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; 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
 
-
+ac_cv_prog_cc_g=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$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
@@ -5790,14 +4500,15 @@ else
     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; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_c89=no
+  ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5825,21 +4536,6 @@ static char *f (char * (*g) (char **, int), char **p, ...)
   va_end (v);
   return s;
 }
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -5854,58 +4550,168 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+rm -f conftest.$ac_objext
 done
-rm -f conftest.$ac_ext
+rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
 
 fi
-# 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; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&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_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5920,10 +4726,10 @@ if test "$COMPATH" = "." ; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$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_COMPATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $COMPATH in
   [\\/]* | ?:[\\/]*)
@@ -5936,28 +4742,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_COMPATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 COMPATH=$ac_cv_path_COMPATH
+
 if test -n "$COMPATH"; then
-  { $as_echo "$as_me:$LINENO: result: $COMPATH" >&5
-$as_echo "$COMPATH" >&6; }
+  echo "$as_me:$LINENO: result: $COMPATH" >&5
+echo "${ECHO_T}$COMPATH" >&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
 
-
   test -n "$COMPATH" && break
 done
 
@@ -5966,67 +4771,124 @@ fi
 
 GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
-    { $as_echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
-$as_echo_n "checking the GNU gcc compiler version... " >&6; }
+    echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
+echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6
    _gcc_version=`$CC -dumpversion`
    _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
    _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
    GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
    if test "$_gcc_major" -lt "3"; then
-      { { $as_echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5
-$as_echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;}
+      { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5
+echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;}
    { (exit 1); exit 1; }; }
    else
       if test "$GCCVER" -eq "030203"; then
 	    if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           { { $as_echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5
-$as_echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;}
+           { { echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5
+echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;}
    { (exit 1); exit 1; }; }
 	    fi
       fi
    fi
-   { $as_echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
-$as_echo "checked (gcc $_gcc_version)" >&6; }
+   echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
+echo "${ECHO_T}checked (gcc $_gcc_version)" >&6
    if test "$_os" = "SunOS"; then
-      { $as_echo "$as_me:$LINENO: checking gcc linker" >&5
-$as_echo_n "checking gcc linker... " >&6; }
+      echo "$as_me:$LINENO: checking gcc linker" >&5
+echo $ECHO_N "checking gcc linker... $ECHO_C" >&6
       if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          { { $as_echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5
-$as_echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;}
+          { { echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5
+echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;}
    { (exit 1); exit 1; }; }
       fi
-      { $as_echo "$as_me:$LINENO: result: ok (GNU ld)" >&5
-$as_echo "ok (GNU ld)" >&6; }
+      echo "$as_me:$LINENO: result: ok (GNU ld)" >&5
+echo "${ECHO_T}ok (GNU ld)" >&6
    fi
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable pch feature" >&5
-$as_echo_n "checking whether to enable pch feature... " >&6; }
+HAVE_LD_BSYMBOLIC_FUNCTIONS=
+if test "$GCC" = "yes"; then
+   echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5
+echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6
+   bsymbolic_functions_ldflags_save=$LDFLAGS
+   LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
+
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+   #include <stdio.h>
+
+int
+main ()
+{
+
+    printf ("hello world\n");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+   if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
+     echo "$as_me:$LINENO: result: found " >&5
+echo "${ECHO_T}found " >&6
+   else
+     echo "$as_me:$LINENO: result: not found " >&5
+echo "${ECHO_T}not found " >&6
+   fi
+   LDFLAGS=$bsymbolic_functions_ldflags_save
+fi
+
+
+echo "$as_me:$LINENO: checking whether to enable pch feature" >&5
+echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6
 if test -n "$enable_pch" && test "$enable_pch" != "no"; then
    if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
 	   ENABLE_PCH="TRUE"
-	   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+	   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
 	   ENABLE_PCH="TRUE"
-	   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+	   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
 	   ENABLE_PCH=""
-	   { $as_echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5
-$as_echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;}
+	   { echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5
+echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;}
    fi
 else
    ENABLE_PCH=""
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking for GNU make" >&5
-$as_echo_n "checking for GNU make... " >&6; }
+echo "$as_me:$LINENO: checking for GNU make" >&5
+echo $ECHO_N "checking for GNU make... $ECHO_C" >&6
 for a in "$MAKE" $GNUMAKE make gmake gnumake; do
       $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
       if test $? -eq 0;  then
@@ -6034,48 +4896,67 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do
            break
       fi
 done
-{ $as_echo "$as_me:$LINENO: result: $GNUMAKE" >&5
-$as_echo "$GNUMAKE" >&6; }
+echo "$as_me:$LINENO: result: $GNUMAKE" >&5
+echo "${ECHO_T}$GNUMAKE" >&6
 if test -z "$GNUMAKE"; then
-    { { $as_echo "$as_me:$LINENO: error: not found. install GNU make." >&5
-$as_echo "$as_me: error: not found. install GNU make." >&2;}
+    { { echo "$as_me:$LINENO: error: not found. install GNU make." >&5
+echo "$as_me: error: not found. install GNU make." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking the GNU make version" >&5
-$as_echo_n "checking the GNU make version... " >&6; }
+echo "$as_me:$LINENO: checking the GNU make version" >&5
+echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6
 _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 if test "$_make_longver" -ge "037901" ; then
-   { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-$as_echo "$GNUMAKE $_make_version" >&6; }
+   echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
+echo "${ECHO_T}$GNUMAKE $_make_version" >&6
 else
    if test "$_os" = "Darwin"; then
        if test "$_make_longver" -ge "037900" ; then
-		   { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-$as_echo "$GNUMAKE $_make_version" >&6; }
+		   echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
+echo "${ECHO_T}$GNUMAKE $_make_version" >&6
        else
-           { $as_echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5
-$as_echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;}
+           { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5
+echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;}
        fi
    else
-       { { $as_echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
-$as_echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
+       { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
+echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
 
 
+echo "$as_me:$LINENO: checking for GNU tar" >&5
+echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6
+for a in $GNUTAR gtar gnutar tar; do
+      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
+      if test $? -eq 0;  then
+           GNUTAR=$a
+           break
+      fi
+done
+echo "$as_me:$LINENO: result: $GNUTAR" >&5
+echo "${ECHO_T}$GNUTAR" >&6
+if test -z "$GNUTAR"; then
+    { { echo "$as_me:$LINENO: error: not found. install GNU tar." >&5
+echo "$as_me: error: not found. install GNU tar." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
       for ac_prog in cc
 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_path__cc+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -6088,62 +4969,61 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path__cc="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__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
 
-
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
-      { $as_echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
-$as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; }
+      echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
+echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6
             _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
       _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
       _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
       if test "$_sunstudio_major" != "5"; then
-         { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5
-$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
+         { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5
+echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
    { (exit 1); exit 1; }; }
       else
          _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
          if test "$_sunstudio_minor" = "false"; then
-            { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5
-$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
+            { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5
+echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
    { (exit 1); exit 1; }; }
          else
-                        { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+                        echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
          fi
       fi
    fi
 fi
 
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5
-$as_echo_n "checking for --hash-style=both linker support ... " >&6; }
+   echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5
+echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6
    hash_style_ldflags_save=$LDFLAGS
    LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
-
-cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6163,43 +5043,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   HAVE_LD_HASH_STYLE=TRUE
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	HAVE_LD_HASH_STYLE=FALSE
+HAVE_LD_HASH_STYLE=FALSE
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
-     { $as_echo "$as_me:$LINENO: result: found " >&5
-$as_echo "found " >&6; }
+     echo "$as_me:$LINENO: result: found " >&5
+echo "${ECHO_T}found " >&6
    else
-     { $as_echo "$as_me:$LINENO: result: not found " >&5
-$as_echo "not found " >&6; }
+     echo "$as_me:$LINENO: result: not found " >&5
+echo "${ECHO_T}not found " >&6
    fi
    LDFLAGS=$hash_style_ldflags_save
 fi
@@ -6211,10 +5079,10 @@ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$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__cc+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -6227,49 +5095,48 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path__cc="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__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
 
-
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
-      { $as_echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5
-$as_echo_n "checking the SGI MIPSpro C compiler version... " >&6; }
+      echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5
+echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6
             _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
       _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
       if test "$_mipspro_major" != "7"; then
-         { { $as_echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
-$as_echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
+         { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
+echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
    { (exit 1); exit 1; }; }
       else
          _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
          if test "$_mipspro_minor" = "false"; then
-            { { $as_echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
-$as_echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
+            { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
+echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
    { (exit 1); exit 1; }; }
          else
-                        { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+                        echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
          fi
       fi
    fi
@@ -6281,10 +5148,10 @@ if test "$_os" = "OSF1"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$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__cc+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -6297,45 +5164,44 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path__cc="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__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
 
-
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
-      { $as_echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
-$as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
-      { $as_echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
-$as_echo_n "checking the Compaq C compiler version... " >&6; }
+      { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
+echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
+      echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
+echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6
             _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
       _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
       if test "$_compaqc_major" != "T6"; then
-         { { $as_echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5
-$as_echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;}
+         { { echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5
+echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;}
    { (exit 1); exit 1; }; }
       else
-                  { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+                  echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
       fi
    fi
 fi
@@ -6343,10 +5209,10 @@ fi
 if test -z "$with_perl_home"; then
    # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; 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_PERL+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PERL in
   [\\/]* | ?:[\\/]*)
@@ -6359,28 +5225,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
+
 if test -n "$PERL"; then
-  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
+  echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&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
 
-
 else
    if test "$_os" = "WINNT"; then
       with_perl_home=`cygpath -u "$with_perl_home"`
@@ -6389,46 +5254,46 @@ else
    if test -x "$_perl_path"; then
       PERL=$_perl_path
    else
-      { { $as_echo "$as_me:$LINENO: error: $_perl_path not found" >&5
-$as_echo "$as_me: error: $_perl_path not found" >&2;}
+      { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5
+echo "$as_me: error: $_perl_path not found" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
 
 if test "$PERL"; then
-   { $as_echo "$as_me:$LINENO: checking the Perl version" >&5
-$as_echo_n "checking the Perl version... " >&6; }
+   echo "$as_me:$LINENO: checking the Perl version" >&5
+echo $ECHO_N "checking the Perl version... $ECHO_C" >&6
    ${PERL} -e "exit($]);"
    _perl_version=$?
    if test "$_perl_version" -lt 5; then
-      { { $as_echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5
-$as_echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;}
+      { { echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5
+echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;}
    { (exit 1); exit 1; }; }
    fi
-   { $as_echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5
-$as_echo "checked (perl $_perl_version)" >&6; }
+   echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5
+echo "${ECHO_T}checked (perl $_perl_version)" >&6
 else
-   { { $as_echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5
-$as_echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;}
+   { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5
+echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for required Perl modules" >&5
-$as_echo_n "checking for required Perl modules... " >&6; }
+echo "$as_me:$LINENO: checking for required Perl modules" >&5
+echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6
 if `$PERL -e 'use Archive::Zip;'`; then
-	{ $as_echo "$as_me:$LINENO: result: all modules found" >&5
-$as_echo "all modules found" >&6; }
+	echo "$as_me:$LINENO: result: all modules found" >&5
+echo "${ECHO_T}all modules found" >&6
 else
-	{ { $as_echo "$as_me:$LINENO: error: Failed to find some modules" >&5
-$as_echo "$as_me: error: Failed to find some modules" >&2;}
+	{ { echo "$as_me:$LINENO: error: Failed to find some modules" >&5
+echo "$as_me: error: Failed to find some modules" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "$_os" = "WINNT"; then
 	if test "$WITH_MINGWIN" != "yes"; then
-		{ $as_echo "$as_me:$LINENO: checking for friendly registry keys" >&5
-$as_echo_n "checking for friendly registry keys... " >&6; }
+		echo "$as_me:$LINENO: checking for friendly registry keys" >&5
+echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6
 		# VS.Net 2003, VS.Net 2005
 		if test -z "$with_cl_home"; then
 			vctest=`./oowintool --msvc-productdir`;
@@ -6438,8 +5303,8 @@ $as_echo_n "checking for friendly registry keys... " >&6; }
 		else
 			with_cl_home=`cygpath -u "$with_cl_home"`
 		fi
-		{ $as_echo "$as_me:$LINENO: result: done" >&5
-$as_echo "done" >&6; }
+		echo "$as_me:$LINENO: result: done" >&5
+echo "${ECHO_T}done" >&6
 
 										if test -n "$with_mspdb_path";then
 			with_mspdb_path=`cygpath -u "$with_mspdb_path"`
@@ -6460,10 +5325,10 @@ $as_echo "done" >&6; }
 		if test -z "$MSPDB_PATH";then
 						# Extract the first word of "mspdb80.dll", so it can be a program name with args.
 set dummy mspdb80.dll; 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_MSPDB_PATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MSPDB_PATH in
   [\\/]* | ?:[\\/]*)
@@ -6476,34 +5341,33 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSPDB_PATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
+
 if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
-$as_echo "$MSPDB_PATH" >&6; }
+  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
+echo "${ECHO_T}$MSPDB_PATH" >&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
 
-
 			# Extract the first word of "mspdb71.dll", so it can be a program name with args.
 set dummy mspdb71.dll; 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_MSPDB_PATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MSPDB_PATH in
   [\\/]* | ?:[\\/]*)
@@ -6516,51 +5380,50 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSPDB_PATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
+
 if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
-$as_echo "$MSPDB_PATH" >&6; }
+  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
+echo "${ECHO_T}$MSPDB_PATH" >&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
 
-
 			MSPDB_PATH=`dirname "$MSPDB_PATH"`
 		fi
 
 		if test -z "$MSPDB_PATH"; then
-			{ { $as_echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5
-$as_echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;}
+			{ { echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5
+echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
 		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
 				PATH="$MSPDB_PATH:$PATH"
 
-		{ $as_echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
-$as_echo_n "checking the Microsoft C/C++ Compiler... " >&6; }
+		echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
+echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6
    		if test -x "$with_cl_home/bin/cl.exe"; then
    			CC="$with_cl_home/bin/cl.exe"
    		else
    			# Extract the first word of "cl.exe", so it can be a program name with args.
 set dummy cl.exe; 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_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CC in
   [\\/]* | ?:[\\/]*)
@@ -6573,40 +5436,39 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CC="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CC=$ac_cv_path_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
 
-
    		fi
   		if test -e "$CC"; then
 			# This gives us a posix path with 8.3 filename restrictions
 			CC=`cygpath -d "$CC"`
 			CC=`cygpath -u "$CC"`
 			# Remove /cl.exe from CC case insensitive
-			{ $as_echo "$as_me:$LINENO: result: found ($CC)" >&5
-$as_echo "found ($CC)" >&6; }
+			echo "$as_me:$LINENO: result: found ($CC)" >&5
+echo "${ECHO_T}found ($CC)" >&6
 			COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'`
 			export INCLUDE=`cygpath -d "$COMPATH/../Include"`
-						{ $as_echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
-$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
+						echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
+echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
 			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
 							x = match( \\\$0, /..\\...\\...../ )
 							CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -6615,44 +5477,44 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
 								printf (\"%04d\",vertoken[i] )
 							}
 							}"`
-			{ $as_echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
-$as_echo "found Compiler version $CCNUMVER." >&6; }
+			echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
+echo "${ECHO_T}found Compiler version $CCNUMVER." >&6
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
-				{ $as_echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5
-$as_echo "found .NET 2008 / VS 9.0." >&6; }
+				echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5
+echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6
 			elif test "$CCNUMVER" -ge "001400000000"; then
 				COMEX=11
-				{ $as_echo "$as_me:$LINENO: result: found .NET 2005." >&5
-$as_echo "found .NET 2005." >&6; }
+				echo "$as_me:$LINENO: result: found .NET 2005." >&5
+echo "${ECHO_T}found .NET 2005." >&6
 			elif test "$CCNUMVER" -ge "001300102240"; then
 				COMEX=10
-				{ $as_echo "$as_me:$LINENO: result: found .NET 2003." >&5
-$as_echo "found .NET 2003." >&6; }
+				echo "$as_me:$LINENO: result: found .NET 2003." >&5
+echo "${ECHO_T}found .NET 2003." >&6
 			else
-				{ { $as_echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5
-$as_echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;}
+				{ { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5
+echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;}
    { (exit 1); exit 1; }; }
 			fi
 		else
-			{ { $as_echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5
-$as_echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;}
+			{ { echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5
+echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;}
    { (exit 1); exit 1; }; }
 		fi
 	else
-		{ $as_echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
-$as_echo_n "checking the Mingwin32 C++ Compiler... " >&6; }
+		echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
+echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6
 		if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
-			{ $as_echo "$as_me:$LINENO: result: found." >&5
-$as_echo "found." >&6; }
+			echo "$as_me:$LINENO: result: found." >&5
+echo "${ECHO_T}found." >&6
 			if $CC -dumpspecs | grep -q "mno-cygwin"; then
 				USE_MINGW="cygwin"
 			else
 				USE_MINGW="pure-mingw"
 			fi
 		else
-			{ { $as_echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5
-$as_echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;}
+			{ { echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5
+echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;}
    { (exit 1); exit 1; }; }
 		fi
 	fi
@@ -6665,10 +5527,10 @@ if test "$_os" = "WINNT"; then
 if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
 		# Extract the first word of "midl.exe", so it can be a program name with args.
 set dummy midl.exe; 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_MIDL_PATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MIDL_PATH in
   [\\/]* | ?:[\\/]*)
@@ -6681,28 +5543,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MIDL_PATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 MIDL_PATH=$ac_cv_path_MIDL_PATH
+
 if test -n "$MIDL_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
-$as_echo "$MIDL_PATH" >&6; }
+  echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
+echo "${ECHO_T}$MIDL_PATH" >&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 -n "$MIDL_PATH";then
 		MIDL_PATH=`dirname "$MIDL_PATH"`
 	fi
@@ -6728,8 +5589,8 @@ fi
 		fi
 	fi
 	if test ! -x "$MIDL_PATH/midl.exe"; then
-		{ { $as_echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5
-$as_echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}
+		{ { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5
+echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
@@ -6738,10 +5599,10 @@ $as_echo "$as_me: error: midl.exe not found. Make sure it's in the path or use -
 
 		# Extract the first word of "csc.exe", so it can be a program name with args.
 set dummy csc.exe; 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_CSC_PATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CSC_PATH in
   [\\/]* | ?:[\\/]*)
@@ -6754,28 +5615,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CSC_PATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CSC_PATH=$ac_cv_path_CSC_PATH
+
 if test -n "$CSC_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $CSC_PATH" >&5
-$as_echo "$CSC_PATH" >&6; }
+  echo "$as_me:$LINENO: result: $CSC_PATH" >&5
+echo "${ECHO_T}$CSC_PATH" >&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 -n "$CSC_PATH";then
 		CSC_PATH=`dirname "$CSC_PATH"`
 	fi
@@ -6791,16 +5651,16 @@ fi
 	   fi
 	fi
 	if test ! -x "$CSC_PATH/csc.exe"; then
-		{ { $as_echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5
-$as_echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;}
+		{ { echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5
+echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	CSC_PATH=`cygpath -d "$CSC_PATH"`
 	CSC_PATH=`cygpath -u "$CSC_PATH"`
 
-               { $as_echo "$as_me:$LINENO: checking .NET Framework" >&5
-$as_echo_n "checking .NET Framework... " >&6; }
+               echo "$as_me:$LINENO: checking .NET Framework" >&5
+echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6
 	    if test -n "$with_frame_home"; then
 		with_frame_home=`cygpath -u "$with_frame_home"`
 	    fi
@@ -6822,12 +5682,12 @@ $as_echo_n "checking .NET Framework... " >&6; }
           fi
 	    fi
 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		{ { $as_echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5
-$as_echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;}
+		{ { echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5
+echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;}
    { (exit 1); exit 1; }; }
 	    fi
-	    { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+	    echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	FRAME_HOME=`cygpath -d "$FRAME_HOME"`
 	FRAME_HOME=`cygpath -u "$FRAME_HOME"`
@@ -6843,15 +5703,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $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"
@@ -6866,6 +5726,7 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6876,39 +5737,39 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6916,34 +5777,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # 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.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -6961,8 +5821,8 @@ fi
 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
@@ -6973,6 +5833,7 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6983,39 +5844,39 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7023,34 +5884,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # 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.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -7059,13 +5919,11 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -7075,12 +5933,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7100,36 +5959,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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
+ac_cv_header_stdc=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7151,6 +6004,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7175,21 +6029,21 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
-#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -7200,51 +6054,37 @@ main ()
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
+rm -f core core.* *.core 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
@@ -7256,24 +6096,20 @@ fi
 fi
 
 if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=cpp
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
   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_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -7284,40 +6120,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
 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_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -7328,89 +6162,60 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   test -n "$ac_ct_CXX" && break
 done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
+  CXX=$ac_ct_CXX
 fi
 
-  fi
-fi
+
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$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 "$ac_compiler --version >&5") 2>&5
+echo "$as_me:$LINENO:" \
+     "checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&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 "$ac_compiler -v >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&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 "$ac_compiler -V >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ $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_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7429,54 +6234,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+ac_compiler_gnu=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7492,152 +6284,148 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
-
+exit (42);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$ac_declaration
 int
 main ()
 {
-
+exit (42);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_ext=cpp
+ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_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
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -7652,6 +6440,7 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7662,39 +6451,39 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7702,34 +6491,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # 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.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -7747,8 +6535,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -7759,6 +6547,7 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7769,39 +6558,39 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7809,34 +6598,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # 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.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -7845,13 +6633,11 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -7869,15 +6655,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $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"
@@ -7892,6 +6678,7 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7902,39 +6689,39 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7942,34 +6729,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # 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.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -7987,8 +6773,8 @@ fi
 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
@@ -7999,6 +6785,7 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8009,39 +6796,39 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8049,34 +6836,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # 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.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -8085,13 +6871,11 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -8114,15 +6898,16 @@ fi
 
 
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.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; }
-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`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8133,42 +6918,31 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "$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"
+eval "$as_ac_Header=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
@@ -8176,18 +6950,68 @@ fi
 done
 
 
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
+echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6
+if test "${ac_cv_type_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((long *) 0)
+  return 0;
+if (sizeof (long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6
+
+echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+  if test "$ac_cv_type_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8197,7 +7021,7 @@ $ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -8205,26 +7029,21 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8234,7 +7053,7 @@ $ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8242,43 +7061,37 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                    if test $ac_lo -le $ac_mid; then
+                      ac_lo= ac_hi=
+                      break
+                    fi
+                    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8288,7 +7101,7 @@ $ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -8296,26 +7109,21 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8325,7 +7133,7 @@ $ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8333,53 +7141,45 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                       if test $ac_mid -le $ac_hi; then
+                         ac_lo= ac_hi=
+                         break
+                       fi
+                       ac_mid=`expr 2 '*' $ac_mid`
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo= ac_hi=
+ac_lo= ac_hi=
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8389,7 +7189,7 @@ $ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8397,57 +7197,52 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long), 77
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;
 esac
 else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+long longval () { return (long) (sizeof (long)); }
+unsigned long ulongval () { return (long) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -8456,80 +7251,61 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    return 1;
-  if (((long int) (sizeof (long))) < 0)
+    exit (1);
+  if (((long) (sizeof (long))) < 0)
     {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (long))))
-	return 1;
-      fprintf (f, "%ld", i);
+      long i = longval ();
+      if (i != ((long) (sizeof (long))))
+	exit (1);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (long))))
-	return 1;
-      fprintf (f, "%lu", i);
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long))))
+	exit (1);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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_sizeof_long=`cat conftest.val`
 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 )
-if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long), 77
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 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
 rm -f conftest.val
+else
+  ac_cv_sizeof_long=0
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
@@ -8537,434 +7313,233 @@ _ACEOF
 
 SIZEOF_LONG=$ac_cv_sizeof_long
 
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are some -arch flags.  Note that *ppc* also matches
-	# ppc64.  This check is also rather less than ideal.
-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-	esac
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat >conftest.$ac_ext <<_ACEOF
+  # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-	     #include <sys/param.h>
+#include <sys/param.h>
 
 int
 main ()
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-		#include <sys/param.h>
+#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
+ not big endian
+#endif
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_bigendian=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_c_bigendian=no
+ac_cv_c_bigendian=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat >conftest.$ac_ext <<_ACEOF
+# It does not; compile a test program.
+if test "$cross_compiling" = yes; then
+  # try to guess the endianness by grepping values into an object file
+  ac_cv_c_bigendian=unknown
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <limits.h>
-
+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
 int
 main ()
 {
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
+ _ascii (); _ebcdic ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+  if test "$ac_cv_c_bigendian" = unknown; then
+    ac_cv_c_bigendian=no
+  else
+    # finding both strings is unlikely to happen, but who knows?
+    ac_cv_c_bigendian=unknown
+  fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then
-  # Try to guess by grepping values from an object file.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
 int
 main ()
 {
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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_c_bigendian=no
 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_c_bigendian=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
-    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
-;; #(
-   no)
-      ;; #(
-   universal)
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+case $ac_cv_c_bigendian in
+  yes)
 
 cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
+#define WORDS_BIGENDIAN 1
 _ACEOF
-
-     ;; #(
-   *)
-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+ ;;
+  no)
+     ;;
+  *)
+    { { echo "$as_me:$LINENO: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+echo "$as_me: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
- esac
+esac
 
 WORDS_BIGENDIAN=$ac_cv_c_bigendian
 
 
-# Check whether --enable-largefile was given.
+# Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
-  enableval=$enable_largefile;
-fi
+  enableval="$enable_largefile"
 
+fi;
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
        while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat >conftest.$ac_ext <<_ACEOF
+     	 # IRIX 6.2 and later do not support large files by default,
+     	 # so use the C compiler's -n32 option if that helps.
+         cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8987,80 +7562,66 @@ main ()
   return 0;
 }
 _ACEOF
-	 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+rm -f conftest.$ac_objext
+     	 CC="$CC -n32"
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext
-	 break
+rm -f conftest.$ac_objext
+         break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
+  ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9084,33 +7645,26 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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_sys_file_offset_bits=no; break
-else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9135,55 +7689,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
+rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+if test "$ac_cv_sys_file_offset_bits" != no; then
+
 cat >>confdefs.h <<_ACEOF
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+
+fi
+rm -f conftest*
+  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
+  ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9207,33 +7752,26 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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_sys_large_files=no; break
-else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9258,48 +7796,37 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
+rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+if test "$ac_cv_sys_large_files" != no; then
+
 cat >>confdefs.h <<_ACEOF
 #define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
+
+fi
+rm -f conftest*
 fi
 
 if test -n "$ac_cv_sys_file_offset_bits"; then
@@ -9310,44 +7837,44 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to disable vba feature" >&5
-$as_echo_n "checking whether to disable vba feature... " >&6; }
+echo "$as_me:$LINENO: checking whether to disable vba feature" >&5
+echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6
 if test -n "$enable_vba" && test "$enable_vba" = "no"; 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
    ENABLE_VBA=NO
 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
    ENABLE_VBA=YES
 fi
 
 
 if test "$ENABLE_VBA" = "YES"; then
-   { $as_echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5
-$as_echo_n "checking how to package the vba compatibility api... " >&6; }
+   echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5
+echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6
    if test -n "$with_vba_package_format"; then
       if test "$with_vba_package_format" = "extn"; then
          VBA_EXTENSION=YES
-         { $as_echo "$as_me:$LINENO: result: uno extension" >&5
-$as_echo "uno extension" >&6; }
-         { $as_echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5
-$as_echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;}
+         echo "$as_me:$LINENO: result: uno extension" >&5
+echo "${ECHO_T}uno extension" >&6
+         { echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5
+echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;}
       else if test "$with_vba_package_format" = "builtin"; then
             VBA_EXTENSION=NO
-            { $as_echo "$as_me:$LINENO: result: build into installset" >&5
-$as_echo "build into installset" >&6; }
+            echo "$as_me:$LINENO: result: build into installset" >&5
+echo "${ECHO_T}build into installset" >&6
          else
-            { { $as_echo "$as_me:$LINENO: error: unknown packaging method" >&5
-$as_echo "$as_me: error: unknown packaging method" >&2;}
+            { { echo "$as_me:$LINENO: error: unknown packaging method" >&5
+echo "$as_me: error: unknown packaging method" >&2;}
    { (exit 1); exit 1; }; }
          fi
       fi
 
    else
       VBA_EXTENSION=NO
-      { $as_echo "$as_me:$LINENO: result: defaulting to build into installset" >&5
-$as_echo "defaulting to build into installset" >&6; }
+      echo "$as_me:$LINENO: result: defaulting to build into installset" >&5
+echo "${ECHO_T}defaulting to build into installset" >&6
    fi
 else
       VBA_EXTENSION=NO
@@ -9358,18 +7885,19 @@ fi
 
 if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
     if test "${ac_cv_header_cups_cups_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5
-$as_echo_n "checking for cups/cups.h... " >&6; }
+  echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6
 if test "${ac_cv_header_cups_cups_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
-$as_echo "$ac_cv_header_cups_cups_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
-$as_echo_n "checking cups/cups.h usability... " >&6; }
+echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
+echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9379,39 +7907,33 @@ $ac_includes_default
 #include <cups/cups.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
-$as_echo_n "checking cups/cups.h presence... " >&6; }
+echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
+echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9419,76 +7941,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <cups/cups.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5
-$as_echo_n "checking for cups/cups.h... " >&6; }
+echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6
 if test "${ac_cv_header_cups_cups_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_cups_cups_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
-$as_echo "$ac_cv_header_cups_cups_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6
 
 fi
-if test "x$ac_cv_header_cups_cups_h" = x""yes; then
+if test $ac_cv_header_cups_cups_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5
-$as_echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;}
+  { { echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5
+echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -9496,25 +8025,26 @@ fi
 fi
 
 if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  { $as_echo "$as_me:$LINENO: checking whether to enable pam support" >&5
-$as_echo_n "checking whether to enable pam support... " >&6; }
+  echo "$as_me:$LINENO: checking whether to enable pam support" >&5
+echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6
   if test -z "$enable_pam" || test "$enable_pam" != "no"; 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
     PAM=YES
     if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
-$as_echo_n "checking for security/pam_appl.h... " >&6; }
+  echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
 if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
-$as_echo "$ac_cv_header_security_pam_appl_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
-$as_echo_n "checking security/pam_appl.h usability... " >&6; }
+echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
+echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9524,39 +8054,33 @@ $ac_includes_default
 #include <security/pam_appl.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
-$as_echo_n "checking security/pam_appl.h presence... " >&6; }
+echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
+echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9564,153 +8088,149 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <security/pam_appl.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
-$as_echo_n "checking for security/pam_appl.h... " >&6; }
+echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
 if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_security_pam_appl_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
-$as_echo "$ac_cv_header_security_pam_appl_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
 
 fi
-if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then
+if test $ac_cv_header_security_pam_appl_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5
-$as_echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;}
+  { { echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5
+echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking whether to link to libpam" >&5
-$as_echo_n "checking whether to link to libpam... " >&6; }
+    echo "$as_me:$LINENO: checking whether to link to libpam" >&5
+echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6
     if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; 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
       PAM_LINK=YES
 
-{ $as_echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-$as_echo_n "checking for pam_start in -lpam... " >&6; }
+echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
 if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char pam_start ();
 int
 main ()
 {
-return pam_start ();
+pam_start ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_pam_pam_start=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_lib_pam_pam_start=no
+ac_cv_lib_pam_pam_start=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
+echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
+if test $ac_cv_lib_pam_pam_start = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
@@ -9718,19 +8238,19 @@ _ACEOF
   LIBS="-lpam $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: libpam not found or functional" >&5
-$as_echo "$as_me: error: libpam not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: libpam not found or functional" >&5
+echo "$as_me: error: libpam not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     else
-      { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-$as_echo "no, dynamically open it" >&6; }
+      echo "$as_me:$LINENO: result: no, dynamically open it" >&5
+echo "${ECHO_T}no, dynamically open it" >&6
       PAM_LINK=NO
     fi
   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
     PAM=NO
     PAM_LINK=NO
 
@@ -9741,11 +8261,11 @@ 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 many arguments getspnam_r() takes" >&5
-$as_echo_n "checking how many arguments getspnam_r() takes... " >&6; }
+    echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5
+echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6
 
     if test "${ac_cv_func_which_getspnam_r+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -9763,6 +8283,7 @@ ac_cv_func_which_getspnam_r=unknown
 # assuming an implicit prototype. In which case, we're out of luck.
 #
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9784,32 +8305,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_which_getspnam_r=no
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 #
 # FIVE ARGUMENTS
@@ -9818,6 +8331,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9841,32 +8355,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_which_getspnam_r=five
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -9877,6 +8383,7 @@ fi
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9900,32 +8407,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_which_getspnam_r=four
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -9936,29 +8435,29 @@ fi
 
 case "$ac_cv_func_which_getspnam_r" in
     five)
-    { $as_echo "$as_me:$LINENO: result: five" >&5
-$as_echo "five" >&6; }
+    echo "$as_me:$LINENO: result: five" >&5
+echo "${ECHO_T}five" >&6
     NEW_SHADOW_API=YES
     ;;
 
     four)
-    { $as_echo "$as_me:$LINENO: result: four" >&5
-$as_echo "four" >&6; }
+    echo "$as_me:$LINENO: result: four" >&5
+echo "${ECHO_T}four" >&6
     ;;
 
     no)
-    { $as_echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5
-$as_echo "cannot find function declaration in shadow.h" >&6; }
+    echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5
+echo "${ECHO_T}cannot find function declaration in shadow.h" >&6
     ;;
 
     unknown)
-    { $as_echo "$as_me:$LINENO: result: can't tell" >&5
-$as_echo "can't tell" >&6; }
+    echo "$as_me:$LINENO: result: can't tell" >&5
+echo "${ECHO_T}can't tell" >&6
     ;;
 
     *)
-    { { $as_echo "$as_me:$LINENO: error: internal error" >&5
-$as_echo "$as_me: error: internal error" >&2;}
+    { { echo "$as_me:$LINENO: error: internal error" >&5
+echo "$as_me: error: internal error" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
@@ -9978,79 +8477,68 @@ fi
 
 
 if test "$_os" = "Linux"; then
-    { $as_echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5
-$as_echo_n "checking whether to link to libcrypt... " >&6; }
+    echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5
+echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6
     if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; 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
         CRYPT_LINK=YES
 
-{ $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char crypt ();
 int
 main ()
 {
-return crypt ();
+crypt ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_crypt_crypt=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_lib_crypt_crypt=no
+ac_cv_lib_crypt_crypt=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
+if test $ac_cv_lib_crypt_crypt = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
@@ -10058,14 +8546,14 @@ _ACEOF
   LIBS="-lcrypt $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5
-$as_echo "$as_me: error: libcrypt not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5
+echo "$as_me: error: libcrypt not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     else
-        { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-$as_echo "no, dynamically open it" >&6; }
+        echo "$as_me:$LINENO: result: no, dynamically open it" >&5
+echo "${ECHO_T}no, dynamically open it" >&6
         CRYPT_LINK=NO
     fi
 fi
@@ -10084,24 +8572,20 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
 fi
 
 if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=cpp
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
   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_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -10112,40 +8596,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
 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_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -10156,89 +8638,60 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   test -n "$ac_ct_CXX" && break
 done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
+  CXX=$ac_ct_CXX
 fi
 
-  fi
-fi
+
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$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 "$ac_compiler --version >&5") 2>&5
+echo "$as_me:$LINENO:" \
+     "checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&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 "$ac_compiler -v >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&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 "$ac_compiler -V >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ $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_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -10257,54 +8710,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+ac_compiler_gnu=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -10320,136 +8760,132 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
-
+exit (42);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$ac_declaration
 int
 main ()
 {
-
+exit (42);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10459,30 +8895,29 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5
-$as_echo_n "checking the GNU C++ compiler version... " >&6; }
+   echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5
+echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6
 
    _gpp_version=`$CXX -dumpversion`
    _gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'`
    _gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'`
 
-   { $as_echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5
-$as_echo "checked (g++ $_gpp_version)" >&6; }
+   echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5
+echo "${ECHO_T}checked (g++ $_gpp_version)" >&6
 
    if test "$_gpp_major" = "3"; then
       if test "$_gpp_minor" = "4"; then
-         { $as_echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5
-$as_echo_n "checking whether $CXX has the enum bug... " >&6; }
+         echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5
+echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -10512,44 +8947,30 @@ main (void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
-  { { $as_echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5
-$as_echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;}
+  { { echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5
+echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;}
    { (exit 1); exit 1; }; }
 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 )
-{ $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
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
       fi
    fi
 fi
@@ -10557,8 +8978,8 @@ fi
 # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
 # often contains an i386 which is expanded as a macro. Solved in stlport.
 if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking for g++ include path" >&5
-$as_echo_n "checking for g++ include path... " >&6; }
+   echo "$as_me:$LINENO: checking for g++ include path" >&5
+echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6
    if test -z "$with_gxx_include_path"; then
       with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
       if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
@@ -10572,18 +8993,18 @@ $as_echo_n "checking for g++ include path... " >&6; }
 fi
 if test -z "$with_gxx_include_path"; then
    with_gxx_include_path="NO_GXX_INCLUDE"
-   { $as_echo "$as_me:$LINENO: result: no g++ includes" >&5
-$as_echo "no g++ includes" >&6; }
+   echo "$as_me:$LINENO: result: no g++ includes" >&5
+echo "${ECHO_T}no g++ includes" >&6
 else
-   { $as_echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5
-$as_echo "$with_gxx_include_path" >&6; }
+   echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5
+echo "${ECHO_T}$with_gxx_include_path" >&6
 fi
 GXX_INCLUDE_PATH="$with_gxx_include_path"
 
 
 if test "$WITH_MINGWIN" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5
-$as_echo_n "checking for mingwin runtime include path... " >&6; }
+   echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5
+echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6
    cat >conftest.$ac_ext <<_ACEOF
 #include <stddef.h>
 #include <bits/c++config.h>
@@ -10601,11 +9022,11 @@ _ACEOF
    fi
    if test -z "$_mingw_lib_include_path"; then
       _mingw_lib_include_path="NO_LIB_INCLUDE"
-      { $as_echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5
-$as_echo "no mingwin runtime includes" >&6; }
+      echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5
+echo "${ECHO_T}no mingwin runtime includes" >&6
    else
-      { $as_echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
-$as_echo "$_mingw_lib_include_path" >&6; }
+      echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
+echo "${ECHO_T}$_mingw_lib_include_path" >&6
    fi
 MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
 
@@ -10613,66 +9034,66 @@ fi
 
 if test "$_os" = "SunOS"; then
       if test "$CC" = "cc"; then
-   { $as_echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5
-$as_echo_n "checking SunStudio C++ Compiler... " >&6; }
+   echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5
+echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6
       if test "$CXX" != "CC"; then
-         { $as_echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5
-$as_echo "$as_me: WARNING: SunStudio C++ was not found" >&2;}
+         { echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5
+echo "$as_me: WARNING: SunStudio C++ was not found" >&2;}
          echo "SunStudio C++ was not found" >> warn
       else
-         { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+         echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
       fi
    fi
 fi
 if test "$_os" = "Darwin"; then
       if test "$CC" = "cc"; then
-      { $as_echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5
-$as_echo_n "checking Macosx c++ Compiler... " >&6; }
+      echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5
+echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6
       if test "$CXX" != "c++"; then
-         { $as_echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
-$as_echo "$as_me: WARNING: Macosx C++ was not found" >&2;}
+         { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
+echo "$as_me: WARNING: Macosx C++ was not found" >&2;}
          echo "Macosx C++ was not found" >> warn
       else
-         { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+         echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
       fi
    fi
 fi
 if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
       if test "$CC" = "cc"; then
-      { $as_echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5
-$as_echo_n "checking SGI MIPSpro C++ Compiler... " >&6; }
+      echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5
+echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6
       if test "$CXX" != "CC"; then
-         { $as_echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
-$as_echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
+         { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
+echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
          echo "SGI MIPSpro C++ was not found" >> warn
       else
-         { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+         echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
       fi
    fi
 fi
 if test "$_os" = "OSF1"; then
-   { $as_echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5
-$as_echo_n "checking Compaq C++ compiler version... " >&6; }
+   echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5
+echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6
       _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
    _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
    if test "$_compaqcxx_major" != "V6"; then
-      { $as_echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5
-$as_echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;}
+      { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5
+echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;}
       echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
    else
-            { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+            echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
    fi
 fi
 
 if test "$_os" = "SunOS"; then
    _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
    if test "$_os_release" = "7"; then
-                        { $as_echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5
-$as_echo_n "checking for patch 106327-06 or greater... " >&6; }
+                        echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5
+echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6
       _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
       _patch="false"
       for i in $_temp
@@ -10686,15 +9107,15 @@ $as_echo_n "checking for patch 106327-06 or greater... " >&6; }
         fi
       done
       if test "$_patch" = "found"; then
-         { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+         echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
       else
-         { $as_echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
-$as_echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;}
+         { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
+echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;}
          echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn
       fi
-                        { $as_echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5
-$as_echo_n "checking for patch 106950-11 or greater... " >&6; }
+                        echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5
+echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6
       _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
       _patch="false"
       for i in $_temp
@@ -10708,17 +9129,17 @@ $as_echo_n "checking for patch 106950-11 or greater... " >&6; }
          fi
       done
       if test "$_patch" = "found"; then
-         { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+         echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
       else
-         { $as_echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
-$as_echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;}
+         { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
+echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;}
          echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn
       fi
    else
       if test "$_os_release" = "6"; then
-                                    { $as_echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5
-$as_echo_n "checking for patch 105591-09 or greater... " >&6; }
+                                    echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5
+echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6
          _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
          _patch="false"
          for i in $_temp
@@ -10732,15 +9153,15 @@ $as_echo_n "checking for patch 105591-09 or greater... " >&6; }
            fi
          done
          if test "$_patch" = "found"; then
-            { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+            echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
          else
-            { $as_echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
-$as_echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;}
+            { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
+echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;}
             echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn
          fi
-                                    { $as_echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5
-$as_echo_n "checking for patch 107733-08 or greater... " >&6; }
+                                    echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5
+echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6
          _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
          _patch="false"
          for i in $_temp
@@ -10754,11 +9175,11 @@ $as_echo_n "checking for patch 107733-08 or greater... " >&6; }
            fi
          done
          if test "$_patch" = "found"; then
-            { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+            echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
          else
-            { $as_echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
-$as_echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;}
+            { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
+echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;}
             echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn
          fi
       fi
@@ -10767,25 +9188,25 @@ fi
 
 if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then
 	if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-		{ $as_echo "$as_me:$LINENO: checking for SGI STL" >&5
-$as_echo_n "checking for SGI STL... " >&6; }
+		echo "$as_me:$LINENO: checking for SGI STL" >&5
+echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6
 		if test -d /usr/include/CC ; 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
 
 		else
-			{ $as_echo "$as_me:$LINENO: result: not found." >&5
-$as_echo "not found." >&6; }
+			echo "$as_me:$LINENO: result: not found." >&5
+echo "${ECHO_T}not found." >&6
 		fi
 	else
-		{ { $as_echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5
-$as_echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;}
+		{ { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5
+echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
 
-   { $as_echo "$as_me:$LINENO: checking what the default STL should be" >&5
-$as_echo_n "checking what the default STL should be... " >&6; }
+   echo "$as_me:$LINENO: checking what the default STL should be" >&5
+echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6
    DEFAULT_TO_STLPORT="no"
    if test "$_os" = "Linux"; then
      case "$build_cpu" in
@@ -10806,41 +9227,42 @@ $as_echo_n "checking what the default STL should be... " >&6; }
       DEFAULT_TO_STLPORT="yes"
    fi
    if test "$DEFAULT_TO_STLPORT" = "yes"; then
-      { $as_echo "$as_me:$LINENO: result: stlport" >&5
-$as_echo "stlport" >&6; }
+      echo "$as_me:$LINENO: result: stlport" >&5
+echo "${ECHO_T}stlport" >&6
    else
-      { $as_echo "$as_me:$LINENO: result: system" >&5
-$as_echo "system" >&6; }
+      echo "$as_me:$LINENO: result: system" >&5
+echo "${ECHO_T}system" >&6
    fi
    if test "$WITH_STLPORT" = "auto"; then
       WITH_STLPORT=$DEFAULT_TO_STLPORT
    fi
 
-   { $as_echo "$as_me:$LINENO: checking for STL providing headers" >&5
-$as_echo_n "checking for STL providing headers... " >&6; }
+   echo "$as_me:$LINENO: checking for STL providing headers" >&5
+echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6
    STLPORT4=""
    USE_SYSTEM_STL=""
    if test "$WITH_STLPORT" = "yes"; then
-      { $as_echo "$as_me:$LINENO: result: using internal stlport." >&5
-$as_echo "using internal stlport." >&6; }
+      echo "$as_me:$LINENO: result: using internal stlport." >&5
+echo "${ECHO_T}using internal stlport." >&6
       if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { $as_echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
+         { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
+echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
          echo "using stlport. Warning, breaks your ABI compatability!" >>warn
       fi
    elif test "$WITH_STLPORT" = "no"; then
-      { $as_echo "$as_me:$LINENO: result: using system STL" >&5
-$as_echo "using system STL" >&6; }
+      echo "$as_me:$LINENO: result: using system STL" >&5
+echo "${ECHO_T}using system STL" >&6
       USE_SYSTEM_STL="YES"
       if test "$DEFAULT_TO_STLPORT" != "no"; then
-         { $as_echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;}
+         { echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
+echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;}
          echo "using system STL. Warning, breaks your ABI compatability!" >>warn
       fi
    else
       STLPORT4=$WITH_STLPORT
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
          cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -10848,110 +9270,109 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $STLPORT4/stlport/hash_map
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  { $as_echo "$as_me:$LINENO: result: checked." >&5
-$as_echo "checked." >&6; }
-else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6
+else
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5
-$as_echo "$as_me: error: STLport headers not found." >&2;}
+  { { echo "$as_me:$LINENO: error: STLport headers not found." >&5
+echo "$as_me: error: STLport headers not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
-
 rm -f conftest.err conftest.$ac_ext
       else
                   if test -f "$STLPORT4/stlport/hash_map"; then
-            { $as_echo "$as_me:$LINENO: result: checked." >&5
-$as_echo "checked." >&6; }
+            echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6
          else
-            { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5
-$as_echo "$as_me: error: STLport headers not found." >&2;}
+            { { echo "$as_me:$LINENO: error: STLport headers not found." >&5
+echo "$as_me: error: STLport headers not found." >&2;}
    { (exit 1); exit 1; }; }
          fi
       fi
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         { $as_echo "$as_me:$LINENO: checking for STLport libraries" >&5
-$as_echo_n "checking for STLport libraries... " >&6; }
+         echo "$as_me:$LINENO: checking for STLport libraries" >&5
+echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6
          if test "$_os" = "SunOS"; then
 		      if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
-			      { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+			      echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 		      elif test -f "$STLPORT4/lib/libstlport.so"; then
-			      { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+			      echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 			      STLPORT_VER=500
 		      else
-			      { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-$as_echo "$as_me: error: STLport libraries not found" >&2;}
+			      { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+echo "$as_me: error: STLport libraries not found" >&2;}
    { (exit 1); exit 1; }; }
 		      fi
 	      elif test "$_os" = "Darwin"; then
 		      if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-			      { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+			      echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 		      elif test -f "$STLPORT4/lib/libstlport.dylib"; then
-			      { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+			      echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 			      STLPORT_VER=500
 		      else
-			      { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-$as_echo "$as_me: error: STLport libraries not found" >&2;}
+			      { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+echo "$as_me: error: STLport libraries not found" >&2;}
    { (exit 1); exit 1; }; }
 		      fi
 	      elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
 		      if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
-			      { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+			      echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 			   else
 				   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-					   { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+					   echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 				   elif test -f "$STLPORT4/lib/libstlport.so"; then
-					   { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+					   echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 					   STLPORT_VER=500
 				   else
-					   { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-$as_echo "$as_me: error: STLport libraries not found" >&2;}
+					   { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+echo "$as_me: error: STLport libraries not found" >&2;}
    { (exit 1); exit 1; }; }
 				   fi
 			   fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				   { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+				   echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 			   elif test -f "$STLPORT4/lib/libstlport.so"; then
-				   { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
+				   echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
 				   STLPORT_VER=500
 			   else
-				   { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-$as_echo "$as_me: error: STLport libraries not found" >&2;}
+				   { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+echo "$as_me: error: STLport libraries not found" >&2;}
    { (exit 1); exit 1; }; }
 			   fi
 		   fi
 	   fi
       if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { $as_echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
+         { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
+echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
          echo "using stlport. Warning, breaks your ABI compatability!" >>warn
       fi
    fi
@@ -10968,11 +9389,12 @@ fi
 
 
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5
-$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
+   echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5
+echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6
    save_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -fvisibility=hidden"
    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -10988,51 +9410,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
    HAVE_GCC_VISIBILITY_FEATURE=TRUE
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    CFLAGS=$save_CFLAGS
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; 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
    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
 fi
 
 if test "$USE_SYSTEM_STL" = "YES"; then
-   { $as_echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5
-$as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; }
-   ac_ext=cpp
+   echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5
+echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -11041,6 +9450,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11058,47 +9468,41 @@ hash_map<int, int> t; return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_cxx_have_ext_hash_map=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_cxx_have_ext_hash_map=no
+ac_cv_cxx_have_ext_hash_map=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      { { $as_echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5
-$as_echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;}
+      { { echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5
+echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;}
    { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
-$as_echo "$ac_cv_cxx_have_ext_hash_map" >&6; }
+      echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6
    fi
 
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5
-$as_echo_n "checking if STL headers are visibility safe... " >&6; }
+      echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5
+echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11115,11 +9519,11 @@ else
 fi
 rm -f conftest*
 
-      { $as_echo "$as_me:$LINENO: result: $stlvisok" >&5
-$as_echo "$stlvisok" >&6; }
+      echo "$as_me:$LINENO: result: $stlvisok" >&5
+echo "${ECHO_T}$stlvisok" >&6
       if test "$stlvisok" = "no"; then
-         { $as_echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5
-$as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;}
+         { echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5
+echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;}
          echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
          unset HAVE_GCC_VISIBILITY_FEATURE
       fi
@@ -11129,9 +9533,10 @@ $as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabli
       sharedlink_ldflags_save=$LDFLAGS
       LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
 
-      { $as_echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
-$as_echo_n "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... " >&6; }
+      echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
+echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6
       cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11149,43 +9554,31 @@ istringstream strm( "test" ); return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   $EGREP -q  unresolvable conftest.err;
       if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gccvisok=no
+gccvisok=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-      { $as_echo "$as_me:$LINENO: result: $gccvisok" >&5
-$as_echo "$gccvisok" >&6; }
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+      echo "$as_me:$LINENO: result: $gccvisok" >&5
+echo "${ECHO_T}$gccvisok" >&6
       if test "$gccvisok" = "no"; then
-         { $as_echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5
-$as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;}
+         { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5
+echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;}
          echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
          unset HAVE_GCC_VISIBILITY_FEATURE
       fi
@@ -11194,8 +9587,8 @@ $as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Dis
    fi
 
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
-$as_echo_n "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; }
+      echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
+echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6
       cat >visibility.cxx <<_ACEOF
 #pragma GCC visibility push(hidden)
 struct __attribute__ ((visibility ("default"))) TestStruct {
@@ -11216,11 +9609,11 @@ _ACEOF
       fi
       rm -f visibility.s
 
-      { $as_echo "$as_me:$LINENO: result: $gccvisbroken" >&5
-$as_echo "$gccvisbroken" >&6; }
+      echo "$as_me:$LINENO: result: $gccvisbroken" >&5
+echo "${ECHO_T}$gccvisbroken" >&6
       if test "$gccvisbroken" = "yes"; then
-         { $as_echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5
-$as_echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;}
+         { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5
+echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;}
          echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn
          unset HAVE_GCC_VISIBILITY_FEATURE
       fi
@@ -11236,11 +9629,11 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which memory allocator to use" >&5
-$as_echo_n "checking which memory allocator to use... " >&6; }
+echo "$as_me:$LINENO: checking which memory allocator to use" >&5
+echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6
 if test "$with_alloc" = "system"; then
-    { $as_echo "$as_me:$LINENO: result: system" >&5
-$as_echo "system" >&6; }
+    echo "$as_me:$LINENO: result: system" >&5
+echo "${ECHO_T}system" >&6
     ALLOC="SYS_ALLOC";
 
 
@@ -11248,99 +9641,82 @@ $as_echo "system" >&6; }
 
 for ac_func in malloc realloc calloc free
 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; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&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 eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
 int
 main ()
 {
-return $ac_func ();
+return f != $ac_func;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   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"
+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
+rm -f conftest.$ac_objext 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; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&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
@@ -11348,80 +9724,69 @@ done
 
 fi
 if test "$with_alloc" = "tcmalloc"; then
-    { $as_echo "$as_me:$LINENO: result: tcmalloc" >&5
-$as_echo "tcmalloc" >&6; }
+    echo "$as_me:$LINENO: result: tcmalloc" >&5
+echo "${ECHO_T}tcmalloc" >&6
     if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
-        { { $as_echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5
-$as_echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;}
+        { { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5
+echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-{ $as_echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5
-$as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
+echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5
+echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltcmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char malloc ();
 int
 main ()
 {
-return malloc ();
+malloc ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_tcmalloc_malloc=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_lib_tcmalloc_malloc=no
+ac_cv_lib_tcmalloc_malloc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5
-$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }
-if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5
+echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6
+if test $ac_cv_lib_tcmalloc_malloc = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTCMALLOC 1
 _ACEOF
@@ -11429,46 +9794,46 @@ _ACEOF
   LIBS="-ltcmalloc $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5
-$as_echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;}
+  { { echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5
+echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     ALLOC="TCMALLOC";
 fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to add custom build version" >&5
-$as_echo_n "checking whether to add custom build version... " >&6; }
+echo "$as_me:$LINENO: checking whether to add custom build version" >&5
+echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6
 if test "z$with_build_version" != "z"; then
    BUILD_VER_STRING=$with_build_version
-   { $as_echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5
-$as_echo "yes, $BUILD_VER_STRING" >&6; }
+   echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5
+echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6
 else
    BUILD_VER_STRING=
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build with Java support" >&5
-$as_echo_n "checking whether to build with Java support... " >&6; }
+echo "$as_me:$LINENO: checking whether to build with Java support" >&5
+echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6
 if test "$WITH_JAVA" != "no"; 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
    SOLAR_JAVA="TRUE"
 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
    SOLAR_JAVA=""
 
-   { $as_echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5
-$as_echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;}
+   { echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5
+echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;}
    echo "building without java will mean some features will not be available" >>warn
 fi
 
@@ -11495,10 +9860,10 @@ if test "$SOLAR_JAVA" != ""; then
    if test -z "$with_jdk_home"; then
       # Extract the first word of "$WITH_JAVA", so it can be a program name with args.
 set dummy $WITH_JAVA; 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_JAVAINTERPRETER+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVAINTERPRETER in
   [\\/]* | ?:[\\/]*)
@@ -11511,35 +9876,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVAINTERPRETER="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
+
 if test -n "$JAVAINTERPRETER"; then
-  { $as_echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
-$as_echo "$JAVAINTERPRETER" >&6; }
+  echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
+echo "${ECHO_T}$JAVAINTERPRETER" >&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
 
-
    else
       _java_path="$with_jdk_home/bin/$WITH_JAVA"
             if test -x "$_java_path"; then
          JAVAINTERPRETER=$_java_path
       else
-         { { $as_echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5
-$as_echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;}
+         { { echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5
+echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
@@ -11554,12 +9918,12 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
    _gij_longver=0
-   { $as_echo "$as_me:$LINENO: checking the installed JDK" >&5
-$as_echo_n "checking the installed JDK... " >&6; }
+   echo "$as_me:$LINENO: checking the installed JDK" >&5
+echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
    if test -n "$JAVAINTERPRETER"; then
             if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-         { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
-$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
+         { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
+echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
    { (exit 1); exit 1; }; }
 #        dnl Kaffe specific tests
 #        KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP "  Version:" | $SED -r "s/.*  Version: ([[0-9\.]]*).*/\1/"`
@@ -11580,14 +9944,14 @@ $as_echo "$as_me: error: No valid check available. Please check the block for yo
 #        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
       elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
         JDK=gcj
-        { $as_echo "$as_me:$LINENO: result: checked (gcj)" >&5
-$as_echo "checked (gcj)" >&6; }
+        echo "$as_me:$LINENO: result: checked (gcj)" >&5
+echo "${ECHO_T}checked (gcj)" >&6
         _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
         _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
       elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
-         { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
-$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
+         { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
+echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
    { (exit 1); exit 1; }; }
 #        JDK=bea
 #
@@ -11618,18 +9982,18 @@ $as_echo "$as_me: error: No valid check available. Please check the block for yo
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10600; then
-             { { $as_echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5
-$as_echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;}
+             { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5
+echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;}
    { (exit 1); exit 1; }; }
         fi
 
-        { $as_echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5
-$as_echo "checked (IBM JDK $_jdk)" >&6; }
+        echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5
+echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6
 
         if test "$with_jdk_home" = ""; then
-             { { $as_echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK,
+             { { echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK,
 you must use the \"--with-jdk-home\" configure option explicitly" >&5
-$as_echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK,
+echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK,
 you must use the \"--with-jdk-home\" configure option explicitly" >&2;}
    { (exit 1); exit 1; }; }
         fi
@@ -11643,12 +10007,12 @@ you must use the \"--with-jdk-home\" configure option explicitly" >&2;}
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             { { $as_echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5
-$as_echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;}
+             { { echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5
+echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;}
    { (exit 1); exit 1; }; }
         fi
-        { $as_echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
-$as_echo "checked (JDK $_jdk)" >&6; }
+        echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
+echo "${ECHO_T}checked (JDK $_jdk)" >&6
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
         if test "$_os" = "WINNT"; then
           JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"`
@@ -11658,8 +10022,8 @@ $as_echo "checked (JDK $_jdk)" >&6; }
         fi
       fi
    else
-      { { $as_echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5
-$as_echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;}
+      { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5
+echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;}
    { (exit 1); exit 1; }; }
    fi
 else
@@ -11680,10 +10044,10 @@ if test "$SOLAR_JAVA" != ""; then
     if test -z "$with_jdk_home"; then
         # Extract the first word of "$javacompiler", so it can be a program name with args.
 set dummy $javacompiler; 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_JAVACOMPILER+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVACOMPILER in
   [\\/]* | ?:[\\/]*)
@@ -11696,28 +10060,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVACOMPILER="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVACOMPILER=$ac_cv_path_JAVACOMPILER
+
 if test -n "$JAVACOMPILER"; then
-  { $as_echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
-$as_echo "$JAVACOMPILER" >&6; }
+  echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
+echo "${ECHO_T}$JAVACOMPILER" >&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
 
-
     else
         _javac_path="$with_jdk_home/bin/$javacompiler"
                 if test -x "$_javac_path"; then
@@ -11725,8 +10088,8 @@ fi
         fi
     fi
     if test -z "$JAVACOMPILER"; then
-      { { $as_echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5
-$as_echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
+      { { echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5
+echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
    { (exit 1); exit 1; }; }
     fi
     if test "$_os" = "WINNT"; then
@@ -11743,11 +10106,11 @@ $as_echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
     fi
 
     if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
-        { $as_echo "$as_me:$LINENO: checking re-checking JDK" >&5
-$as_echo_n "checking re-checking JDK... " >&6; }
+        echo "$as_me:$LINENO: checking re-checking JDK" >&5
+echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6
         JDK=gcj
-        { $as_echo "$as_me:$LINENO: result: checked (ecj)" >&5
-$as_echo "checked (ecj)" >&6; }
+        echo "$as_me:$LINENO: result: checked (ecj)" >&5
+echo "${ECHO_T}checked (ecj)" >&6
         #TODO: what's to do here? some switch to do 1.5 compiling?
         JAVAFLAGS="-source 1.5 -target 1.5"
         _gij_longver="50000"
@@ -11766,10 +10129,10 @@ if test "$SOLAR_JAVA" != ""; then
     if test -z "$with_jdk_home"; then
         # Extract the first word of "javadoc", so it can be a program name with args.
 set dummy javadoc; 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_JAVADOC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVADOC in
   [\\/]* | ?:[\\/]*)
@@ -11782,28 +10145,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVADOC="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
+
 if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5
-$as_echo "$JAVADOC" >&6; }
+  echo "$as_me:$LINENO: result: $JAVADOC" >&5
+echo "${ECHO_T}$JAVADOC" >&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
 
-
     else
         _javadoc_path="$with_jdk_home/bin/javadoc"
         if test "$_os" = "OS2"; then
@@ -11816,10 +10178,10 @@ fi
         else
             # Extract the first word of "javadoc", so it can be a program name with args.
 set dummy javadoc; 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_JAVADOC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVADOC in
   [\\/]* | ?:[\\/]*)
@@ -11832,33 +10194,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVADOC="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
+
 if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5
-$as_echo "$JAVADOC" >&6; }
+  echo "$as_me:$LINENO: result: $JAVADOC" >&5
+echo "${ECHO_T}$JAVADOC" >&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
 
-
         fi
     fi
     if test -z "$JAVADOC"; then
-      { { $as_echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5
-$as_echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;}
+      { { echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5
+echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;}
    { (exit 1); exit 1; }; }
     fi
     if test "$_os" = "WINNT"; then
@@ -11891,36 +10252,36 @@ class findhome
     }
 }
 _ACEOF
-        { $as_echo "$as_me:$LINENO: checking if javac works" >&5
-$as_echo_n "checking if javac works... " >&6; }
+        echo "$as_me:$LINENO: checking if javac works" >&5
+echo $ECHO_N "checking if javac works... $ECHO_C" >&6
         javac_cmd="$JAVACOMPILER findhome.java 1>&2"
         { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
   (eval $javac_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         if test $? = 0 && test -f ./findhome.class ; then
-          { $as_echo "$as_me:$LINENO: result: javac works" >&5
-$as_echo "javac works" >&6; }
+          echo "$as_me:$LINENO: result: javac works" >&5
+echo "${ECHO_T}javac works" >&6
         else
           echo "configure: javac test failed" >&5
           cat findhome.java >&5
-          { { $as_echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5
-$as_echo "$as_me: error: javac does not work - java projects will not build!" >&2;}
+          { { echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5
+echo "$as_me: error: javac does not work - java projects will not build!" >&2;}
    { (exit 1); exit 1; }; }
         fi
 
-        { $as_echo "$as_me:$LINENO: checking if gij knows its java.home" >&5
-$as_echo_n "checking if gij knows its java.home... " >&6; }
+        echo "$as_me:$LINENO: checking if gij knows its java.home" >&5
+echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6
         JAVA_HOME=`$JAVAINTERPRETER findhome`
         if test $? = 0 && test "$JAVA_HOME" != "" ; then
-          { $as_echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
-$as_echo "$JAVA_HOME" >&6; }
+          echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
+echo "${ECHO_T}$JAVA_HOME" >&6
         else
           echo "configure: java test failed" >&5
           cat findhome.java >&5
-          { { $as_echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5
-$as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;}
+          { { echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5
+echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;}
    { (exit 1); exit 1; }; }
         fi
       else
@@ -11943,10 +10304,10 @@ $as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home"
             JAVA_HOME=$(readlink $JAVACOMPILER)
          else
           # else warn
-          { $as_echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
-$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;}
-          { $as_echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
-$as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;}
+          { echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
+echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;}
+          { echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
+echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;}
           echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
           echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
           fi
@@ -11968,12 +10329,12 @@ $as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_H
          JAVA_HOME_OK="NO"
       fi
       if test "$JAVA_HOME_OK" = "NO"; then
-         { $as_echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5
-$as_echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;}
-         { $as_echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5
-$as_echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;}
-         { $as_echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5
-$as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;}
+         { echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5
+echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;}
+         { echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5
+echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;}
+         { echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5
+echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;}
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
@@ -11986,8 +10347,8 @@ fi
 
 AWTLIB=
 if test "$SOLAR_JAVA" != ""; then
-   { $as_echo "$as_me:$LINENO: checking for jawt lib name" >&5
-$as_echo_n "checking for jawt lib name... " >&6; }
+   echo "$as_me:$LINENO: checking for jawt lib name" >&5
+echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6
    if test "$JDK" = "gcj"; then
       save_CFLAGS=$CFLAGS
       save_LDFLAGS=$LDFLAGS
@@ -11995,18 +10356,19 @@ $as_echo_n "checking for jawt lib name... " >&6; }
       LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
       exec 6>/dev/null # no output
       if test "${ac_cv_header_jni_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for jni.h" >&5
-$as_echo_n "checking for jni.h... " >&6; }
+  echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
 if test "${ac_cv_header_jni_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-$as_echo "$ac_cv_header_jni_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5
-$as_echo_n "checking jni.h usability... " >&6; }
+echo "$as_me:$LINENO: checking jni.h usability" >&5
+echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12016,39 +10378,33 @@ $ac_includes_default
 #include <jni.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5
-$as_echo_n "checking jni.h presence... " >&6; }
+echo "$as_me:$LINENO: checking jni.h presence" >&5
+echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12056,146 +10412,142 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <jni.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5
-$as_echo_n "checking for jni.h... " >&6; }
+echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
 if test "${ac_cv_header_jni_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_jni_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-$as_echo "$ac_cv_header_jni_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6
 
 fi
-if test "x$ac_cv_header_jni_h" = x""yes; then
+if test $ac_cv_header_jni_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5
-$as_echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;}
+  { { echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5
+echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-      { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; }
+      echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
+echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6
 if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgcjawt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char JAWT_GetAWT ();
 int
 main ()
 {
-return JAWT_GetAWT ();
+JAWT_GetAWT ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_gcjawt_JAWT_GetAWT=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_lib_gcjawt_JAWT_GetAWT=no
+ac_cv_lib_gcjawt_JAWT_GetAWT=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
-$as_echo "$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
+echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6
+if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then
    AWTLIB="-lgcjawt -lgcj"
 fi
 
@@ -12215,18 +10567,19 @@ fi
       export LD_LIBRARY_PATH
       exec 6>/dev/null # no output
       if test "${ac_cv_header_jni_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for jni.h" >&5
-$as_echo_n "checking for jni.h... " >&6; }
+  echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
 if test "${ac_cv_header_jni_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-$as_echo "$ac_cv_header_jni_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5
-$as_echo_n "checking jni.h usability... " >&6; }
+echo "$as_me:$LINENO: checking jni.h usability" >&5
+echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12236,39 +10589,33 @@ $ac_includes_default
 #include <jni.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5
-$as_echo_n "checking jni.h presence... " >&6; }
+echo "$as_me:$LINENO: checking jni.h presence" >&5
+echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12276,217 +10623,202 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <jni.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5
-$as_echo_n "checking for jni.h... " >&6; }
+echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
 if test "${ac_cv_header_jni_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_jni_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-$as_echo "$ac_cv_header_jni_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6
 
 fi
-if test "x$ac_cv_header_jni_h" = x""yes; then
+if test $ac_cv_header_jni_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: jni.h could not be found." >&5
-$as_echo "$as_me: error: jni.h could not be found." >&2;}
+  { { echo "$as_me:$LINENO: error: jni.h could not be found." >&5
+echo "$as_me: error: jni.h could not be found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-      { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; }
+      echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
+echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6
 if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljawt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char JAWT_GetAWT ();
 int
 main ()
 {
-return JAWT_GetAWT ();
+JAWT_GetAWT ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_jawt_JAWT_GetAWT=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_lib_jawt_JAWT_GetAWT=no
+ac_cv_lib_jawt_JAWT_GetAWT=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
-$as_echo "$ac_cv_lib_jawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_jawt_JAWT_GetAWT" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
+echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6
+if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then
    AWTLIB="-ljawt"
 fi
 
       if test -z "$AWTLIB"; then
          LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
-         { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; }
+         echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5
+echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6
 if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmawt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char JAWT_GetAWT ();
 int
 main ()
 {
-return JAWT_GetAWT ();
+JAWT_GetAWT ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_mawt_JAWT_GetAWT=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_lib_mawt_JAWT_GetAWT=no
+ac_cv_lib_mawt_JAWT_GetAWT=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
-$as_echo "$ac_cv_lib_mawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
+echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6
+if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then
    AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"
 fi
 
@@ -12499,24 +10831,24 @@ fi
    if test -z "$AWTLIB"; then
       AWTLIB=-ljawt
    fi
-   { $as_echo "$as_me:$LINENO: result: $AWTLIB" >&5
-$as_echo "$AWTLIB" >&6; }
+   echo "$as_me:$LINENO: result: $AWTLIB" >&5
+echo "${ECHO_T}$AWTLIB" >&6
 
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-  { $as_echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5
-$as_echo_n "checking whether to enable gcj aot compilation... " >&6; }
+  echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5
+echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6
   if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; 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
      if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
         gcjaot="gcj"
      else
         gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
      fi
-     { $as_echo "$as_me:$LINENO: result: $gcjaot" >&5
-$as_echo "$gcjaot" >&6; }
+     echo "$as_me:$LINENO: result: $gcjaot" >&5
+echo "${ECHO_T}$gcjaot" >&6
      if test -n "$with_jdk_home"; then
         _javac_path="$with_jdk_home/bin/$gcjaot"
                 if test -x "$_javac_path"; then
@@ -12526,10 +10858,10 @@ $as_echo "$gcjaot" >&6; }
      if test -z "$JAVAAOTCOMPILER"; then
         # Extract the first word of "$gcjaot", so it can be a program name with args.
 set dummy $gcjaot; 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_JAVAAOTCOMPILER+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVAAOTCOMPILER in
   [\\/]* | ?:[\\/]*)
@@ -12542,36 +10874,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_JAVAAOTCOMPILER="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER
+
 if test -n "$JAVAAOTCOMPILER"; then
-  { $as_echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5
-$as_echo "$JAVAAOTCOMPILER" >&6; }
+  echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5
+echo "${ECHO_T}$JAVAAOTCOMPILER" >&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
 
-
      fi
      if test -z "$JAVAAOTCOMPILER"; then
-        { $as_echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5
-$as_echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;}
+        { echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5
+echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;}
      fi
   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
 fi
 
@@ -12587,10 +10918,10 @@ fi
 
 # Extract the first word of "dmake", so it can be a program name with args.
 set dummy dmake; 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_DMAKE+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $DMAKE in
   [\\/]* | ?:[\\/]*)
@@ -12603,35 +10934,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_DMAKE="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no"
   ;;
 esac
 fi
 DMAKE=$ac_cv_path_DMAKE
+
 if test -n "$DMAKE"; then
-  { $as_echo "$as_me:$LINENO: result: $DMAKE" >&5
-$as_echo "$DMAKE" >&6; }
+  echo "$as_me:$LINENO: result: $DMAKE" >&5
+echo "${ECHO_T}$DMAKE" >&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 "$DMAKE" = "no"; then
     BUILD_DMAKE=YES
     echo "dmake will be built on ./bootstrap"
 else
-    { $as_echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5
-$as_echo_n "checking whether the found dmake is the right dmake... " >&6; }
+    echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5
+echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6
     # we need to find out whether that dmake we found is "our" dmake
     # or the dmake from Sun's SunStudio Compiler which is something
     # different
@@ -12640,48 +10970,48 @@ $as_echo_n "checking whether the found dmake is the right dmake... " >&6; }
     $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
     if test $? -eq 0; then
        BUILD_DMAKE=NO
-       { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-       { $as_echo "$as_me:$LINENO: checking the dmake version" >&5
-$as_echo_n "checking the dmake version... " >&6; }
+       echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       echo "$as_me:$LINENO: checking the dmake version" >&5
+echo $ECHO_N "checking the dmake version... $ECHO_C" >&6
        DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
        if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-	 { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
-$as_echo "OK, >= 4.11" >&6; }
+	 echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
+echo "${ECHO_T}OK, >= 4.11" >&6
        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
 	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-	 { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
-$as_echo "OK, >= 4.11" >&6; }
+	 echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
+echo "${ECHO_T}OK, >= 4.11" >&6
        else
-	 { $as_echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5
-$as_echo "too old. >= 4.11 is needed" >&6; }
+	 echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5
+echo "${ECHO_T}too old. >= 4.11 is needed" >&6
 	 echo "A newer dmake will be built on ./bootstrap"
 	 BUILD_DMAKE=YES
        fi
     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
        echo "dmake will be built on ./bootstrap"
        BUILD_DMAKE=YES
     fi
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5
-$as_echo_n "checking whether to enable EPM for packing... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5
+echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6
 if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; 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
             if test "$_os" != "WINNT"; then
       if test -n "$with_epm"; then
 	      EPM=$with_epm
       else
          # Extract the first word of "epm", so it can be a program name with args.
 set dummy epm; 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_EPM+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $EPM in
   [\\/]* | ?:[\\/]*)
@@ -12694,29 +11024,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_EPM="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no"
   ;;
 esac
 fi
 EPM=$ac_cv_path_EPM
+
 if test -n "$EPM"; then
-  { $as_echo "$as_me:$LINENO: result: $EPM" >&5
-$as_echo "$EPM" >&6; }
+  echo "$as_me:$LINENO: result: $EPM" >&5
+echo "${ECHO_T}$EPM" >&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
 
-
       fi
       if test "$EPM" = "no" || test "$EPM" = "internal"; then
          echo "EPM will be built."
@@ -12724,44 +11053,44 @@ fi
          BUILD_TYPE="$BUILD_TYPE EPM"
       else
          # Gentoo has some epm which is something different...
-         { $as_echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5
-$as_echo_n "checking whether the found epm is the right epm... " >&6; }
+         echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5
+echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6
          if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; 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
          else
-            { { $as_echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5
-$as_echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;}
+            { { echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5
+echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;}
    { (exit 1); exit 1; }; }
          fi
-         { $as_echo "$as_me:$LINENO: checking epm version" >&5
-$as_echo_n "checking epm version... " >&6; }
+         echo "$as_me:$LINENO: checking epm version" >&5
+echo $ECHO_N "checking epm version... $ECHO_C" >&6
          EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
 	 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
 	       test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
-           { $as_echo "$as_me:$LINENO: result: OK, >= 3.7" >&5
-$as_echo "OK, >= 3.7" >&6; }
+           echo "$as_me:$LINENO: result: OK, >= 3.7" >&5
+echo "${ECHO_T}OK, >= 3.7" >&6
            BUILD_EPM=NO
 	        if test "$_os" = "Darwin"; then
-               { $as_echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5
-$as_echo_n "checking which PackageMaker EPM thinks to use... " >&6; }
+               echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5
+echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6
         	      _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
         	      if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		      { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
-$as_echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
+          		      { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
+echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
    { (exit 1); exit 1; }; }
         	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		    { $as_echo "$as_me:$LINENO: result: $_pm, ok" >&5
-$as_echo "$_pm, ok" >&6; }
+          		    echo "$as_me:$LINENO: result: $_pm, ok" >&5
+echo "${ECHO_T}$_pm, ok" >&6
         	      else # we never should get here, but go safe
-			          { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
-$as_echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
+			          { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
+echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
    { (exit 1); exit 1; }; }
 		          fi
 	       fi
 	 else
-           { $as_echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5
-$as_echo "too old. epm >= 3.7 is required." >&6; }
+           echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5
+echo "${ECHO_T}too old. epm >= 3.7 is required." >&6
            echo "EPM will be built."
            BUILD_EPM=YES
            BUILD_TYPE="$BUILD_TYPE EPM"
@@ -12770,8 +11099,8 @@ $as_echo "too old. epm >= 3.7 is required." >&6; }
    fi
 
    # test which package format to use
-   { $as_echo "$as_me:$LINENO: checking which package format to use" >&5
-$as_echo_n "checking which package format to use... " >&6; }
+   echo "$as_me:$LINENO: checking which package format to use" >&5
+echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
    # epm supports the following formats:
    # aix - AIX software distribution
    # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
@@ -12819,8 +11148,8 @@ $as_echo_n "checking which package format to use... " >&6; }
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
-		{ { $as_echo "$as_me:$LINENO: error: unknown system" >&5
-$as_echo "$as_me: error: unknown system" >&2;}
+		{ { echo "$as_me:$LINENO: error: unknown system" >&5
+echo "$as_me: error: unknown system" >&2;}
    { (exit 1); exit 1; }; }
    esac
    if test -n "$with_package_format"; then
@@ -12829,7 +11158,7 @@ $as_echo "$as_me: error: unknown system" >&2;}
 			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable)
 			;;
 		*)
-			{ { $as_echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are:
+			{ { echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 depot or swinstall - HP-UX software distribution
@@ -12842,7 +11171,7 @@ setld - Tru64 (setld) software distribution
 native - \"Native\" software distribution for the platform
 portable - Portable software distribution
 			" >&5
-$as_echo "$as_me: error: unsupported format $i. Supported by EPM are:
+echo "$as_me: error: unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 depot or swinstall - HP-UX software distribution
@@ -12861,11 +11190,11 @@ portable - Portable software distribution
 	done
 	PKGFORMAT="$with_package_format"
    fi
-   { $as_echo "$as_me:$LINENO: result: $PKGFORMAT" >&5
-$as_echo "$PKGFORMAT" >&6; }
+   echo "$as_me:$LINENO: result: $PKGFORMAT" >&5
+echo "${ECHO_T}$PKGFORMAT" >&6
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
-      { $as_echo "$as_me:$LINENO: checking for rpm" >&5
-$as_echo_n "checking for rpm... " >&6; }
+      echo "$as_me:$LINENO: checking for rpm" >&5
+echo $ECHO_N "checking for rpm... $ECHO_C" >&6
       for a in "$RPM" rpmbuild rpm; do
          $a --usage >/dev/null 2> /dev/null
          if test $? -eq 0; then
@@ -12880,22 +11209,22 @@ $as_echo_n "checking for rpm... " >&6; }
          fi
        done
        if test -z "$RPM" ; then
-          { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
+          { { echo "$as_me:$LINENO: error: not found" >&5
+echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
        else
 	  RPM_PATH=`which $RPM`
-          { $as_echo "$as_me:$LINENO: result: $RPM_PATH" >&5
-$as_echo "$RPM_PATH" >&6; }
+          echo "$as_me:$LINENO: result: $RPM_PATH" >&5
+echo "${ECHO_T}$RPM_PATH" >&6
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
       # Extract the first word of "dpkg", so it can be a program name with args.
 set dummy dpkg; 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_DPKG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $DPKG in
   [\\/]* | ?:[\\/]*)
@@ -12908,50 +11237,49 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_DPKG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no"
   ;;
 esac
 fi
 DPKG=$ac_cv_path_DPKG
+
 if test -n "$DPKG"; then
-  { $as_echo "$as_me:$LINENO: result: $DPKG" >&5
-$as_echo "$DPKG" >&6; }
+  echo "$as_me:$LINENO: result: $DPKG" >&5
+echo "${ECHO_T}$DPKG" >&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 "$DPKG" = "no"; then
-         { { $as_echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5
-$as_echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;}
+         { { echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5
+echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
    if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
       if test "$_os" = "Darwin"; then
-         { $as_echo "$as_me:$LINENO: checking for PackageMaker availability" >&5
-$as_echo_n "checking for PackageMaker availability... " >&6; }
+         echo "$as_me:$LINENO: checking for PackageMaker availability" >&5
+echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6
          if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
-            { { $as_echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5
-$as_echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;}
+            { { echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5
+echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;}
    { (exit 1); exit 1; }; }
          else
-            { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
+            echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
          fi
       else
-         { { $as_echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5
-$as_echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;}
+         { { echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5
+echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;}
    { (exit 1); exit 1; }; }
        fi
    fi
@@ -12959,30 +11287,30 @@ $as_echo "$as_me: error: PackageMaker needed to build OSX packages and you are n
       echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
       	if test "$EPM" != "no" && test "$EPM" != "internal"; then
            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-               { $as_echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5
-$as_echo_n "checking whether epm is patched for OOos needs... " >&6; }
+               echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5
+echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6
                if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; 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
                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
                   if echo "$PKGFORMAT" | grep -q rpm; then
                       _pt="rpm"
-                      { $as_echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5
-$as_echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;}
+                      { echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5
+echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;}
                       echo "the rpms will need to be installed with --nodeps" >> warn
                   else
                       _pt="pkg"
                   fi
-                  { $as_echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5
-$as_echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;}
+                  { echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5
+echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;}
                   echo "the ${_pt}s will not be relocateable" >> warn
-                  { $as_echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and
+                  { echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and
                   relocation will work, you need to patch your epm with the
                   patch in epm/epm-3.7.patch or build with
                   --with-epm=internal which will build a suitable epm" >&5
-$as_echo "$as_me: WARNING: if you want to make sure installation without --nodeps and
+echo "$as_me: WARNING: if you want to make sure installation without --nodeps and
                   relocation will work, you need to patch your epm with the
                   patch in epm/epm-3.7.patch or build with
                   --with-epm=internal which will build a suitable epm" >&2;}
@@ -12993,10 +11321,10 @@ $as_echo "$as_me: WARNING: if you want to make sure installation without --nodep
    if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
       # Extract the first word of "pkgmk", so it can be a program name with args.
 set dummy pkgmk; 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_PKGMK+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKGMK in
   [\\/]* | ?:[\\/]*)
@@ -13009,32 +11337,31 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKGMK="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no"
   ;;
 esac
 fi
 PKGMK=$ac_cv_path_PKGMK
+
 if test -n "$PKGMK"; then
-  { $as_echo "$as_me:$LINENO: result: $PKGMK" >&5
-$as_echo "$PKGMK" >&6; }
+  echo "$as_me:$LINENO: result: $PKGMK" >&5
+echo "${ECHO_T}$PKGMK" >&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 "$PKGMK" = "no"; then
-         { { $as_echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5
-$as_echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
+         { { echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5
+echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
@@ -13044,18 +11371,18 @@ $as_echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2
 
 
 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
    EPM=NO
 fi
 
 
 # Extract the first word of "gperf", so it can be a program name with args.
 set dummy gperf; 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_GPERF+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GPERF in
   [\\/]* | ?:[\\/]*)
@@ -13068,78 +11395,77 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GPERF="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GPERF=$ac_cv_path_GPERF
+
 if test -n "$GPERF"; then
-  { $as_echo "$as_me:$LINENO: result: $GPERF" >&5
-$as_echo "$GPERF" >&6; }
+  echo "$as_me:$LINENO: result: $GPERF" >&5
+echo "${ECHO_T}$GPERF" >&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 -z "$GPERF"; then
-	{ { $as_echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5
-$as_echo "$as_me: error: gperf not found but needed. Install it." >&2;}
+	{ { echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5
+echo "$as_me: error: gperf not found but needed. Install it." >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:$LINENO: checking gperf version" >&5
-$as_echo_n "checking gperf version... " >&6; }
+echo "$as_me:$LINENO: checking gperf version" >&5
+echo $ECHO_N "checking gperf version... $ECHO_C" >&6
 if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
-	{ $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+	echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
 else
-	{ { $as_echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5
-$as_echo "$as_me: error: too old, you need at least 3.0.0" >&2;}
+	{ { echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5
+echo "$as_me: error: too old, you need at least 3.0.0" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the ODK" >&5
-$as_echo_n "checking whether to build the ODK... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the ODK" >&5
+echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; 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
    if test "$WITH_JAVA" != "no"; then
-   { $as_echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5
-$as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&6; }
+   echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5
+echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6
    if ! test -f "./external/unowinreg/unowinreg.dll"; then
       HAVE_UNOWINREG_DLL=no
    else
       HAVE_UNOWINREG_DLL=yes
    fi
    if test "$HAVE_UNOWINREG_DLL" = "yes"; then
-      { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
       BUILD_UNOWINREG=NO
    else
       if test "$_os" = "WINNT"; then
-         { $as_echo "$as_me:$LINENO: result: not found, will be built" >&5
-$as_echo "not found, will be built" >&6; }
+         echo "$as_me:$LINENO: result: not found, will be built" >&5
+echo "${ECHO_T}not found, will be built" >&6
       else
-         { $as_echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5
-$as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
+         { echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5
+echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
       fi
       BUILD_UNOWINREG=YES
    fi
    if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then
       if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then
-         { { $as_echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
+         { { echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
          Specify mingw32 g++ executable name with --with-mingwin.
          Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
          put it into external/unowinreg" >&5
-$as_echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
+echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
          Specify mingw32 g++ executable name with --with-mingwin.
          Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
          put it into external/unowinreg" >&2;}
@@ -13151,10 +11477,10 @@ $as_echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ c
          if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args.
 set dummy ${ac_tool_prefix}$WITH_MINGWIN; 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_MINGWCXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$MINGWCXX"; then
   ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test.
@@ -13165,36 +11491,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN"
-    $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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 MINGWCXX=$ac_cv_prog_MINGWCXX
 if test -n "$MINGWCXX"; then
-  { $as_echo "$as_me:$LINENO: result: $MINGWCXX" >&5
-$as_echo "$MINGWCXX" >&6; }
+  echo "$as_me:$LINENO: result: $MINGWCXX" >&5
+echo "${ECHO_T}$MINGWCXX" >&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
 
-
 fi
 if test -z "$ac_cv_prog_MINGWCXX"; then
   ac_ct_MINGWCXX=$MINGWCXX
   # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args.
 set dummy $WITH_MINGWIN; 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_MINGWCXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_MINGWCXX"; then
   ac_cv_prog_ac_ct_MINGWCXX="$ac_ct_MINGWCXX" # Let the user override the test.
@@ -13205,56 +11529,46 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MINGWCXX="$WITH_MINGWIN"
-    $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
 done
-IFS=$as_save_IFS
 
+  test -z "$ac_cv_prog_ac_ct_MINGWCXX" && ac_cv_prog_ac_ct_MINGWCXX="false"
 fi
 fi
 ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX
 if test -n "$ac_ct_MINGWCXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5
-$as_echo "$ac_ct_MINGWCXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5
+echo "${ECHO_T}$ac_ct_MINGWCXX" >&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_MINGWCXX" = x; then
-    MINGWCXX="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MINGWCXX=$ac_ct_MINGWCXX
-  fi
+  MINGWCXX=$ac_ct_MINGWCXX
 else
   MINGWCXX="$ac_cv_prog_MINGWCXX"
 fi
 
       fi
       if test "$MINGWCXX" = "false"; then
-         { { $as_echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5
-$as_echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;}
+         { { echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5
+echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;}
    { (exit 1); exit 1; }; }
       fi
-      { $as_echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5
-$as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; }
+      echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6
       if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
-         { { $as_echo "$as_me:$LINENO: error: no" >&5
-$as_echo "$as_me: error: no" >&2;}
+         { { echo "$as_me:$LINENO: error: no" >&5
+echo "$as_me: error: no" >&2;}
    { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
          if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi
@@ -13262,10 +11576,10 @@ $as_echo "yes" >&6; }
          if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
 set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; 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_MINGWSTRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$MINGWSTRIP"; then
   ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test.
@@ -13276,36 +11590,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-    $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
 done
-IFS=$as_save_IFS
 
 fi
 fi
 MINGWSTRIP=$ac_cv_prog_MINGWSTRIP
 if test -n "$MINGWSTRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5
-$as_echo "$MINGWSTRIP" >&6; }
+  echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5
+echo "${ECHO_T}$MINGWSTRIP" >&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
 
-
 fi
 if test -z "$ac_cv_prog_MINGWSTRIP"; then
   ac_ct_MINGWSTRIP=$MINGWSTRIP
   # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
 set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; 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_MINGWSTRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_MINGWSTRIP"; then
   ac_cv_prog_ac_ct_MINGWSTRIP="$ac_ct_MINGWSTRIP" # Let the user override the test.
@@ -13316,48 +11628,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-    $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
 done
-IFS=$as_save_IFS
 
+  test -z "$ac_cv_prog_ac_ct_MINGWSTRIP" && ac_cv_prog_ac_ct_MINGWSTRIP="false"
 fi
 fi
 ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP
 if test -n "$ac_ct_MINGWSTRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5
-$as_echo "$ac_ct_MINGWSTRIP" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5
+echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&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_MINGWSTRIP" = x; then
-    MINGWSTRIP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MINGWSTRIP=$ac_ct_MINGWSTRIP
-  fi
+  MINGWSTRIP=$ac_ct_MINGWSTRIP
 else
   MINGWSTRIP="$ac_cv_prog_MINGWSTRIP"
 fi
 
       fi
       if test "$MINGWSTRIP" = "false"; then
-         { { $as_echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5
-$as_echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;}
+         { { echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5
+echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;}
    { (exit 1); exit 1; }; }
       fi
-      ac_ext=cpp
+      ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -13376,14 +11678,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
       save_LIBS=$LIBS
       LIBS=""
 
-{ $as_echo "$as_me:$LINENO: checking for main in -lkernel32" >&5
-$as_echo_n "checking for main in -lkernel32... " >&6; }
+echo "$as_me:$LINENO: checking for main in -lkernel32" >&5
+echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6
 if test "${ac_cv_lib_kernel32_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkernel32  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13394,48 +11697,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_kernel32_main=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_lib_kernel32_main=no
+ac_cv_lib_kernel32_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5
-$as_echo "$ac_cv_lib_kernel32_main" >&6; }
-if test "x$ac_cv_lib_kernel32_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6
+if test $ac_cv_lib_kernel32_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKERNEL32 1
 _ACEOF
@@ -13446,14 +11737,15 @@ fi
 ac_cv_lib_kernel32=ac_cv_lib_kernel32_main
 
 
-{ $as_echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5
-$as_echo_n "checking for main in -ladvapi32... " >&6; }
+echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5
+echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6
 if test "${ac_cv_lib_advapi32_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ladvapi32  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13464,48 +11756,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_advapi32_main=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_lib_advapi32_main=no
+ac_cv_lib_advapi32_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5
-$as_echo "$ac_cv_lib_advapi32_main" >&6; }
-if test "x$ac_cv_lib_advapi32_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6
+if test $ac_cv_lib_advapi32_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBADVAPI32 1
 _ACEOF
@@ -13516,18 +11796,19 @@ fi
 ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
 
       if test "${ac_cv_header_windows_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for windows.h" >&5
-$as_echo_n "checking for windows.h... " >&6; }
+  echo "$as_me:$LINENO: checking for windows.h" >&5
+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6
 if test "${ac_cv_header_windows_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
-$as_echo "$ac_cv_header_windows_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking windows.h usability" >&5
-$as_echo_n "checking windows.h usability... " >&6; }
+echo "$as_me:$LINENO: checking windows.h usability" >&5
+echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13537,39 +11818,33 @@ $ac_includes_default
 #include <windows.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking windows.h presence" >&5
-$as_echo_n "checking windows.h presence... " >&6; }
+echo "$as_me:$LINENO: checking windows.h presence" >&5
+echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13577,76 +11852,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <windows.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: windows.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: windows.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for windows.h" >&5
-$as_echo_n "checking for windows.h... " >&6; }
+echo "$as_me:$LINENO: checking for windows.h" >&5
+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6
 if test "${ac_cv_header_windows_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_windows_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
-$as_echo "$ac_cv_header_windows_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6
 
 fi
-if test "x$ac_cv_header_windows_h" = x""yes; then
+if test $ac_cv_header_windows_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: windows.h missing" >&5
-$as_echo "$as_me: error: windows.h missing" >&2;}
+  { { echo "$as_me:$LINENO: error: windows.h missing" >&5
+echo "$as_me: error: windows.h missing" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -13666,47 +11948,47 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    fi
    BUILD_TYPE="$BUILD_TYPE ODK"
 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
    BUILD_UNOWINREG=NO
 fi
 
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5
-$as_echo_n "checking whether to build qadevOOo... " >&6; }
+echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5
+echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6
 if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; 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
    BUILD_QADEVOOO="YES"
    BUILD_TYPE="$BUILD_TYPE QADEVOOO"
 else
    BUILD_QADEVOOO="NO"
-   { $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 -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
     with_system_stdlibs=yes
-    { $as_echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-$as_echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
+    { echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
+echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
     echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
   fi
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
-$as_echo_n "checking whether to provide libstdc++/libgcc_s in the installset... " >&6; }
+echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
+echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6
 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
    test "$with_system_stdlibs" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    SYSTEM_STDLIBS=YES
 else
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    SYSTEM_STDLIBS=NO
 fi
 
@@ -13714,26 +11996,27 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
    with_system_zlib=yes
 fi
-{ $as_echo "$as_me:$LINENO: checking which zlib to use" >&5
-$as_echo_n "checking which zlib to use... " >&6; }
+echo "$as_me:$LINENO: checking which zlib to use" >&5
+echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6
 if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
 	test "$with_system_zlib" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_ZLIB=YES
     if test "${ac_cv_header_zlib_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
+  echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
-$as_echo_n "checking zlib.h usability... " >&6; }
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13743,39 +12026,33 @@ $ac_includes_default
 #include <zlib.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
-$as_echo_n "checking zlib.h presence... " >&6; }
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13783,181 +12060,178 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <zlib.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_zlib_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
 
 fi
-if test "x$ac_cv_header_zlib_h" = x""yes; then
+if test $ac_cv_header_zlib_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5
-$as_echo "$as_me: error: zlib.h not found. install zlib" >&2;}
+  { { echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5
+echo "$as_me: error: zlib.h not found. install zlib" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
+    echo "$as_me:$LINENO: checking for deflate in -lz" >&5
+echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_deflate+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char deflate ();
 int
 main ()
 {
-return deflate ();
+deflate ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_z_deflate=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_lib_z_deflate=no
+ac_cv_lib_z_deflate=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
-$as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
+echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
+if test $ac_cv_lib_z_deflate = yes; then
    ZLIB=-lz
 else
-  { { $as_echo "$as_me:$LINENO: error: zlib not found or functional" >&5
-$as_echo "$as_me: error: zlib not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: zlib not found or functional" >&5
+echo "$as_me: error: zlib not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_ZLIB=NO
     BUILD_TYPE="$BUILD_TYPE ZLIB"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which jpeg to use" >&5
-$as_echo_n "checking which jpeg to use... " >&6; }
+echo "$as_me:$LINENO: checking which jpeg to use" >&5
+echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6
 if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
 	test "$with_system_jpeg" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_JPEG=YES
     if test "${ac_cv_header_jpeglib_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-$as_echo_n "checking for jpeglib.h... " >&6; }
+  echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
 if test "${ac_cv_header_jpeglib_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
-$as_echo_n "checking jpeglib.h usability... " >&6; }
+echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
+echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13967,39 +12241,33 @@ $ac_includes_default
 #include <jpeglib.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
-$as_echo_n "checking jpeglib.h presence... " >&6; }
+echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
+echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14007,180 +12275,177 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <jpeglib.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-$as_echo_n "checking for jpeglib.h... " >&6; }
+echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
 if test "${ac_cv_header_jpeglib_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_jpeglib_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
 
 fi
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then
+if test $ac_cv_header_jpeglib_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5
-$as_echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;}
+  { { echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5
+echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5
-$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; }
+    echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5
+echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6
 if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char jpeg_resync_to_restart ();
 int
 main ()
 {
-return jpeg_resync_to_restart ();
+jpeg_resync_to_restart ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_jpeg_jpeg_resync_to_restart=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_lib_jpeg_jpeg_resync_to_restart=no
+ac_cv_lib_jpeg_jpeg_resync_to_restart=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6
+if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then
    JPEG3RDLIB=-ljpeg
 else
-  { $as_echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5
-$as_echo_n "checking jpeg library not found or fuctional... " >&6; }
+  echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5
+echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6
 fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_JPEG=NO
     BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which expat to use" >&5
-$as_echo_n "checking which expat to use... " >&6; }
+echo "$as_me:$LINENO: checking which expat to use" >&5
+echo $ECHO_N "checking which expat to use... $ECHO_C" >&6
 if test -n "$with_system_expat" -o -n "$with_system_libs" && \
 	test "$with_system_expat" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_EXPAT=YES
     if test "${ac_cv_header_expat_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for expat.h" >&5
-$as_echo_n "checking for expat.h... " >&6; }
+  echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
 if test "${ac_cv_header_expat_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-$as_echo "$ac_cv_header_expat_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5
-$as_echo_n "checking expat.h usability... " >&6; }
+echo "$as_me:$LINENO: checking expat.h usability" >&5
+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14190,39 +12455,33 @@ $ac_includes_default
 #include <expat.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking expat.h presence" >&5
-$as_echo_n "checking expat.h presence... " >&6; }
+echo "$as_me:$LINENO: checking expat.h presence" >&5
+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14230,147 +12489,143 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <expat.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5
-$as_echo_n "checking for expat.h... " >&6; }
+echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
 if test "${ac_cv_header_expat_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_expat_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-$as_echo "$ac_cv_header_expat_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
 
 fi
-if test "x$ac_cv_header_expat_h" = x""yes; then
+if test $ac_cv_header_expat_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5
-$as_echo "$as_me: error: expat.h not found. install expat" >&2;}
+  { { echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5
+echo "$as_me: error: expat.h not found. install expat" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
-$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
 if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XML_ParserCreate ();
 int
 main ()
 {
-return XML_ParserCreate ();
+XML_ParserCreate ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_expat_XML_ParserCreate=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_lib_expat_XML_ParserCreate=no
+ac_cv_lib_expat_XML_ParserCreate=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEXPAT 1
 _ACEOF
@@ -14378,24 +12633,24 @@ _ACEOF
   LIBS="-lexpat $LIBS"
 
 else
-  { $as_echo "$as_me:$LINENO: result: expat library not found or functional." >&5
-$as_echo "expat library not found or functional." >&6; }
+  echo "$as_me:$LINENO: result: expat library not found or functional." >&5
+echo "${ECHO_T}expat library not found or functional." >&6
 fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_EXPAT=NO
     BUILD_TYPE="$BUILD_TYPE EXPAT"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which libwpd to use" >&5
-$as_echo_n "checking which libwpd to use... " >&6; }
+echo "$as_me:$LINENO: checking which libwpd to use" >&5
+echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6
 if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
         test "$with_system_libwpd" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_LIBWPD=YES
 
   succeeded=no
@@ -14403,10 +12658,10 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14419,29 +12674,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14452,25 +12706,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5
-$as_echo_n "checking for libwpd-0.8 ... " >&6; }
+        echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5
+echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libwpd-0.8 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5
-$as_echo_n "checking LIBWPD_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5
+echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6
             LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "`
-            { $as_echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5
-$as_echo "$LIBWPD_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5
+echo "${ECHO_T}$LIBWPD_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5
-$as_echo_n "checking LIBWPD_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5
+echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6
             LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "`
-            { $as_echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5
-$as_echo "$LIBWPD_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5
+echo "${ECHO_T}$LIBWPD_LIBS" >&6
         else
             LIBWPD_CFLAGS=""
             LIBWPD_LIBS=""
@@ -14491,14 +12745,14 @@ $as_echo "$LIBWPD_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_LIBWPD=NO
     BUILD_TYPE="$BUILD_TYPE LIBWPD"
 fi
@@ -14507,18 +12761,18 @@ fi
 
 
 if test  "$test_freetype" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking whether freetype is available" >&5
-$as_echo_n "checking whether freetype is available... " >&6; }
+   echo "$as_me:$LINENO: checking whether freetype is available" >&5
+echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14531,29 +12785,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14564,25 +12817,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5
-$as_echo_n "checking for freetype2 >= 2.0 ... " >&6; }
+        echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5
+echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
-$as_echo_n "checking FREETYPE_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
+echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6
             FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
-$as_echo "$FREETYPE_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
+echo "${ECHO_T}$FREETYPE_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
-$as_echo_n "checking FREETYPE_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
+echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6
             FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
-$as_echo "$FREETYPE_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
+echo "${ECHO_T}$FREETYPE_LIBS" >&6
         else
             FREETYPE_CFLAGS=""
             FREETYPE_LIBS=""
@@ -14603,8 +12856,8 @@ $as_echo "$FREETYPE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -14618,72 +12871,61 @@ if test  "$test_freetype" = "yes"; then
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-    { $as_echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
-$as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; }
+    echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
+echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6
 if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char FT_GlyphSlot_Embolden ();
 int
 main ()
 {
-return FT_GlyphSlot_Embolden ();
+FT_GlyphSlot_Embolden ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_freetype_FT_GlyphSlot_Embolden=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_lib_freetype_FT_GlyphSlot_Embolden=no
+ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
-$as_echo "$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; }
-if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
+echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6
+if test $ac_cv_lib_freetype_FT_GlyphSlot_Embolden = yes; then
   USE_FT_EMBOLDEN="YES"
 else
   USE_FT_EMBOLDEN="NO"
@@ -14716,26 +12958,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     fi
 fi
 
-{ $as_echo "$as_me:$LINENO: checking which libxslt to use" >&5
-$as_echo_n "checking which libxslt to use... " >&6; }
+echo "$as_me:$LINENO: checking which libxslt to use" >&5
+echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
        "$_os" = "Darwin" && \
    test "$with_system_libxslt" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_LIBXSLT=YES
 
    if test "$_os" = "Darwin"; then
-   { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
-$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
+   echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
+echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6
    LIBXSLT_CFLAGS=`xslt-config --cflags`
-   { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
-$as_echo "$LIBXSLT_CFLAGS" >&6; }
-   { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
-$as_echo_n "checking LIBXSLT_LIBS... " >&6; }
+   echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
+echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6
+   echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
+echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6
    LIBXSLT_LIBS=`xslt-config --libs`
-   { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
-$as_echo "$LIBXSLT_LIBS" >&6; }
+   echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
+echo "${ECHO_T}$LIBXSLT_LIBS" >&6
 
 
  else
@@ -14745,10 +12987,10 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14761,29 +13003,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14794,25 +13035,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libxslt" >&5
-$as_echo_n "checking for libxslt... " >&6; }
+        echo "$as_me:$LINENO: checking for libxslt" >&5
+echo $ECHO_N "checking for libxslt... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libxslt" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
-$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
+echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6
             LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"`
-            { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
-$as_echo "$LIBXSLT_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
+echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
-$as_echo_n "checking LIBXSLT_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
+echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6
             LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"`
-            { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
-$as_echo "$LIBXSLT_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
+echo "${ECHO_T}$LIBXSLT_LIBS" >&6
         else
             LIBXSLT_CFLAGS=""
             LIBXSLT_LIBS=""
@@ -14833,8 +13074,8 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -14843,10 +13084,10 @@ $as_echo "$as_me: error: Library requirements (libxslt) not met; consider adjust
 
       # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; 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_XSLTPROC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $XSLTPROC in
   [\\/]* | ?:[\\/]*)
@@ -14859,37 +13100,36 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XSLTPROC="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
   ;;
 esac
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
+
 if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5
-$as_echo "$XSLTPROC" >&6; }
+  echo "$as_me:$LINENO: result: $XSLTPROC" >&5
+echo "${ECHO_T}$XSLTPROC" >&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 "$XSLTPROC" = "no"; then
-      { { $as_echo "$as_me:$LINENO: error: xsltproc is required" >&5
-$as_echo "$as_me: error: xsltproc is required" >&2;}
+      { { echo "$as_me:$LINENO: error: xsltproc is required" >&5
+echo "$as_me: error: xsltproc is required" >&2;}
    { (exit 1); exit 1; }; }
    fi
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    SYSTEM_LIBXSLT=NO
    BUILD_TYPE="$BUILD_TYPE LIBXSLT"
 fi
@@ -14898,25 +13138,25 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which libxml to use" >&5
-$as_echo_n "checking which libxml to use... " >&6; }
+echo "$as_me:$LINENO: checking which libxml to use" >&5
+echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6
 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
             "$_os" = "Darwin" && \
 	test "$with_system_libxml" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_LIBXML=YES
     if test "$_os" = "Darwin"; then
-   { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
-$as_echo_n "checking LIBXML_CFLAGS... " >&6; }
+   echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
+echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6
    LIBXML_CFLAGS=`xml2-config --cflags`
-   { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
-$as_echo "$LIBXML_CFLAGS" >&6; }
-   { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
-$as_echo_n "checking LIBXML_LIBS... " >&6; }
+   echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
+echo "${ECHO_T}$LIBXML_CFLAGS" >&6
+   echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
+echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6
    LIBXML_LIBS=`xml2-config --libs`
-   { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
-$as_echo "$LIBXML_LIBS" >&6; }
+   echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
+echo "${ECHO_T}$LIBXML_LIBS" >&6
 
 
  else
@@ -14926,10 +13166,10 @@ $as_echo "$LIBXML_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14942,29 +13182,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14975,25 +13214,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; }
+        echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5
+echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
-$as_echo_n "checking LIBXML_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
+echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6
             LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"`
-            { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
-$as_echo "$LIBXML_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
+echo "${ECHO_T}$LIBXML_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
-$as_echo_n "checking LIBXML_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
+echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6
             LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"`
-            { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
-$as_echo "$LIBXML_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
+echo "${ECHO_T}$LIBXML_LIBS" >&6
         else
             LIBXML_CFLAGS=""
             LIBXML_LIBS=""
@@ -15014,8 +13253,8 @@ $as_echo "$LIBXML_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -15023,8 +13262,8 @@ $as_echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consi
 
     BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_LIBXML=NO
     BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
 fi
@@ -15035,21 +13274,21 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    with_system_python=yes
 fi
-{ $as_echo "$as_me:$LINENO: checking which python to use" >&5
-$as_echo_n "checking which python to use... " >&6; }
+echo "$as_me:$LINENO: checking which python to use" >&5
+echo $ECHO_N "checking which python to use... $ECHO_C" >&6
 if test -n "$with_system_python" -o -n "$with_system_libs" && \
 	test "$with_system_python" != "no"; then
    SYSTEM_PYTHON=YES
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
 
 
 
 
         if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
-      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
-$as_echo_n "checking whether $PYTHON version >= 2.2... " >&6; }
+      echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
+echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6
       prog="import sys, string
 # split strings by '.' and convert to numeric.  Append some zeros
 # because we need at least 4 digits for the hex conversion.
@@ -15062,11 +13301,11 @@ sys.exit(sys.hexversion < minverhex)"
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; 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
 else
-  { { $as_echo "$as_me:$LINENO: error: too old" >&5
-$as_echo "$as_me: error: too old" >&2;}
+  { { echo "$as_me:$LINENO: error: too old" >&5
+echo "$as_me: error: too old" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -15074,13 +13313,13 @@ fi
     else
       # Otherwise, try each interpreter until we find one that satisfies
       # VERSION.
-      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5
-$as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; }
+      echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5
+echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6
 if test "${am_cv_pathless_PYTHON+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+	for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys, string
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -15099,18 +13338,18 @@ fi
 
 	done
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-$as_echo "$am_cv_pathless_PYTHON" >&6; }
+echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
+echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6
       # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
       if test "$am_cv_pathless_PYTHON" = none; then
 	PYTHON=:
       else
         # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
 set dummy $am_cv_pathless_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_PYTHON+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PYTHON in
   [\\/]* | ?:[\\/]*)
@@ -15123,49 +13362,48 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PYTHON=$ac_cv_path_PYTHON
+
 if test -n "$PYTHON"; then
-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+  echo "$as_me:$LINENO: result: $PYTHON" >&5
+echo "${ECHO_T}$PYTHON" >&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
 
-
       fi
       am_display_PYTHON=$am_cv_pathless_PYTHON
     fi
 
 
   if test "$PYTHON" = :; then
-      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
+      { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
+echo "$as_me: error: no suitable Python interpreter found" >&2;}
    { (exit 1); exit 1; }; }
   else
 
 
-  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+  echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
+echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6
 if test "${am_cv_python_version+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
+echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+echo "${ECHO_T}$am_cv_python_version" >&6
   PYTHON_VERSION=$am_cv_python_version
 
 
@@ -15176,30 +13414,30 @@ $as_echo "$am_cv_python_version" >&6; }
 
 
 
-  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+  echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
+echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6
 if test "${am_cv_python_platform+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
+echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+echo "${ECHO_T}$am_cv_python_platform" >&6
   PYTHON_PLATFORM=$am_cv_python_platform
 
 
 
 
-                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+                echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6
 if test "${am_cv_python_pythondir+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
+echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+echo "${ECHO_T}$am_cv_python_pythondir" >&6
   pythondir=$am_cv_python_pythondir
 
 
@@ -15207,16 +13445,16 @@ $as_echo "$am_cv_python_pythondir" >&6; }
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-            { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+            echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6
 if test "${am_cv_python_pyexecdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
      echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
+echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
   pyexecdir=$am_cv_python_pyexecdir
 
 
@@ -15242,18 +13480,19 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
       save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
    if test "${ac_cv_header_Python_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for Python.h" >&5
-$as_echo_n "checking for Python.h... " >&6; }
+  echo "$as_me:$LINENO: checking for Python.h" >&5
+echo $ECHO_N "checking for Python.h... $ECHO_C" >&6
 if test "${ac_cv_header_Python_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
-$as_echo "$ac_cv_header_Python_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+echo "${ECHO_T}$ac_cv_header_Python_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5
-$as_echo_n "checking Python.h usability... " >&6; }
+echo "$as_me:$LINENO: checking Python.h usability" >&5
+echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15263,39 +13502,33 @@ $ac_includes_default
 #include <Python.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5
-$as_echo_n "checking Python.h presence... " >&6; }
+echo "$as_me:$LINENO: checking Python.h presence" >&5
+echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15303,76 +13536,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <Python.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5
-$as_echo_n "checking for Python.h... " >&6; }
+echo "$as_me:$LINENO: checking for Python.h" >&5
+echo $ECHO_N "checking for Python.h... $ECHO_C" >&6
 if test "${ac_cv_header_Python_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_Python_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
-$as_echo "$ac_cv_header_Python_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+echo "${ECHO_T}$ac_cv_header_Python_h" >&6
 
 fi
-if test "x$ac_cv_header_Python_h" = x""yes; then
+if test $ac_cv_header_Python_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: Python headers not found" >&5
-$as_echo "$as_me: error: Python headers not found" >&2;}
+  { { echo "$as_me:$LINENO: error: Python headers not found" >&5
+echo "$as_me: error: Python headers not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -15381,8 +13621,8 @@ fi
 else
    SYSTEM_PYTHON=NO
    BUILD_TYPE="$BUILD_TYPE PYTHON"
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    # Embedded python dies without Home set
    if test "z$HOME" = "z"; then
       export HOME="";
@@ -15391,10 +13631,10 @@ $as_echo "internal" >&6; }
    if test -z "$BZIP2"; then
 	# Extract the first word of "bzip2", so it can be a program name with args.
 set dummy bzip2; 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_BZIP2+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $BZIP2 in
   [\\/]* | ?:[\\/]*)
@@ -15407,31 +13647,30 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_BZIP2="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 BZIP2=$ac_cv_path_BZIP2
+
 if test -n "$BZIP2"; then
-  { $as_echo "$as_me:$LINENO: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
+  echo "$as_me:$LINENO: result: $BZIP2" >&5
+echo "${ECHO_T}$BZIP2" >&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 -z "$BZIP2"; then
-   		{ { $as_echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5
-$as_echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;}
+   		{ { echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5
+echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;}
    { (exit 1); exit 1; }; }
    	fi
    fi
@@ -15442,19 +13681,20 @@ fi
 HOME=`echo $HOME | sed 's:\\\\:/:g'`
 
 
-{ $as_echo "$as_me:$LINENO: checking which db to use" >&5
-$as_echo_n "checking which db to use... " >&6; }
+echo "$as_me:$LINENO: checking which db to use" >&5
+echo $ECHO_N "checking which db to use... $ECHO_C" >&6
 if test -n "$with_system_db" -o -n "$with_system_libs" && \
 	test "$with_system_db" != "no"; then
     SYSTEM_DB=YES
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for db.h" >&5
-$as_echo_n "checking for db.h... " >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
+    echo "$as_me:$LINENO: checking for db.h" >&5
+echo $ECHO_N "checking for db.h... $ECHO_C" >&6
 if test "${ac_cv_header_db_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15466,46 +13706,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <db.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_header_db_h=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_db_h=no
+ac_cv_header_db_h=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-$as_echo "$ac_cv_header_db_h" >&6; }
-if test "x$ac_cv_header_db_h" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_db_h" >&6
+if test $ac_cv_header_db_h = yes; then
    DB_INCLUDES=/usr/include
 else
 
              CFLAGS=-I/usr/include/db4
-             { $as_echo "$as_me:$LINENO: checking for db4/db.h" >&5
-$as_echo_n "checking for db4/db.h... " >&6; }
+             echo "$as_me:$LINENO: checking for db4/db.h" >&5
+echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6
 if test "${ac_cv_header_db4_db_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15516,40 +13750,33 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <db4/db.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_header_db4_db_h=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_db4_db_h=no
+ac_cv_header_db4_db_h=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5
-$as_echo "$ac_cv_header_db4_db_h" >&6; }
-if test "x$ac_cv_header_db4_db_h" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6
+if test $ac_cv_header_db4_db_h = yes; then
    DB_INCLUDES=/usr/include/db4
 else
-   { { $as_echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5
-$as_echo "$as_me: error: no. install the db4 libraries" >&2;}
+   { { echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5
+echo "$as_me: error: no. install the db4 libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -15558,19 +13785,18 @@ fi
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
-$as_echo_n "checking whether db is at least 4.1... " >&6; }
+    echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
+echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6
     for v in `seq 1 7`; do
        if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15586,61 +13812,48 @@ int main(int argc, char **argv) {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
   DB_VERSION_MINOR=$v
 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
 
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
     done
     if test "$DB_VERSION_MINOR" -gt "1"; then
-       { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+       echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
        DB_VERSION=4.$DB_VERSION_MINOR
     else
-       { { $as_echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5
-$as_echo "$as_me: error: no. you need at least db 4.1" >&2;}
+       { { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5
+echo "$as_me: error: no. you need at least db 4.1" >&2;}
    { (exit 1); exit 1; }; }
     fi
     # does not work :/
     #AC_CHECK_LIB(db, db_create, [],
     #  [AC_MSG_ERROR([db library not installed or functional])], [])
 
-{ $as_echo "$as_me:$LINENO: checking for main in -ldb" >&5
-$as_echo_n "checking for main in -ldb... " >&6; }
+echo "$as_me:$LINENO: checking for main in -ldb" >&5
+echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
 if test "${ac_cv_lib_db_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15651,48 +13864,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_db_main=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_lib_db_main=no
+ac_cv_lib_db_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5
-$as_echo "$ac_cv_lib_db_main" >&6; }
-if test "x$ac_cv_lib_db_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5
+echo "${ECHO_T}$ac_cv_lib_db_main" >&6
+if test $ac_cv_lib_db_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDB 1
 _ACEOF
@@ -15700,16 +13901,16 @@ _ACEOF
   LIBS="-ldb $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: db not installed or functional" >&5
-$as_echo "$as_me: error: db not installed or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
+echo "$as_me: error: db not installed or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 ac_cv_lib_db=ac_cv_lib_db_main
 
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_DB=NO
     BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
 fi
@@ -15718,22 +13919,22 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which lucene to use" >&5
-$as_echo_n "checking which lucene to use... " >&6; }
+echo "$as_me:$LINENO: checking which lucene to use" >&5
+echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6
 if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
        test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+        echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
         SYSTEM_LUCENE=YES
         if test -z $LUCENE_CORE_JAR; then
-          { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-core-2.3.jar... " >&6; }
+          echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-core-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes
@@ -15741,20 +13942,20 @@ else
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6
+if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then
    LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
 else
 
-              { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; }
+              echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene.jar"; then
   ac_cv_file__usr_share_java_lucene_jar=yes
@@ -15762,13 +13963,13 @@ else
   ac_cv_file__usr_share_java_lucene_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6
+if test $ac_cv_file__usr_share_java_lucene_jar = yes; then
    LUCENE_CORE_JAR=/usr/share/java/lucene.jar
 else
-   { { $as_echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5
-$as_echo "$as_me: error: lucene-core.jar replacement not found" >&2;}
+   { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5
+echo "$as_me: error: lucene-core.jar replacement not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -15778,15 +13979,15 @@ fi
 fi
 
         else
-          as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
-$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+          as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
+echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
@@ -15794,31 +13995,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5
-$as_echo "$as_me: error: lucene-core.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5
+echo "$as_me: error: lucene-core.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
         fi
 
         if test -z $LUCENE_ANALYZERS_JAR; then
-          { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-analyzers-2.3.jar... " >&6; }
+          echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes
@@ -15826,20 +14023,20 @@ else
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6
+if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar
 else
 
-              { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... " >&6; }
+              echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes
@@ -15847,13 +14044,13 @@ else
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6
+if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar
 else
-   { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5
-$as_echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;}
+   { { echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5
+echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -15863,15 +14060,15 @@ fi
 fi
 
         else
-          as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
-$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+          as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
+echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
@@ -15879,24 +14076,20 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-   { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5
-$as_echo "$as_me: error: lucene-analyzers.jar not found." >&2;}
+   { { echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5
+echo "$as_me: error: lucene-analyzers.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
         fi
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_LUCENE=NO
     BUILD_TYPE="$BUILD_TYPE LUCENE"
 fi
@@ -15904,25 +14097,25 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which hsqldb to use" >&5
-$as_echo_n "checking which hsqldb to use... " >&6; }
+echo "$as_me:$LINENO: checking which hsqldb to use" >&5
+echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6
 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
        test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+        echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
         SYSTEM_HSQLDB=YES
         if test -z $HSQLDB_JAR; then
                HSQLDB_JAR=/usr/share/java/hsqldb.jar
         fi
-        as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5
-$as_echo_n "checking for $HSQLDB_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5
+echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$HSQLDB_JAR"; then
   eval "$as_ac_File=yes"
@@ -15930,22 +14123,18 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5
-$as_echo "$as_me: error: hsqldb.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5
+echo "$as_me: error: hsqldb.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-        { $as_echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5
-$as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; }
+        echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5
+echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6
         export HSQLDB_JAR
         if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
@@ -15968,41 +14157,41 @@ $as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; }
 	    } else {
 	        exit 1;
             }'; 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
          else
-            { { $as_echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5
-$as_echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;}
+            { { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5
+echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;}
    { (exit 1); exit 1; }; }
          fi
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_HSQLDB=NO
     BUILD_TYPE="$BUILD_TYPE HSQLDB"
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which beanshell to use" >&5
-$as_echo_n "checking which beanshell to use... " >&6; }
+echo "$as_me:$LINENO: checking which beanshell to use" >&5
+echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6
 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
        test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+        echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
         SYSTEM_BSH=YES
         if test -z $BSH_JAR; then
                BSH_JAR=/usr/share/java/bsh.jar
         fi
-        as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $BSH_JAR" >&5
-$as_echo_n "checking for $BSH_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $BSH_JAR" >&5
+echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$BSH_JAR"; then
   eval "$as_ac_File=yes"
@@ -16010,23 +14199,19 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: bsh.jar not found." >&5
-$as_echo "$as_me: error: bsh.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: bsh.jar not found." >&5
+echo "$as_me: error: bsh.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_BSH=NO
     BUILD_TYPE="$BUILD_TYPE BSH"
 fi
@@ -16034,22 +14219,22 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which saxon to use" >&5
-$as_echo_n "checking which saxon to use... " >&6; }
+echo "$as_me:$LINENO: checking which saxon to use" >&5
+echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6
 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
        test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
-        { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+        echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
         SYSTEM_SAXON=YES
         if test -z $SAXON_JAR; then
-          { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
+          echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
@@ -16057,20 +14242,20 @@ else
   ac_cv_file__usr_share_java_saxon9_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6
+if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
 
-              { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; }
+              echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon.jar"; then
   ac_cv_file__usr_share_java_saxon_jar=yes
@@ -16078,19 +14263,19 @@ else
   ac_cv_file__usr_share_java_saxon_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_saxon_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6
+if test $ac_cv_file__usr_share_java_saxon_jar = yes; then
    SAXON_JAR=/usr/share/java/saxon.jar
 else
-   { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
+   echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
@@ -16098,13 +14283,13 @@ else
   ac_cv_file__usr_share_java_saxon9_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6
+if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
-   { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5
-$as_echo "$as_me: error: saxon.jar replacement not found" >&2;}
+   { { echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5
+echo "$as_me: error: saxon.jar replacement not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -16118,15 +14303,15 @@ fi
 fi
 
         else
-          as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5
-$as_echo_n "checking for $SAXON_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+          as_ac_File=`echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5
+echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$SAXON_JAR"; then
   eval "$as_ac_File=yes"
@@ -16134,31 +14319,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5
-$as_echo "$as_me: error: saxon.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5
+echo "$as_me: error: saxon.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
         fi
         if test -n "$SERIALIZER_JAR"; then
-          as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5
-$as_echo_n "checking for $SERIALIZER_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+          as_ac_File=`echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5
+echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$SERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
@@ -16166,25 +14347,21 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: serializer.jar not found." >&5
-$as_echo "$as_me: error: serializer.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: serializer.jar not found." >&5
+echo "$as_me: error: serializer.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
         fi
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_SAXON=NO
     NEED_SAXON=TRUE
 fi
@@ -16198,20 +14375,20 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
    with_system_curl=yes
 fi
-{ $as_echo "$as_me:$LINENO: checking which curl to use" >&5
-$as_echo_n "checking which curl to use... " >&6; }
+echo "$as_me:$LINENO: checking which curl to use" >&5
+echo $ECHO_N "checking which curl to use... $ECHO_C" >&6
 if test -n "$with_system_curl" -o -n "$with_system_libs" && \
 	test "$with_system_curl" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_CURL=YES
 
    # Extract the first word of "curl-config", so it can be a program name with args.
 set dummy curl-config; 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_CURLCONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CURLCONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16224,52 +14401,51 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CURLCONFIG="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CURLCONFIG=$ac_cv_path_CURLCONFIG
+
 if test -n "$CURLCONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $CURLCONFIG" >&5
-$as_echo "$CURLCONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $CURLCONFIG" >&5
+echo "${ECHO_T}$CURLCONFIG" >&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 -z "$CURLCONFIG"; then
-      { { $as_echo "$as_me:$LINENO: error: install curl to run this script" >&5
-$as_echo "$as_me: error: install curl to run this script" >&2;}
+      { { echo "$as_me:$LINENO: error: install curl to run this script" >&5
+echo "$as_me: error: install curl to run this script" >&2;}
    { (exit 1); exit 1; }; }
    fi
 
    # check curl version
-   { $as_echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5
-$as_echo_n "checking whether curl is >= 7.9.8... " >&6; }
+   echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5
+echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6
    if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
 	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \
 	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then
-      { { $as_echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5
-$as_echo "$as_me: error: no, you need at least curl 7.9,8" >&2;}
+      { { echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5
+echo "$as_me: error: no, you need at least curl 7.9,8" >&2;}
    { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    fi
    CURL_LIBS=`$CURLCONFIG --libs`
    CURL_CFLAGS=`$CURLCONFIG --cflags`
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    SYSTEM_CURL=NO
    BUILD_TYPE="$BUILD_TYPE CURL"
 fi
@@ -16277,32 +14453,33 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which boost to use" >&5
-$as_echo_n "checking which boost to use... " >&6; }
+echo "$as_me:$LINENO: checking which boost to use" >&5
+echo $ECHO_N "checking which boost to use... $ECHO_C" >&6
 if test -n "$with_system_boost" -o -n "$with_system_headers" && \
 	test "$with_system_boost" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_BOOST=YES
-   ac_ext=cpp
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
-$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; }
+  echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
-$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
-$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; }
+echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
+echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16312,39 +14489,33 @@ $ac_includes_default
 #include <boost/shared_ptr.hpp>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
-$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; }
+echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
+echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16352,93 +14523,101 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <boost/shared_ptr.hpp>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
-$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; }
+echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
-$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6
 
 fi
-if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then
+if test $ac_cv_header_boost_shared_ptr_hpp = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5
-$as_echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;}
+  { { echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5
+echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
    if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
-$as_echo_n "checking for boost/spirit/core.hpp... " >&6; }
+  echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
+echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
-$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5
-$as_echo_n "checking boost/spirit/core.hpp usability... " >&6; }
+echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5
+echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16448,39 +14627,33 @@ $ac_includes_default
 #include <boost/spirit/core.hpp>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5
-$as_echo_n "checking boost/spirit/core.hpp presence... " >&6; }
+echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5
+echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16488,76 +14661,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <boost/spirit/core.hpp>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5
+echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
-$as_echo_n "checking for boost/spirit/core.hpp... " >&6; }
+echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
+echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_boost_spirit_core_hpp=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
-$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6
 
 fi
-if test "x$ac_cv_header_boost_spirit_core_hpp" = x""yes; then
+if test $ac_cv_header_boost_spirit_core_hpp = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5
-$as_echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;}
+  { { echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5
+echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -16569,39 +14749,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    BUILD_TYPE="$BUILD_TYPE BOOST"
    SYSTEM_BOOST=NO
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which vigra to use" >&5
-$as_echo_n "checking which vigra to use... " >&6; }
+echo "$as_me:$LINENO: checking which vigra to use" >&5
+echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6
 if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
 	test "$with_system_vigra" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_VIGRA=YES
-   ac_ext=cpp
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
-$as_echo_n "checking for vigra/copyimage.hxx... " >&6; }
+  echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
+echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
-$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5
-$as_echo_n "checking vigra/copyimage.hxx usability... " >&6; }
+echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5
+echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16611,39 +14792,33 @@ $ac_includes_default
 #include <vigra/copyimage.hxx>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5
-$as_echo_n "checking vigra/copyimage.hxx presence... " >&6; }
+echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5
+echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16651,76 +14826,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <vigra/copyimage.hxx>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
-$as_echo_n "checking for vigra/copyimage.hxx... " >&6; }
+echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
+echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
-$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6
 
 fi
-if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then
+if test $ac_cv_header_vigra_copyimage_hxx = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5
-$as_echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;}
+  { { echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5
+echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -16732,34 +14914,35 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    BUILD_TYPE="$BUILD_TYPE VIGRA"
    SYSTEM_VIGRA=NO
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which odbc headers to use" >&5
-$as_echo_n "checking which odbc headers to use... " >&6; }
+echo "$as_me:$LINENO: checking which odbc headers to use" >&5
+echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6
 if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
 	test "$with_system_odbc_headers" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_ODBC_HEADERS=YES
 
    if test "${ac_cv_header_sqlext_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5
-$as_echo_n "checking for sqlext.h... " >&6; }
+  echo "$as_me:$LINENO: checking for sqlext.h" >&5
+echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6
 if test "${ac_cv_header_sqlext_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
-$as_echo "$ac_cv_header_sqlext_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sqlext.h usability" >&5
-$as_echo_n "checking sqlext.h usability... " >&6; }
+echo "$as_me:$LINENO: checking sqlext.h usability" >&5
+echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16769,39 +14952,33 @@ $ac_includes_default
 #include <sqlext.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sqlext.h presence" >&5
-$as_echo_n "checking sqlext.h presence... " >&6; }
+echo "$as_me:$LINENO: checking sqlext.h presence" >&5
+echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16809,168 +14986,174 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sqlext.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: sqlext.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: sqlext.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5
-$as_echo_n "checking for sqlext.h... " >&6; }
+echo "$as_me:$LINENO: checking for sqlext.h" >&5
+echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6
 if test "${ac_cv_header_sqlext_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_sqlext_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
-$as_echo "$ac_cv_header_sqlext_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6
 
 fi
-if test "x$ac_cv_header_sqlext_h" = x""yes; then
+if test $ac_cv_header_sqlext_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5
-$as_echo "$as_me: error: odbc not found. install odbc" >&2;}
+  { { echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5
+echo "$as_me: error: odbc not found. install odbc" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    SYSTEM_ODBC_HEADERS=NO
    BUILD_TYPE="$BUILD_TYPE UNIXODBC"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
-$as_echo_n "checking whether to enable build of Mozilla/Mozilla NSS-using components... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
+echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6
 if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    WITH_MOZILLA=NO
 else
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    WITH_MOZILLA=YES
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5
-$as_echo_n "checking whether to build Mozilla addressbook connectivity... " >&6; }
+echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5
+echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6
 if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 elif test "$with_system_mozilla" = "yes"; then
-   { $as_echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5
-$as_echo "no, not possible with system-mozilla" >&6; }
+   echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5
+echo "${ECHO_T}no, not possible with system-mozilla" >&6
 else
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build XML Security support" >&5
-$as_echo_n "checking whether to build XML Security support... " >&6; }
+echo "$as_me:$LINENO: checking whether to build XML Security support" >&5
+echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6
 if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5
-$as_echo "no, since Mozilla (NSS) disabled but needed" >&6; }
+   echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5
+echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6
 else
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5
-$as_echo_n "checking whether to build LDAP configuration backend... " >&6; }
+echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5
+echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6
 if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
    if test "$enable_mozilla" = "yes" || test "$with_openldap" = "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
       WITH_LDAP=YES
    else
-      { $as_echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5
-$as_echo "no. Either Mozilla or OpenLDAP needed" >&6; }
+      echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5
+echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6
       WITH_LDAP=NO
    fi
 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
    WITH_LDAP=NO
 fi
 
 if test "$WITH_LDAP" = "YES"; then
-            { $as_echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5
-$as_echo_n "checking which LDAP SDK to use... " >&6; }
+            echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5
+echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6
    if test -n "$with_openldap" && test "$with_openldap" != "no"; then
-  	   { $as_echo "$as_me:$LINENO: result: OpenLDAP" >&5
-$as_echo "OpenLDAP" >&6; }
+  	   echo "$as_me:$LINENO: result: OpenLDAP" >&5
+echo "${ECHO_T}OpenLDAP" >&6
 	   WITH_OPENLDAP=YES
 
 for ac_header in ldap.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
-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; }
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16980,39 +15163,33 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17020,155 +15197,147 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  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;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $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
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  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; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""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
 
 else
-  { { $as_echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5
-$as_echo "$as_me: error: ldap.h not found. install openldap libs" >&2;}
+  { { echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5
+echo "$as_me: error: ldap.h not found. install openldap libs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
 
-{ $as_echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5
-$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; }
+echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5
+echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6
 if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char ldap_simple_bind_s ();
 int
 main ()
 {
-return ldap_simple_bind_s ();
+ldap_simple_bind_s ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ldap_ldap_simple_bind_s=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_lib_ldap_ldap_simple_bind_s=no
+ac_cv_lib_ldap_ldap_simple_bind_s=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6
+if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -17176,80 +15345,69 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5
-$as_echo "$as_me: error: openldap lib not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5
+echo "$as_me: error: openldap lib not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	   # rumours say that OpenLDAP doesn't have that function. I looked and
 	   # it has it. Test for it to be sure
 
-{ $as_echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5
-$as_echo_n "checking for ldap_set_option in -lldap... " >&6; }
+echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5
+echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6
 if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char ldap_set_option ();
 int
 main ()
 {
-return ldap_set_option ();
+ldap_set_option ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ldap_ldap_set_option=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_lib_ldap_ldap_set_option=no
+ac_cv_lib_ldap_ldap_set_option=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_set_option" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_set_option" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5
+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6
+if test $ac_cv_lib_ldap_ldap_set_option = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -17257,14 +15415,14 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5
-$as_echo "$as_me: error: openldap lib not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5
+echo "$as_me: error: openldap lib not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
    else
-	   { $as_echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5
-$as_echo "Netscape/Mozilla" >&6; }
+	   echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5
+echo "${ECHO_T}Netscape/Mozilla" >&6
 	   # TODO. Actually do a sanity check and check for
 	   # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
 	   WITH_OPENLDAP=NO
@@ -17273,14 +15431,14 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which mozilla to use" >&5
-$as_echo_n "checking which mozilla to use... " >&6; }
+echo "$as_me:$LINENO: checking which mozilla to use" >&5
+echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6
 if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_MOZILLA=YES
-    { $as_echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
-$as_echo_n "checking which Mozilla flavour to use... " >&6; }
+    echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
+echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
     if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
       MOZ_FLAVOUR=libxul
     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
@@ -17295,8 +15453,8 @@ $as_echo_n "checking which Mozilla flavour to use... " >&6; }
       MOZ_FLAVOUR=libxul
     fi
     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-    { $as_echo "$as_me:$LINENO: result: $tmp" >&5
-$as_echo "$tmp" >&6; }
+    echo "$as_me:$LINENO: result: $tmp" >&5
+echo "${ECHO_T}$tmp" >&6
 
 
   succeeded=no
@@ -17304,10 +15462,10 @@ $as_echo "$tmp" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17320,29 +15478,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17353,25 +15510,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for nss" >&5
-$as_echo_n "checking for nss... " >&6; }
+        echo "$as_me:$LINENO: checking for nss" >&5
+echo $ECHO_N "checking for nss... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "nss" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
             MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
-$as_echo "$MOZ_NSS_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
-$as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
             MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
-$as_echo "$MOZ_NSS_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
         else
             MOZ_NSS_CFLAGS=""
             MOZ_NSS_LIBS=""
@@ -17402,10 +15559,10 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17418,29 +15575,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17451,25 +15607,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5
-$as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; }
+        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5
+echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
             MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
-$as_echo "$MOZ_NSS_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
-$as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
             MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
-$as_echo "$MOZ_NSS_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
         else
             MOZ_NSS_CFLAGS=""
             MOZ_NSS_LIBS=""
@@ -17490,8 +15646,8 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -17507,10 +15663,10 @@ $as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consi
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17523,29 +15679,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17556,25 +15711,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for nspr " >&5
-$as_echo_n "checking for nspr ... " >&6; }
+        echo "$as_me:$LINENO: checking for nspr " >&5
+echo $ECHO_N "checking for nspr ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "nspr " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6
             MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
-$as_echo "$MOZ_NSPR_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
-$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6
             MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
-$as_echo "$MOZ_NSPR_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
         else
             MOZ_NSPR_CFLAGS=""
             MOZ_NSPR_LIBS=""
@@ -17595,8 +15750,8 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -17609,10 +15764,10 @@ $as_echo "$as_me: error: Library requirements (nspr ) not met; consider adjustin
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17625,29 +15780,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17658,25 +15812,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5
-$as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; }
+        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5
+echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
-$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6
             MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
-$as_echo "$MOZ_NSPR_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
-$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6
             MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "`
-            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
-$as_echo "$MOZ_NSPR_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
         else
             MOZ_NSPR_CFLAGS=""
             MOZ_NSPR_LIBS=""
@@ -17697,8 +15851,8 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -17711,10 +15865,10 @@ $as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; cons
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17727,29 +15881,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17760,25 +15913,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5
-$as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; }
+        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5
+echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
-$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
             MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"`
-            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
-$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
-$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
             MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"`
-            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
-$as_echo "$MOZILLAXPCOM_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
         else
             MOZILLAXPCOM_CFLAGS=""
             MOZILLAXPCOM_LIBS=""
@@ -17813,10 +15966,10 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17829,29 +15982,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17862,25 +16014,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libxul " >&5
-$as_echo_n "checking for libxul ... " >&6; }
+        echo "$as_me:$LINENO: checking for libxul " >&5
+echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libxul " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
-$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
             MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "`
-            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
-$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
-$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
             MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "`
-            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
-$as_echo "$MOZILLAXPCOM_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
         else
             MOZILLAXPCOM_CFLAGS=""
             MOZILLAXPCOM_LIBS=""
@@ -17901,8 +16053,8 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -17922,72 +16074,61 @@ $as_echo "$as_me: error: Library requirements (libxul ) not met; consider adjust
     CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
     LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
 
-{ $as_echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
-$as_echo_n "checking for PK11_GetCertFromPrivateKey in -lnss3... " >&6; }
+echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
+echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6
 if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss3  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char PK11_GetCertFromPrivateKey ();
 int
 main ()
 {
-return PK11_GetCertFromPrivateKey ();
+PK11_GetCertFromPrivateKey ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=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_lib_nss3_PK11_GetCertFromPrivateKey=no
+ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
-$as_echo "$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; }
-if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
+echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6
+if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBNSS3 1
 _ACEOF
@@ -17995,10 +16136,10 @@ _ACEOF
   LIBS="-lnss3 $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed.
+  { { echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed.
 See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
 Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&5
-$as_echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed.
+echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed.
 See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
 Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;}
    { (exit 1); exit 1; }; }
@@ -18010,17 +16151,17 @@ fi
 
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-      { $as_echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5
-$as_echo_n "checking whether $tmp was compiled with --enable-ldap... " >&6; }
+      echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5
+echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6
       if test -d "$MOZ_INC/ldap"; 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
          MOZ_LDAP_CFLAGS="-I$MOZ_INC"
       else
-        { { $as_echo "$as_me:$LINENO: error: no.
+        { { echo "$as_me:$LINENO: error: no.
 Could not find LDAP header include files in $MOZ_INC/ldap.
 Please recompile $tmp with --enable-ldap or use --with-openldap." >&5
-$as_echo "$as_me: error: no.
+echo "$as_me: error: no.
 Could not find LDAP header include files in $MOZ_INC/ldap.
 Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
    { (exit 1); exit 1; }; }
@@ -18034,40 +16175,40 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
     fi
 
 elif test "$enable_mozilla" = "no"; then
-    { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+    echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
     WITH_MOZILLA=NO
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
 if test -z "$with_mozilla_version"; then
    MOZILLA_VERSION=
 else
-   { $as_echo "$as_me:$LINENO: checking which mozilla version to build" >&5
-$as_echo_n "checking which mozilla version to build... " >&6; }
+   echo "$as_me:$LINENO: checking which mozilla version to build" >&5
+echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6
    MOZILLA_VERSION=$with_mozilla_version
    enable_build_mozilla=1
-   { $as_echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5
-$as_echo "$MOZILLA_VERSION" >&6; }
+   echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5
+echo "${ECHO_T}$MOZILLA_VERSION" >&6
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5
-$as_echo_n "checking for toolkit mozilla should use... " >&6; }
+echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5
+echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6
 if test -z "$with_mozilla_toolkit"; then
    if test "$_os" != "WINNT"; then
       MOZILLA_TOOLKIT=gtk2
-      { $as_echo "$as_me:$LINENO: result: gtk2" >&5
-$as_echo "gtk2" >&6; }
+      echo "$as_me:$LINENO: result: gtk2" >&5
+echo "${ECHO_T}gtk2" >&6
    fi
 else
    MOZILLA_TOOLKIT=$with_mozilla_toolkit
    enable_build_mozilla=1
-   { $as_echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5
-$as_echo "$MOZILLA_TOOLKIT" >&6; }
+   echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5
+echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6
 fi
 #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
 #   #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
@@ -18084,16 +16225,16 @@ else
       enable_build_mozilla=
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla" >&5
-$as_echo_n "checking whether to build Mozilla... " >&6; }
+echo "$as_me:$LINENO: checking whether to build Mozilla" >&5
+echo $ECHO_N "checking whether to build Mozilla... $ECHO_C" >&6
 if test -n "$enable_build_mozilla"; then
    BUILD_MOZAB="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
    BUILD_MOZAB=""
-   { $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 "$BUILD_MOZAB" = "TRUE"; then
@@ -18106,42 +16247,42 @@ if test "$BUILD_MOZAB" = "TRUE"; then
       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}"
    fi
    for e in gz bz2; do
-      { $as_echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5
-$as_echo_n "checking for $MOZILLA_SOURCE_VERSION.tar.$e... " >&6; }
+      echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5
+echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6
       if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+         echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6
          HAVE_MOZILLA_TARBALL=n
       else
-         { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+         echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
          HAVE_MOZILLA_TARBALL=y
       fi
    done
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         { { $as_echo "$as_me:$LINENO: error: Mozilla source archive not found.
+         { { echo "$as_me:$LINENO: error: Mozilla source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
 http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/" >&5
-$as_echo "$as_me: error: Mozilla source archive not found.
+echo "$as_me: error: Mozilla source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
 http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/" >&2;}
    { (exit 1); exit 1; }; }
    fi
    if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:$LINENO: checking for glib and libIDL binaries" >&5
-$as_echo_n "checking for glib and libIDL binaries... " >&6; }
+      echo "$as_me:$LINENO: checking for glib and libIDL binaries" >&5
+echo $ECHO_N "checking for glib and libIDL binaries... $ECHO_C" >&6
       if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
            -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
            -o ! -e "./moz/download/wintools.zip" ; then
-{ { $as_echo "$as_me:$LINENO: error: One or more of the following archives is missing in moz/download/
+{ { echo "$as_me:$LINENO: error: One or more of the following archives is missing in moz/download/
   vc71-glib-1.2.10-bin.zip
   vc71-libIDL-0.6.8-bin.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
   wintools.zip
 (from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&5
-$as_echo "$as_me: error: One or more of the following archives is missing in moz/download/
+echo "$as_me: error: One or more of the following archives is missing in moz/download/
   vc71-glib-1.2.10-bin.zip
   vc71-libIDL-0.6.8-bin.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
@@ -18149,23 +16290,23 @@ $as_echo "$as_me: error: One or more of the following archives is missing in moz
 (from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&2;}
    { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
+         echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
       fi
    elif test "$_os" = "Darwin"; then
       if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         { $as_echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5
-$as_echo "$as_me: checking whether mozilla can be built..." >&6;}
+         { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5
+echo "$as_me: checking whether mozilla can be built..." >&6;}
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18178,29 +16319,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18211,25 +16351,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... " >&6; }
+        echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5
-$as_echo_n "checking MOZGTK2_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5
+echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6
             MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-            { $as_echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5
-$as_echo "$MOZGTK2_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5
+echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5
-$as_echo_n "checking MOZGTK2_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5
+echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6
             MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-            { $as_echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5
-$as_echo "$MOZGTK2_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5
+echo "${ECHO_T}$MOZGTK2_LIBS" >&6
         else
             MOZGTK2_CFLAGS=""
             MOZGTK2_LIBS=""
@@ -18248,11 +16388,11 @@ $as_echo "$MOZGTK2_LIBS" >&6; }
   fi
 
   if test $succeeded = yes; then
-     { $as_echo "$as_me:$LINENO: OK - can build mozilla" >&5
-$as_echo "$as_me: OK - can build mozilla" >&6;}
+     { echo "$as_me:$LINENO: OK - can build mozilla" >&5
+echo "$as_me: OK - can build mozilla" >&6;}
   else
-     { { $as_echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5
-$as_echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;}
+     { { echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5
+echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -18263,10 +16403,10 @@ $as_echo "$as_me: error: Prerequisites to build mozilla not met. Either use the
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18279,29 +16419,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18312,25 +16451,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5
-$as_echo_n "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... " >&6; }
+        echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5
+echo $ECHO_N "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libIDL >= 0.6.3 libIDL <= 0.6.8" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL >= 0.6.3 libIDL <= 0.6.8"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL >= 0.6.3 libIDL <= 0.6.8"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -18355,8 +16494,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5
-$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;}
+            { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5
+echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;}
    { (exit 1); exit 1; }; }
          fi
       fi
@@ -18369,10 +16508,10 @@ $as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to b
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18385,29 +16524,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18418,25 +16556,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
-$as_echo_n "checking for gtk+-2.0... " >&6; }
+        echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
+echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gtk+-2.0" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -18461,8 +16599,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            { { $as_echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5
-$as_echo "$as_me: error: GTK2 is needed to build mozilla." >&2;}
+            { { echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5
+echo "$as_me: error: GTK2 is needed to build mozilla." >&2;}
    { (exit 1); exit 1; }; }
          fi
 
@@ -18471,10 +16609,10 @@ $as_echo "$as_me: error: GTK2 is needed to build mozilla." >&2;}
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18487,29 +16625,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18520,25 +16657,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5
-$as_echo_n "checking for libIDL-2.0 >= 0.8.0... " >&6; }
+        echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5
+echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -18563,8 +16700,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            { { $as_echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5
-$as_echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;}
+            { { echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5
+echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;}
    { (exit 1); exit 1; }; }
          fi
       else
@@ -18574,10 +16711,10 @@ $as_echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozi
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18590,29 +16727,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18623,25 +16759,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5
-$as_echo_n "checking for gtk+ >= 1.2.3... " >&6; }
+        echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5
+echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -18666,8 +16802,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            { { $as_echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5
-$as_echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;}
+            { { echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5
+echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;}
    { (exit 1); exit 1; }; }
          fi
 
@@ -18676,10 +16812,10 @@ $as_echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla.
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18692,29 +16828,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18725,25 +16860,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
-$as_echo_n "checking for libidl >= 0.6.3 libidl <= 0.6.8... " >&6; }
+        echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
+echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"`
-            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-$as_echo "$MOZLIBREQ_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -18768,8 +16903,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5
-$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;}
+            { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5
+echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;}
    { (exit 1); exit 1; }; }
          fi
       fi
@@ -18788,26 +16923,27 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which sane header to use" >&5
-$as_echo_n "checking which sane header to use... " >&6; }
+echo "$as_me:$LINENO: checking which sane header to use" >&5
+echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6
 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
 	test "$with_system_sane_header" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_SANE_HEADER=YES
    if test "${ac_cv_header_sane_sane_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5
-$as_echo_n "checking for sane/sane.h... " >&6; }
+  echo "$as_me:$LINENO: checking for sane/sane.h" >&5
+echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6
 if test "${ac_cv_header_sane_sane_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
-$as_echo "$ac_cv_header_sane_sane_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
+echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
-$as_echo_n "checking sane/sane.h usability... " >&6; }
+echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
+echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18817,39 +16953,33 @@ $ac_includes_default
 #include <sane/sane.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
-$as_echo_n "checking sane/sane.h presence... " >&6; }
+echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
+echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18857,104 +16987,112 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sane/sane.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5
-$as_echo_n "checking for sane/sane.h... " >&6; }
+echo "$as_me:$LINENO: checking for sane/sane.h" >&5
+echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6
 if test "${ac_cv_header_sane_sane_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_sane_sane_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
-$as_echo "$ac_cv_header_sane_sane_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
+echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6
 
 fi
-if test "x$ac_cv_header_sane_sane_h" = x""yes; then
+if test $ac_cv_header_sane_sane_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: sane not found. install sane" >&5
-$as_echo "$as_me: error: sane not found. install sane" >&2;}
+  { { echo "$as_me:$LINENO: error: sane not found. install sane" >&5
+echo "$as_me: error: sane not found. install sane" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    SYSTEM_SANE_HEADER=NO
    BUILD_TYPE="$BUILD_TYPE SANE"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which icu to use" >&5
-$as_echo_n "checking which icu to use... " >&6; }
+echo "$as_me:$LINENO: checking which icu to use" >&5
+echo $ECHO_N "checking which icu to use... $ECHO_C" >&6
 if test -n "$with_system_icu" -o -n "$with_system_libs" && \
 	test "$with_system_icu" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_ICU=YES
-   ac_ext=cpp
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5
-$as_echo_n "checking for unicode/rbbi.h... " >&6; }
+   echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5
+echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6
    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18962,41 +17100,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 unicode/rbbi.h
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  { $as_echo "$as_me:$LINENO: result: checked." >&5
-$as_echo "checked." >&6; }
-else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6
+else
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  { { $as_echo "$as_me:$LINENO: error: icu headers not found." >&5
-$as_echo "$as_me: error: icu headers not found." >&2;}
+  { { echo "$as_me:$LINENO: error: icu headers not found." >&5
+echo "$as_me: error: icu headers not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
-
 rm -f conftest.err conftest.$ac_ext
    # Extract the first word of "genbrk", so it can be a program name with args.
 set dummy genbrk; 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_SYSTEM_GENBRK+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SYSTEM_GENBRK in
   [\\/]* | ?:[\\/]*)
@@ -19010,39 +17147,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SYSTEM_GENBRK="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK
+
 if test -n "$SYSTEM_GENBRK"; then
-  { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5
-$as_echo "$SYSTEM_GENBRK" >&6; }
+  echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5
+echo "${ECHO_T}$SYSTEM_GENBRK" >&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 -z "$SYSTEM_GENBRK"; then
-      { { $as_echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5
-$as_echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;}
+      { { echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5
+echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;}
    { (exit 1); exit 1; }; }
    fi
    # Extract the first word of "genccode", so it can be a program name with args.
 set dummy genccode; 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_SYSTEM_GENCCODE+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SYSTEM_GENCCODE in
   [\\/]* | ?:[\\/]*)
@@ -19056,39 +17192,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SYSTEM_GENCCODE="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE
+
 if test -n "$SYSTEM_GENCCODE"; then
-  { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5
-$as_echo "$SYSTEM_GENCCODE" >&6; }
+  echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5
+echo "${ECHO_T}$SYSTEM_GENCCODE" >&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 -z "$SYSTEM_GENCCODE"; then
-      { { $as_echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5
-$as_echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;}
+      { { echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5
+echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;}
    { (exit 1); exit 1; }; }
    fi
    # Extract the first word of "gencmn", so it can be a program name with args.
 set dummy gencmn; 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_SYSTEM_GENCMN+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SYSTEM_GENCMN in
   [\\/]* | ?:[\\/]*)
@@ -19102,45 +17237,43 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SYSTEM_GENCMN="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN
+
 if test -n "$SYSTEM_GENCMN"; then
-  { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5
-$as_echo "$SYSTEM_GENCMN" >&6; }
+  echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5
+echo "${ECHO_T}$SYSTEM_GENCMN" >&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 -z "$SYSTEM_GENCMN"; then
-      { { $as_echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5
-$as_echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;}
+      { { echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5
+echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;}
    { (exit 1); exit 1; }; }
    fi
-   { $as_echo "$as_me:$LINENO: checking ICU version" >&5
-$as_echo_n "checking ICU version... " >&6; }
+   echo "$as_me:$LINENO: checking ICU version" >&5
+echo $ECHO_N "checking ICU version... $ECHO_C" >&6
       if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19158,44 +17291,30 @@ int main(int argc, char **argv) {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
-  { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+  echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
 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 )
-{ { $as_echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5
-$as_echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;}
+{ { echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5
+echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -19203,8 +17322,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_ICU=NO
     BUILD_TYPE="$BUILD_TYPE ICU"
 fi
@@ -19216,15 +17335,15 @@ fi
 
 if test  "$_os" = "Darwin"; then
    if test "x$with_x" = "xyes"; then
-      { { $as_echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5
-$as_echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;}
+      { { echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5
+echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;}
    { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5
-$as_echo_n "checking for /System/Library/Frameworks/AppKit.framework... " >&6; }
+      echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5
+echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6
       if test -d "/System/Library/Frameworks/AppKit.framework/"; 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
          x_includes="no_x_includes"
          x_libraries="no_x_libraries"
                   enable_gtk=no
@@ -19232,8 +17351,8 @@ $as_echo "yes" >&6; }
          ENABLE_CUPS=""
 
       else
-         { { $as_echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5
-$as_echo "$as_me: error: No AppKit.framewrok found" >&2;}
+         { { echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5
+echo "$as_me: error: No AppKit.framewrok found" >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
@@ -19246,66 +17365,61 @@ elif test "$_os" = "OS2" ; then
    echo "Do Nothing for _os = OS2. Don't check for X11."
       :
 elif test "$_os" != "WINNT" ; then
-   { $as_echo "$as_me:$LINENO: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
+   echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 
-# Check whether --with-x was given.
+# Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
-  withval=$with_x;
-fi
+  withval="$with_x"
 
+fi;
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
-  case $x_includes,$x_libraries in #(
-    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
-   { (exit 1); exit 1; }; };; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+    if test "${ac_cv_have_x+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
+rm -fr conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'_ACEOF'
-incroot:
-	@echo incroot='${INCROOT}'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+_ACEOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-	ac_im_usrlibdir=$ac_im_libdir; break
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+         test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
     # Screen out bogus values from the imake configuration.  They are
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
-	/usr/include) ac_x_includes= ;;
+	/usr/include) ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+	/usr/lib | /lib) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
   cd ..
-  rm -f -r conftest.dir
+  rm -fr conftest.dir
 fi
 
 # Standard set of common directories for X headers.
@@ -19346,47 +17460,47 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
 done
 fi
-
 rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
@@ -19395,99 +17509,84 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
+  LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 int
 main ()
 {
-XrmInitialize ()
+XtMalloc (0)
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+LIBS=$ac_save_LIBS
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
-    if test -r "$ac_dir/libX11.$ac_extension"; then
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/libXt.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
-esac
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
 fi
-;; #(
-    *) have_x=yes;;
-  esac
+fi
+
+  fi
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
+  echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes\
-	ac_x_includes='$x_includes'\
-	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
    if test "$no_x" = yes; then
@@ -19508,12 +17607,13 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    ac_xsave_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    cat >conftest.$ac_ext <<_ACEOF
+    case `(uname -sr) 2>/dev/null` in
+    "SunOS 5"*)
+      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19529,35 +17629,33 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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: no" >&5
-$as_echo "no" >&6; }
-       X_LIBS="$X_LIBS -R$x_libraries"
-else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_R_nospace=yes
+else
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_R_nospace=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+      if test $ac_R_nospace = yes; then
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	X_LIBS="$X_LIBS -R$x_libraries"
+      else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19573,47 +17671,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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; }
-	  X_LIBS="$X_LIBS -R $x_libraries"
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_R_space=yes
 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: neither works" >&5
-$as_echo "neither works" >&6; }
+ac_R_space=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
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	if test $ac_R_space = yes; then
+	  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6
+	fi
+      fi
+      LIBS=$ac_xsave_LIBS
+    esac
   fi
 
   # Check for system-dependent libraries X programs must link with.
@@ -19628,198 +17715,165 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XOpenDisplay ();
 int
 main ()
 {
-return XOpenDisplay ();
+XOpenDisplay ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 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: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char dnet_ntoa ();
 int
 main ()
 {
-return dnet_ntoa ();
+dnet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=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_lib_dnet_dnet_ntoa=no
+ac_cv_lib_dnet_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char dnet_ntoa ();
 int
 main ()
 {
-return dnet_ntoa ();
+dnet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=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_lib_dnet_stub_dnet_ntoa=no
+ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -19830,229 +17884,194 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
-$as_echo_n "checking for gethostbyname... " >&6; }
+    echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef gethostbyname
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
 choke me
+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
 int
 main ()
 {
-return gethostbyname ();
+return f != gethostbyname;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=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_func_gethostbyname=no
+ac_cv_func_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
 main ()
 {
-return gethostbyname ();
+gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=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_lib_nsl_gethostbyname=no
+ac_cv_lib_nsl_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
 main ()
 {
-return gethostbyname ();
+gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=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_lib_bsd_gethostbyname=no
+ac_cv_lib_bsd_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -20066,477 +18085,405 @@ fi
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
+    echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define connect innocuous_connect
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef connect
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_connect || defined __stub___connect
+#if defined (__stub_connect) || defined (__stub___connect)
 choke me
+#else
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
 int
 main ()
 {
-return connect ();
+return f != connect;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_connect=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_func_connect=no
+ac_cv_func_connect=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
+      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char connect ();
 int
 main ()
 {
-return connect ();
+connect ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=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_lib_socket_connect=no
+ac_cv_lib_socket_connect=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
+    echo "$as_me:$LINENO: checking for remove" >&5
+echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define remove innocuous_remove
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char remove ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_remove || defined __stub___remove
+#if defined (__stub_remove) || defined (__stub___remove)
 choke me
+#else
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
 int
 main ()
 {
-return remove ();
+return f != remove;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_remove=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_func_remove=no
+ac_cv_func_remove=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
+      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char remove ();
 int
 main ()
 {
-return remove ();
+remove ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=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_lib_posix_remove=no
+ac_cv_lib_posix_remove=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
+    echo "$as_me:$LINENO: checking for shmat" >&5
+echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shmat innocuous_shmat
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef shmat
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char shmat ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_shmat || defined __stub___shmat
+#if defined (__stub_shmat) || defined (__stub___shmat)
 choke me
+#else
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
 int
 main ()
 {
-return shmat ();
+return f != shmat;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_shmat=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_func_shmat=no
+ac_cv_func_shmat=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
+      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char shmat ();
 int
 main ()
 {
-return shmat ();
+shmat ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=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_lib_ipc_shmat=no
+ac_cv_lib_ipc_shmat=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -20552,72 +18499,61 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char IceConnectionNumber ();
 int
 main ()
 {
-return IceConnectionNumber ();
+IceConnectionNumber ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=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_lib_ICE_IceConnectionNumber=no
+ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -20634,156 +18570,134 @@ fi
      x_libraries="default_x_libraries"
    fi
       if test -z "$x_libraries"; then
-      { { $as_echo "$as_me:$LINENO: error: No X libraries found" >&5
-$as_echo "$as_me: error: No X libraries found" >&2;}
+      { { echo "$as_me:$LINENO: error: No X libraries found" >&5
+echo "$as_me: error: No X libraries found" >&2;}
    { (exit 1); exit 1; }; } # Exit
    fi
    if test -z "$x_includes"; then
-      { { $as_echo "$as_me:$LINENO: error: No X includes found" >&5
-$as_echo "$as_me: error: No X includes found" >&2;}
+      { { echo "$as_me:$LINENO: error: No X includes found" >&5
+echo "$as_me: error: No X includes found" >&2;}
    { (exit 1); exit 1; }; } # Exit
    fi
    CFLAGS=$X_CFLAGS
    LDFLAGS="$X_LDFLAGS $X_LIBS"
-   { $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
+   echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
+echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XOpenDisplay ();
 int
 main ()
 {
-return XOpenDisplay ();
+XOpenDisplay ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=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_lib_X11_XOpenDisplay=no
+ac_cv_lib_X11_XOpenDisplay=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   x_libs="-lX11 $X_EXTRA_LIBS"
 else
-  { { $as_echo "$as_me:$LINENO: error: X Development libraries not found" >&5
-$as_echo "$as_me: error: X Development libraries not found" >&2;}
+  { { echo "$as_me:$LINENO: error: X Development libraries not found" >&5
+echo "$as_me: error: X Development libraries not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-      { $as_echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5
-$as_echo_n "checking for XauDisposeAuth in -lXau... " >&6; }
+      echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5
+echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6
 if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXau  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XauDisposeAuth ();
 int
 main ()
 {
-return XauDisposeAuth ();
+XauDisposeAuth ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xau_XauDisposeAuth=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_lib_Xau_XauDisposeAuth=no
+ac_cv_lib_Xau_XauDisposeAuth=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
-$as_echo "$ac_cv_lib_Xau_XauDisposeAuth" >&6; }
-if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
+echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6
+if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then
   XAU_LIBS="-lXau"
 fi
 
@@ -20815,22 +18729,23 @@ fi
 
 
 if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
-            { $as_echo "$as_me:$LINENO: checking whether to use Xaw" >&5
-$as_echo_n "checking whether to use Xaw... " >&6; }
+            echo "$as_me:$LINENO: checking whether to use Xaw" >&5
+echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6
    if test "$enable_Xaw" = "no"; then
        DISABLE_XAW=TRUE
-       { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 
 for ac_header in X11/Composite.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; }
-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`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20841,74 +18756,62 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "$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"
+eval "$as_ac_Header=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Xt include headers not found" >&5
-$as_echo "$as_me: error: Xt include headers not found" >&2;}
+  { { echo "$as_me:$LINENO: error: Xt include headers not found" >&5
+echo "$as_me: error: Xt include headers not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
    else
-       { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+       echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
 for ac_header in X11/Xaw/Label.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
-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; }
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20918,39 +18821,33 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20958,97 +18855,101 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  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;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $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
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  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; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""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
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Xaw include headers not found" >&5
-$as_echo "$as_me: error: Xaw include headers not found" >&2;}
+  { { echo "$as_me:$LINENO: error: Xaw include headers not found" >&5
+echo "$as_me: error: Xaw include headers not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
 
-{ $as_echo "$as_me:$LINENO: checking for main in -lXaw" >&5
-$as_echo_n "checking for main in -lXaw... " >&6; }
+echo "$as_me:$LINENO: checking for main in -lXaw" >&5
+echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6
 if test "${ac_cv_lib_Xaw_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21059,48 +18960,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xaw_main=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_lib_Xaw_main=no
+ac_cv_lib_Xaw_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5
-$as_echo "$ac_cv_lib_Xaw_main" >&6; }
-if test "x$ac_cv_lib_Xaw_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5
+echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6
+if test $ac_cv_lib_Xaw_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXAW 1
 _ACEOF
@@ -21108,8 +18997,8 @@ _ACEOF
   LIBS="-lXaw $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5
-$as_echo "$as_me: error: Xaw library not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5
+echo "$as_me: error: Xaw library not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -21121,18 +19010,19 @@ fi
 
 if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
     if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
-$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; }
+  echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
+echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6
 if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
-$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
+echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5
-$as_echo_n "checking fontconfig/fontconfig.h usability... " >&6; }
+echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5
+echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21142,39 +19032,33 @@ $ac_includes_default
 #include <fontconfig/fontconfig.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5
-$as_echo_n "checking fontconfig/fontconfig.h presence... " >&6; }
+echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5
+echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21182,92 +19066,98 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <fontconfig/fontconfig.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
-$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; }
+echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
+echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6
 if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
-$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
+echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6
 
 fi
-if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then
+if test $ac_cv_header_fontconfig_fontconfig_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5
-$as_echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;}
+  { { echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5
+echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5
-$as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; }
+    echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5
+echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6
     if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21283,78 +19173,65 @@ int main(int argc, char **argv) {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  $as_echo "$as_me: 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 )
-{ { $as_echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5
-$as_echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;}
+{ { echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5
+echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to link to Xrender" >&5
-$as_echo_n "checking whether to link to Xrender... " >&6; }
+echo "$as_me:$LINENO: checking whether to link to Xrender" >&5
+echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6
 if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; 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
    XRENDER_LINK=YES
    with_system_xrender_headers=yes
 else
-   { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-$as_echo "no, dynamically open it" >&6; }
+   echo "$as_me:$LINENO: result: no, dynamically open it" >&5
+echo "${ECHO_T}no, dynamically open it" >&6
    XRENDER_LINK=NO
 fi
-{ $as_echo "$as_me:$LINENO: checking which Xrender headers to use" >&5
-$as_echo_n "checking which Xrender headers to use... " >&6; }
+echo "$as_me:$LINENO: checking which Xrender headers to use" >&5
+echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6
 if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
 	test "$with_system_xrender_headers" != "no"; then
-   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_XRENDER_HEADERS=YES
    if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
-$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; }
+  echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
-$as_echo_n "checking X11/extensions/Xrender.h usability... " >&6; }
+echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21364,39 +19241,33 @@ $ac_includes_default
 #include <X11/extensions/Xrender.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
-$as_echo_n "checking X11/extensions/Xrender.h presence... " >&6; }
+echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
+echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21404,154 +19275,150 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/extensions/Xrender.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
-$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; }
+echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
 
 fi
-if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then
+if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: Xrender not found. install X" >&5
-$as_echo "$as_me: error: Xrender not found. install X" >&2;}
+  { { echo "$as_me:$LINENO: error: Xrender not found. install X" >&5
+echo "$as_me: error: Xrender not found. install X" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 else
-   { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
    SYSTEM_XRENDER_HEADERS=NO
    BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
 fi
 if test "$XRENDER_LINK" = "YES"; then
 
-{ $as_echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5
-$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; }
+echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5
+echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6
 if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrender  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XRenderQueryVersion ();
 int
 main ()
 {
-return XRenderQueryVersion ();
+XRenderQueryVersion ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xrender_XRenderQueryVersion=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_lib_Xrender_XRenderQueryVersion=no
+ac_cv_lib_Xrender_XRenderQueryVersion=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
-$as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
+echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6
+if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXRENDER 1
 _ACEOF
@@ -21559,8 +19426,8 @@ _ACEOF
   LIBS="-lXrender $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: libXrender not found or functional" >&5
-$as_echo "$as_me: error: libXrender not found or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: libXrender not found or functional" >&5
+echo "$as_me: error: libXrender not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -21568,13 +19435,13 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable RandR support" >&5
-$as_echo_n "checking whether to enable RandR support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable RandR support" >&5
+echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6
 if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
    if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
 	  XRANDR_DLOPEN="TRUE"
-	  { $as_echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5
-$as_echo "resorting to dlopen libXrandr at runtime" >&6; }
+	  echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5
+echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6
    else
 	  XRANDR_DLOPEN="FALSE"
 
@@ -21583,10 +19450,10 @@ $as_echo "resorting to dlopen libXrandr at runtime" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21599,29 +19466,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21632,25 +19498,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5
-$as_echo_n "checking for xrandr >= 1.2... " >&6; }
+        echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5
+echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "xrandr >= 1.2" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5
-$as_echo_n "checking XRANDR_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5
+echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6
             XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"`
-            { $as_echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5
-$as_echo "$XRANDR_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5
+echo "${ECHO_T}$XRANDR_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5
-$as_echo_n "checking XRANDR_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5
+echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6
             XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"`
-            { $as_echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5
-$as_echo "$XRANDR_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5
+echo "${ECHO_T}$XRANDR_LIBS" >&6
         else
             XRANDR_CFLAGS=""
             XRANDR_LIBS=""
@@ -21676,18 +19542,19 @@ $as_echo "$XRANDR_LIBS" >&6; }
 
       if test "$ENABLE_RANDR" != "TRUE"; then
          if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
-$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
+  echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5
-$as_echo_n "checking X11/extensions/Xrandr.h usability... " >&6; }
+echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5
+echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21697,39 +19564,33 @@ $ac_includes_default
 #include <X11/extensions/Xrandr.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5
-$as_echo_n "checking X11/extensions/Xrandr.h presence... " >&6; }
+echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5
+echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21737,148 +19598,144 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/extensions/Xrandr.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
-$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
+echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6
 
 fi
-if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then
+if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5
-$as_echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;}
+  { { echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5
+echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
          XRANDR_CFLAGS=" "
 
-{ $as_echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5
-$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; }
+echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5
+echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6
 if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrandr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XRRQueryExtension ();
 int
 main ()
 {
-return XRRQueryExtension ();
+XRRQueryExtension ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xrandr_XRRQueryExtension=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_lib_Xrandr_XRRQueryExtension=no
+ac_cv_lib_Xrandr_XRRQueryExtension=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6
+if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXRANDR 1
 _ACEOF
@@ -21886,53 +19743,53 @@ _ACEOF
   LIBS="-lXrandr $LIBS"
 
 else
-   { { $as_echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5
-$as_echo "$as_me: error: libXrandr not found or functional" >&2;}
+   { { echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5
+echo "$as_me: error: libXrandr not found or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
          XRANDR_LIBS="-lXrandr "
          ENABLE_RANDR="TRUE"
-	     { $as_echo "$as_me:$LINENO: result: enabling RandR support" >&5
-$as_echo "enabling RandR support" >&6; }
+	     echo "$as_me:$LINENO: result: enabling RandR support" >&5
+echo "${ECHO_T}enabling RandR support" >&6
       fi
    fi
 else
    ENABLE_RANDR=""
-   { $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
 
 
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to use neon" >&5
-$as_echo_n "checking whether to use neon... " >&6; }
+echo "$as_me:$LINENO: checking whether to use neon" >&5
+echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6
 if test "$enable_neon" = "no"; then
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
     DISABLE_NEON=TRUE
 
 else
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-{ $as_echo "$as_me:$LINENO: checking which neon to use" >&5
-$as_echo_n "checking which neon to use... " >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+echo "$as_me:$LINENO: checking which neon to use" >&5
+echo $ECHO_N "checking which neon to use... $ECHO_C" >&6
 if test -n "$with_system_neon" -o -n "$with_system_libs" && \
 	test "$with_system_neon" != "no"; then
-        { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+        echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21945,29 +19802,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21978,25 +19834,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5
-$as_echo_n "checking for neon >= 0.24.0... " >&6; }
+        echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5
+echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "neon >= 0.24.0" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
-$as_echo_n "checking NEON_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
+echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6
             NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"`
-            { $as_echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
-$as_echo "$NEON_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
+echo "${ECHO_T}$NEON_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking NEON_LIBS" >&5
-$as_echo_n "checking NEON_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking NEON_LIBS" >&5
+echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6
             NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"`
-            { $as_echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
-$as_echo "$NEON_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
+echo "${ECHO_T}$NEON_LIBS" >&6
         else
             NEON_CFLAGS=""
             NEON_LIBS=""
@@ -22017,8 +19873,8 @@ $as_echo "$NEON_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5
-$as_echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;}
+     { { echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5
+echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -22026,8 +19882,8 @@ $as_echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;}
         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
         SYSTEM_NEON=YES
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_NEON=NO
     NEON_LIBS=-lneon
     NEON_CFLAGS=
@@ -22036,12 +19892,12 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
-{ $as_echo "$as_me:$LINENO: checking which libssl to use" >&5
-$as_echo_n "checking which libssl to use... " >&6; }
+echo "$as_me:$LINENO: checking which libssl to use" >&5
+echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6
 if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
         test "$with_system_openssl" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     # Mac OS builds should get out without extra stuff is the Mac porters'
     # wish. And pkg-config is although Xcode ships a .pc for openssl
     if test "$_os" = "Darwin"; then
@@ -22054,10 +19910,10 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22070,29 +19926,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -22103,25 +19958,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for openssl " >&5
-$as_echo_n "checking for openssl ... " >&6; }
+        echo "$as_me:$LINENO: checking for openssl " >&5
+echo $ECHO_N "checking for openssl ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "openssl " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
-$as_echo_n "checking OPENSSL_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
+echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6
             OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "`
-            { $as_echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
-$as_echo "$OPENSSL_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
+echo "${ECHO_T}$OPENSSL_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
-$as_echo_n "checking OPENSSL_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
+echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6
             OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "`
-            { $as_echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
-$as_echo "$OPENSSL_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
+echo "${ECHO_T}$OPENSSL_LIBS" >&6
         else
             OPENSSL_CFLAGS=""
             OPENSSL_LIBS=""
@@ -22142,16 +19997,16 @@ $as_echo "$OPENSSL_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
     fi
     SYSTEM_OPENSSL=YES
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_OPENSSL=NO
     BUILD_TYPE="$BUILD_TYPE OPENSSL"
 fi
@@ -22165,33 +20020,33 @@ fi
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable agg" >&5
-$as_echo_n "checking whether to enable agg... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable agg" >&5
+echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6
 if test "$with_agg" = "no"; then
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   ENABLE_AGG=YES
 
 
-        { $as_echo "$as_me:$LINENO: checking which AGG to use" >&5
-$as_echo_n "checking which AGG to use... " >&6; }
+        echo "$as_me:$LINENO: checking which AGG to use" >&5
+echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6
   if test -n "$with_system_agg" -o -n "$with_system_libs" && \
      test "$with_system_agg" != "no"; then
-         { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+         echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22204,29 +20059,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -22237,25 +20091,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5
-$as_echo_n "checking for libagg >= 2.3... " >&6; }
+        echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5
+echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libagg >= 2.3" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5
-$as_echo_n "checking AGG_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5
+echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6
             AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"`
-            { $as_echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5
-$as_echo "$AGG_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5
+echo "${ECHO_T}$AGG_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking AGG_LIBS" >&5
-$as_echo_n "checking AGG_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking AGG_LIBS" >&5
+echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6
             AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"`
-            { $as_echo "$as_me:$LINENO: result: $AGG_LIBS" >&5
-$as_echo "$AGG_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $AGG_LIBS" >&5
+echo "${ECHO_T}$AGG_LIBS" >&6
         else
             AGG_CFLAGS=""
             AGG_LIBS=""
@@ -22276,13 +20130,13 @@ $as_echo "$AGG_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
-         { $as_echo "$as_me:$LINENO: checking agg version" >&5
-$as_echo_n "checking agg version... " >&6; }
+         echo "$as_me:$LINENO: checking agg version" >&5
+echo $ECHO_N "checking agg version... $ECHO_C" >&6
          # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway
          # (/usr/include gets stripped from pkg-config output)
          if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then
@@ -22294,23 +20148,23 @@ $as_echo_n "checking agg version... " >&6; }
 	 	$PKG_CONFIG --modversion libagg | grep -q 2.4; then
             # 2.4's libagg.pc.in still contains 2.3 :/
             if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-               { $as_echo "$as_me:$LINENO: result: 2.4" >&5
-$as_echo "2.4" >&6; }
+               echo "$as_me:$LINENO: result: 2.4" >&5
+echo "${ECHO_T}2.4" >&6
                AGG_VERSION=2400
             else
-               { $as_echo "$as_me:$LINENO: result: 2.3" >&5
-$as_echo "2.3" >&6; }
+               echo "$as_me:$LINENO: result: 2.3" >&5
+echo "${ECHO_T}2.3" >&6
                AGG_VERSION=2300
             fi
             SYSTEM_AGG=YES
 	 else
-	    { { $as_echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5
-$as_echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;}
+	    { { echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5
+echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;}
    { (exit 1); exit 1; }; }
 	 fi
   else
-         { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+         echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
          SYSTEM_AGG=NO
          AGG_VERSION=2300
          BUILD_TYPE="$BUILD_TYPE AGG"
@@ -22319,12 +20173,12 @@ $as_echo "internal" >&6; }
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking which redland library to use" >&5
-$as_echo_n "checking which redland library to use... " >&6; }
+echo "$as_me:$LINENO: checking which redland library to use" >&5
+echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6
 if test -n "$with_system_redland" && \
 	test "$with_system_redland" != "no"; then
-	{ $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+	echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
 	SYSTEM_REDLAND=YES
 
   succeeded=no
@@ -22332,10 +20186,10 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22348,29 +20202,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -22381,25 +20234,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for redland" >&5
-$as_echo_n "checking for redland... " >&6; }
+        echo "$as_me:$LINENO: checking for redland" >&5
+echo $ECHO_N "checking for redland... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "redland" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
-$as_echo_n "checking REDLAND_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
+echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6
             REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"`
-            { $as_echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
-$as_echo "$REDLAND_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
+echo "${ECHO_T}$REDLAND_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
-$as_echo_n "checking REDLAND_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
+echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6
             REDLAND_LIBS=`$PKG_CONFIG --libs "redland"`
-            { $as_echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
-$as_echo "$REDLAND_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
+echo "${ECHO_T}$REDLAND_LIBS" >&6
         else
             REDLAND_CFLAGS=""
             REDLAND_LIBS=""
@@ -22420,28 +20273,28 @@ $as_echo "$REDLAND_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
 else
-	{ $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+	echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
 	BUILD_TYPE="$BUILD_TYPE REDLAND"
 	SYSTEM_REDLAND=NO
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which libhunspell to use" >&5
-$as_echo_n "checking which libhunspell to use... " >&6; }
+echo "$as_me:$LINENO: checking which libhunspell to use" >&5
+echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6
 if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
 	test "$with_system_hunspell" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_HUNSPELL=YES
-    ac_ext=cpp
+    ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -22453,10 +20306,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22469,29 +20322,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -22502,25 +20354,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for hunspell" >&5
-$as_echo_n "checking for hunspell... " >&6; }
+        echo "$as_me:$LINENO: checking for hunspell" >&5
+echo $ECHO_N "checking for hunspell... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "hunspell" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
-$as_echo_n "checking HUNSPELL_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
+echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6
             HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
-            { $as_echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
-$as_echo "$HUNSPELL_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
+echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
-$as_echo_n "checking HUNSPELL_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
+echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6
             HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"`
-            { $as_echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
-$as_echo "$HUNSPELL_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
+echo "${ECHO_T}$HUNSPELL_LIBS" >&6
         else
             HUNSPELL_CFLAGS=""
             HUNSPELL_LIBS=""
@@ -22546,18 +20398,19 @@ $as_echo "$HUNSPELL_LIBS" >&6; }
 
     if test "$HUNSPELL_PC" != "TRUE"; then
       if test "${ac_cv_header_hunspell_hxx+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
-$as_echo_n "checking for hunspell.hxx... " >&6; }
+  echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_hunspell_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
-$as_echo "$ac_cv_header_hunspell_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5
-$as_echo_n "checking hunspell.hxx usability... " >&6; }
+echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5
+echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22567,39 +20420,33 @@ $ac_includes_default
 #include <hunspell.hxx>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5
-$as_echo_n "checking hunspell.hxx presence... " >&6; }
+echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5
+echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22607,88 +20454,96 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <hunspell.hxx>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5
+echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
-$as_echo_n "checking for hunspell.hxx... " >&6; }
+echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_hunspell_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_hunspell_hxx=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
-$as_echo "$ac_cv_header_hunspell_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6
 
 fi
-if test "x$ac_cv_header_hunspell_hxx" = x""yes; then
+if test $ac_cv_header_hunspell_hxx = yes; then
   :
 else
 
       if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
-$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; }
+  echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
-$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5
-$as_echo_n "checking hunspell/hunspell.hxx usability... " >&6; }
+echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5
+echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22698,39 +20553,33 @@ $ac_includes_default
 #include <hunspell/hunspell.hxx>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5
-$as_echo_n "checking hunspell/hunspell.hxx presence... " >&6; }
+echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5
+echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22738,76 +20587,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <hunspell/hunspell.hxx>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
-$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; }
+echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
-$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6
 
 fi
-if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then
+if test $ac_cv_header_hunspell_hunspell_hxx = yes; then
    HUNSPELL_CFLAGS=-I/usr/include/hunspell
 else
-  { { $as_echo "$as_me:$LINENO: error: hunspell headers not found." >&5
-$as_echo "$as_me: error: hunspell headers not found." >&2;}
+  { { echo "$as_me:$LINENO: error: hunspell headers not found." >&5
+echo "$as_me: error: hunspell headers not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -22817,14 +20673,15 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for main in -lhunspell" >&5
-$as_echo_n "checking for main in -lhunspell... " >&6; }
+echo "$as_me:$LINENO: checking for main in -lhunspell" >&5
+echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6
 if test "${ac_cv_lib_hunspell_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhunspell  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22835,48 +20692,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_hunspell_main=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_lib_hunspell_main=no
+ac_cv_lib_hunspell_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5
-$as_echo "$ac_cv_lib_hunspell_main" >&6; }
-if test "x$ac_cv_lib_hunspell_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5
+echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6
+if test $ac_cv_lib_hunspell_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBHUNSPELL 1
 _ACEOF
@@ -22884,8 +20729,8 @@ _ACEOF
   LIBS="-lhunspell $LIBS"
 
 else
-   { { $as_echo "$as_me:$LINENO: error: hunspell library not found." >&5
-$as_echo "$as_me: error: hunspell library not found." >&2;}
+   { { echo "$as_me:$LINENO: error: hunspell library not found." >&5
+echo "$as_me: error: hunspell library not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -22898,8 +20743,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_HUNSPELL=NO
     BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
@@ -22907,26 +20752,27 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
-$as_echo_n "checking which altlinuxhyph to use... " >&6; }
+echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
+echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6
 if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
 	test "$with_system_altlinuxhyph" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_HYPH=YES
     if test "${ac_cv_header_hyphen_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5
-$as_echo_n "checking for hyphen.h... " >&6; }
+  echo "$as_me:$LINENO: checking for hyphen.h" >&5
+echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6
 if test "${ac_cv_header_hyphen_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
-$as_echo "$ac_cv_header_hyphen_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking hyphen.h usability" >&5
-$as_echo_n "checking hyphen.h usability... " >&6; }
+echo "$as_me:$LINENO: checking hyphen.h usability" >&5
+echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22936,39 +20782,33 @@ $ac_includes_default
 #include <hyphen.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking hyphen.h presence" >&5
-$as_echo_n "checking hyphen.h presence... " >&6; }
+echo "$as_me:$LINENO: checking hyphen.h presence" >&5
+echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22976,86 +20816,94 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <hyphen.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: hyphen.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: hyphen.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5
-$as_echo_n "checking for hyphen.h... " >&6; }
+echo "$as_me:$LINENO: checking for hyphen.h" >&5
+echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6
 if test "${ac_cv_header_hyphen_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_hyphen_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
-$as_echo "$ac_cv_header_hyphen_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6
 
 fi
-if test "x$ac_cv_header_hyphen_h" = x""yes; then
+if test $ac_cv_header_hyphen_h = yes; then
   :
 else
-   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5
-$as_echo "$as_me: error: altlinuxhyph headers not found." >&2;}
+   { { echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5
+echo "$as_me: error: altlinuxhyph headers not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5
-$as_echo_n "checking for struct _HyphenDict.cset... " >&6; }
+    echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5
+echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6
 if test "${ac_cv_member_struct__HyphenDict_cset+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23074,29 +20922,24 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_member_struct__HyphenDict_cset=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23115,296 +20958,256 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_member_struct__HyphenDict_cset=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_member_struct__HyphenDict_cset=no
+ac_cv_member_struct__HyphenDict_cset=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5
-$as_echo "$ac_cv_member_struct__HyphenDict_cset" >&6; }
-if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5
+echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6
+if test $ac_cv_member_struct__HyphenDict_cset = yes; then
   :
 else
-   { { $as_echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5
-$as_echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;}
+   { { echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5
+echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-    { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; }
+    echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
+echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6
 if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhyphen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char hnj_hyphen_hyphenate2 ();
 int
 main ()
 {
-return hnj_hyphen_hyphenate2 ();
+hnj_hyphen_hyphenate2 ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=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_lib_hyphen_hnj_hyphen_hyphenate2=no
+ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
-$as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
+echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6
+if test $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2 = yes; then
   HYPHEN_LIB=-lhyphen
 else
-   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
-$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
+   { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
+echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     if test -z "$HYPHEN_LIB"; then
-       { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; }
+       echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
+echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6
 if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhyph  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char hnj_hyphen_hyphenate2 ();
 int
 main ()
 {
-return hnj_hyphen_hyphenate2 ();
+hnj_hyphen_hyphenate2 ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_hyph_hnj_hyphen_hyphenate2=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_lib_hyph_hnj_hyphen_hyphenate2=no
+ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
-$as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
+echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6
+if test $ac_cv_lib_hyph_hnj_hyphen_hyphenate2 = yes; then
   HYPHEN_LIB=-lhyph
 else
-   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
-$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
+   { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
+echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     fi
     if test -z "$HYPHEN_LIB"; then
-       { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; }
+       echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
+echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6
 if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhnj  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char hnj_hyphen_hyphenate2 ();
 int
 main ()
 {
-return hnj_hyphen_hyphenate2 ();
+hnj_hyphen_hyphenate2 ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_hnj_hnj_hyphen_hyphenate2=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_lib_hnj_hnj_hyphen_hyphenate2=no
+ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
-$as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
+echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6
+if test $ac_cv_lib_hnj_hnj_hyphen_hyphenate2 = yes; then
   HYPHEN_LIB=-lhnj
 else
-   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
-$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
+   { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
+echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     fi
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_HYPH=NO
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking which mythes to use" >&5
-$as_echo_n "checking which mythes to use... " >&6; }
+echo "$as_me:$LINENO: checking which mythes to use" >&5
+echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6
 if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_MYTHES=YES
     if test "${ac_cv_header_mythes_hxx+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5
-$as_echo_n "checking for mythes.hxx... " >&6; }
+  echo "$as_me:$LINENO: checking for mythes.hxx" >&5
+echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_mythes_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
-$as_echo "$ac_cv_header_mythes_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking mythes.hxx usability" >&5
-$as_echo_n "checking mythes.hxx usability... " >&6; }
+echo "$as_me:$LINENO: checking mythes.hxx usability" >&5
+echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23414,39 +21217,33 @@ $ac_includes_default
 #include <mythes.hxx>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking mythes.hxx presence" >&5
-$as_echo_n "checking mythes.hxx presence... " >&6; }
+echo "$as_me:$LINENO: checking mythes.hxx presence" >&5
+echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23454,89 +21251,97 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <mythes.hxx>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: mythes.hxx:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: mythes.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5
-$as_echo_n "checking for mythes.hxx... " >&6; }
+echo "$as_me:$LINENO: checking for mythes.hxx" >&5
+echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_mythes_hxx+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_mythes_hxx=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
-$as_echo "$ac_cv_header_mythes_hxx" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6
 
 fi
-if test "x$ac_cv_header_mythes_hxx" = x""yes; then
+if test $ac_cv_header_mythes_hxx = yes; then
   :
 else
-   { { $as_echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5
-$as_echo "$as_me: error: mythes.hxx headers not found." >&2;}
+   { { echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5
+echo "$as_me: error: mythes.hxx headers not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for main in -lmythes" >&5
-$as_echo_n "checking for main in -lmythes... " >&6; }
+echo "$as_me:$LINENO: checking for main in -lmythes" >&5
+echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6
 if test "${ac_cv_lib_mythes_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmythes  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23547,48 +21352,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_mythes_main=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_lib_mythes_main=no
+ac_cv_lib_mythes_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5
-$as_echo "$ac_cv_lib_mythes_main" >&6; }
-if test "x$ac_cv_lib_mythes_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6
+if test $ac_cv_lib_mythes_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMYTHES 1
 _ACEOF
@@ -23596,38 +21389,39 @@ _ACEOF
   LIBS="-lmythes $LIBS"
 
 else
-   { { $as_echo "$as_me:$LINENO: error: mythes library not found." >&5
-$as_echo "$as_me: error: mythes library not found." >&2;}
+   { { echo "$as_me:$LINENO: error: mythes library not found." >&5
+echo "$as_me: error: mythes library not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_MYTHES=NO
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which lpsolve to use" >&5
-$as_echo_n "checking which lpsolve to use... " >&6; }
+echo "$as_me:$LINENO: checking which lpsolve to use" >&5
+echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6
 if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
 	test "$with_system_lpsolve" != "no"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_LPSOLVE=YES
     if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
-$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; }
+  echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
+echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6
 if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
-$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
+echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5
-$as_echo_n "checking lpsolve/lp_lib.h usability... " >&6; }
+echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5
+echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23637,39 +21431,33 @@ $ac_includes_default
 #include <lpsolve/lp_lib.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5
-$as_echo_n "checking lpsolve/lp_lib.h presence... " >&6; }
+echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5
+echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23677,147 +21465,143 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <lpsolve/lp_lib.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
-$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; }
+echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
+echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6
 if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
-$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
+echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6
 
 fi
-if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then
+if test $ac_cv_header_lpsolve_lp_lib_h = yes; then
   :
 else
-   { { $as_echo "$as_me:$LINENO: error: lpsolve headers not found." >&5
-$as_echo "$as_me: error: lpsolve headers not found." >&2;}
+   { { echo "$as_me:$LINENO: error: lpsolve headers not found." >&5
+echo "$as_me: error: lpsolve headers not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5
-$as_echo_n "checking for make_lp in -llpsolve55... " >&6; }
+echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5
+echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6
 if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llpsolve55  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char make_lp ();
 int
 main ()
 {
-return make_lp ();
+make_lp ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_lpsolve55_make_lp=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_lib_lpsolve55_make_lp=no
+ac_cv_lib_lpsolve55_make_lp=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5
-$as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; }
-if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5
+echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6
+if test $ac_cv_lib_lpsolve55_make_lp = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLPSOLVE55 1
 _ACEOF
@@ -23825,106 +21609,95 @@ _ACEOF
   LIBS="-llpsolve55 $LIBS"
 
 else
-   { { $as_echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5
-$as_echo "$as_me: error: lpsolve library not found or too old." >&2;}
+   { { echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5
+echo "$as_me: error: lpsolve library not found or too old." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_LPSOLVE=NO
     BUILD_TYPE="$BUILD_TYPE LPSOLVE"
 fi
 
 
 if test "$_os" = "Linux"; then
-   { $as_echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5
-$as_echo_n "checking whether libc is >= 2.1.1... " >&6; }
+   echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5
+echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6
    exec 6>/dev/null # no output
-   { $as_echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5
-$as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; }
+   echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5
+echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6
 if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char gnu_get_libc_version ();
 int
 main ()
 {
-return gnu_get_libc_version ();
+gnu_get_libc_version ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_c_gnu_get_libc_version=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_lib_c_gnu_get_libc_version=no
+ac_cv_lib_c_gnu_get_libc_version=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
-$as_echo "$ac_cv_lib_c_gnu_get_libc_version" >&6; }
-if test "x$ac_cv_lib_c_gnu_get_libc_version" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
+echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6
+if test $ac_cv_lib_c_gnu_get_libc_version = yes; then
   HAVE_LIBC=yes; export HAVE_LIBC
 fi
 
    exec 6>&1 # output on again
    if test "$HAVE_LIBC"; 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
    else
-      { { $as_echo "$as_me:$LINENO: error: no, upgrade libc" >&5
-$as_echo "$as_me: error: no, upgrade libc" >&2;}
+      { { echo "$as_me:$LINENO: error: no, upgrade libc" >&5
+echo "$as_me: error: no, upgrade libc" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
 
 if test \( "$_os" = "WINNT" \) ; then
-	{ $as_echo "$as_me:$LINENO: checking for PSDK files" >&5
-$as_echo_n "checking for PSDK files... " >&6; }
+	echo "$as_me:$LINENO: checking for PSDK files" >&5
+echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6
 	if test -z "$with_psdk_home"; then
 		# This first line will detect a February 2003 Microsoft Platform SDK
 		PSDK_HOME=`./oowintool --psdk-home`
@@ -23945,13 +21718,13 @@ $as_echo_n "checking for PSDK files... " >&6; }
         PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
     # Problem with current PSDK (iz 49865)
     if test -f "$PSDK_HOME/Lib/libcp.lib"; then
-        { { $as_echo "$as_me:$LINENO: error:
+        { { echo "$as_me:$LINENO: error:
 
 Some modules do not build correctly with MS Platform SDK - April 2005
 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
 Remove/rename/backup that file and restart configure. Details about this
 problem can be found in issue 49856." >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
 
 Some modules do not build correctly with MS Platform SDK - April 2005
 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
@@ -23973,9 +21746,9 @@ problem can be found in issue 49856." >&2;}
 		HAVE_PSDK_LIB="no"
 	fi
     if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        { { $as_echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs
+        { { echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs
 are installed or use --with-psdk-home ." >&5
-$as_echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs
+echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs
 are installed or use --with-psdk-home ." >&2;}
    { (exit 1); exit 1; }; }
     fi
@@ -23983,31 +21756,31 @@ are installed or use --with-psdk-home ." >&2;}
          -o ! -x "$PSDK_HOME/bin/msidb.exe" \
          -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
          -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
-        { { $as_echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5
-$as_echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;}
+        { { echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5
+echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;}
    { (exit 1); exit 1; }; }
     fi
-    { $as_echo "$as_me:$LINENO: result: SDK files found ...)" >&5
-$as_echo "SDK files found ...)" >&6; }
+    echo "$as_me:$LINENO: result: SDK files found ...)" >&5
+echo "${ECHO_T}SDK files found ...)" >&6
     if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
-        { $as_echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
-$as_echo "Found Windows SDK 6.1 ($PSDK_HOME)" >&6; }
+        echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
+echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6
         WINDOWS_VISTA_PSDK=TRUE
     elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
-        { $as_echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
-$as_echo "Found Windows SDK 6.0 ($PSDK_HOME)" >&6; }
+        echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
+echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6
         WINDOWS_VISTA_PSDK=TRUE
     else
-        { $as_echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
-$as_echo "Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; }
+        echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
+echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6
     fi
 fi
 
 
 
 if test \( "$_os" = "WINNT" \) ; then
-    { $as_echo "$as_me:$LINENO: checking for DirectX SDK files" >&5
-$as_echo_n "checking for DirectX SDK files... " >&6; }
+    echo "$as_me:$LINENO: checking for DirectX SDK files" >&5
+echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6
     if test -z "$with_directx_home"; then
                 if test -n "$DXSDK_DIR"; then
             DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
@@ -24039,17 +21812,17 @@ $as_echo_n "checking for DirectX SDK files... " >&6; }
     fi
     if test -n "$ENABLE_DIRECTX"; then
 	    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-		    { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+		    echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
 	    else
-		    { { $as_echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5
-$as_echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;}
+		    { { echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5
+echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;}
    { (exit 1); exit 1; }; }
 	    fi
     else
 		DIRECTXSDK_HOME=""
-		{ $as_echo "$as_me:$LINENO: result: disabled" >&5
-$as_echo "disabled" >&6; }
+		echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
     fi
 fi
 
@@ -24057,14 +21830,14 @@ fi
 
 NSIS_PATH=""
 if test "$_os" = "WINNT" ; then
-    { $as_echo "$as_me:$LINENO: checking for NSIS" >&5
-$as_echo_n "checking for NSIS... " >&6; }
+    echo "$as_me:$LINENO: checking for NSIS" >&5
+echo $ECHO_N "checking for NSIS... $ECHO_C" >&6
     # Extract the first word of "nsis.exe", so it can be a program name with args.
 set dummy nsis.exe; 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_NSIS_PATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $NSIS_PATH in
   [\\/]* | ?:[\\/]*)
@@ -24077,28 +21850,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_NSIS_PATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 NSIS_PATH=$ac_cv_path_NSIS_PATH
+
 if test -n "$NSIS_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $NSIS_PATH" >&5
-$as_echo "$NSIS_PATH" >&6; }
+  echo "$as_me:$LINENO: result: $NSIS_PATH" >&5
+echo "${ECHO_T}$NSIS_PATH" >&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 -n "$NSIS_PATH"; then
         NSIS_PATH=`dirname "$NSIS_PATH"`
     fi
@@ -24113,24 +21885,24 @@ fi
         NSIS_PATH="$nsistest"
     fi
     if test -z "$NSIS_PATH"; then
-        { $as_echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5
-$as_echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;}
+        { echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5
+echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;}
         echo "NSIS not found, no self contained installer will be build." >> warn
     else
         NSIS_PATH=`cygpath -d "$NSIS_PATH"`
         NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-        { $as_echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5
-$as_echo "found ($NSIS_PATH)" >&6; }
+        echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5
+echo "${ECHO_T}found ($NSIS_PATH)" >&6
     fi
 fi
 
 
 # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; 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_BISON+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $BISON in
   [\\/]* | ?:[\\/]*)
@@ -24143,59 +21915,58 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_BISON="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 BISON=$ac_cv_path_BISON
+
 if test -n "$BISON"; then
-  { $as_echo "$as_me:$LINENO: result: $BISON" >&5
-$as_echo "$BISON" >&6; }
+  echo "$as_me:$LINENO: result: $BISON" >&5
+echo "${ECHO_T}$BISON" >&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 -z "$BISON"; then
-   { { $as_echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5
-$as_echo "$as_me: error: no bison found in \$PATH, install bison" >&2;}
+   { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5
+echo "$as_me: error: no bison found in \$PATH, install bison" >&2;}
    { (exit 1); exit 1; }; }
 else
-   { $as_echo "$as_me:$LINENO: checking the bison version" >&5
-$as_echo_n "checking the bison version... " >&6; }
+   echo "$as_me:$LINENO: checking the bison version" >&5
+echo $ECHO_N "checking the bison version... $ECHO_C" >&6
    _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
     _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
     # Accept newer than 1.875 or older(equal) than 1.75
     if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then
        if test "$_bison_version" = "1.875" ; then
-          { $as_echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5
-$as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
+          { echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5
+echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
           echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
        else
-          { $as_echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5
-$as_echo "checked ($BISON $_bison_version)" >&6; }
+          echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5
+echo "${ECHO_T}checked ($BISON $_bison_version)" >&6
        fi
     else
-       { { $as_echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5
-$as_echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;}
+       { { echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5
+echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;}
    { (exit 1); exit 1; }; }
     fi
 fi
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; 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_FLEX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $FLEX in
   [\\/]* | ?:[\\/]*)
@@ -24208,39 +21979,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_FLEX="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FLEX=$ac_cv_path_FLEX
+
 if test -n "$FLEX"; then
-  { $as_echo "$as_me:$LINENO: result: $FLEX" >&5
-$as_echo "$FLEX" >&6; }
+  echo "$as_me:$LINENO: result: $FLEX" >&5
+echo "${ECHO_T}$FLEX" >&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 -z "$FLEX"; then
-   { { $as_echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5
-$as_echo "$as_me: error: no flex found in \$PATH, install flex" >&2;}
+   { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5
+echo "$as_me: error: no flex found in \$PATH, install flex" >&2;}
    { (exit 1); exit 1; }; }
 fi
 # Extract the first word of "patch", so it can be a program name with args.
 set dummy patch; 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_PATCH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PATCH in
   [\\/]* | ?:[\\/]*)
@@ -24253,31 +22023,30 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PATCH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PATCH=$ac_cv_path_PATCH
+
 if test -n "$PATCH"; then
-  { $as_echo "$as_me:$LINENO: result: $PATCH" >&5
-$as_echo "$PATCH" >&6; }
+  echo "$as_me:$LINENO: result: $PATCH" >&5
+echo "${ECHO_T}$PATCH" >&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 -z "$PATCH"; then
-   { { $as_echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5
-$as_echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;}
+   { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5
+echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -24288,20 +22057,20 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       if test -x "$with_gnu_patch"; then
 	GNUPATCH=$with_gnu_patch
       else
-        { { $as_echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5
-$as_echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;}
+        { { echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5
+echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
 
-   { $as_echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5
-$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; }
+   echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5
+echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6
    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; 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
    else
-  	{ { $as_echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5
-$as_echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;}
+  	{ { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5
+echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;}
    { (exit 1); exit 1; }; }
    fi
 
@@ -24311,10 +22080,10 @@ $as_echo "$as_me: error: no, GNU patch needed. install or specify with --with-gn
 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_path_GNUCP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GNUCP in
   [\\/]* | ?:[\\/]*)
@@ -24327,63 +22096,62 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GNUCP="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GNUCP=$ac_cv_path_GNUCP
+
 if test -n "$GNUCP"; then
-  { $as_echo "$as_me:$LINENO: result: $GNUCP" >&5
-$as_echo "$GNUCP" >&6; }
+  echo "$as_me:$LINENO: result: $GNUCP" >&5
+echo "${ECHO_T}$GNUCP" >&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
 
-
   test -n "$GNUCP" && break
 done
 
     if test -z $GNUCP; then
-      { { $as_echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5
-$as_echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;}
+      { { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5
+echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;}
    { (exit 1); exit 1; }; }
     fi
   else
     if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
     else
-      { { $as_echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5
-$as_echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;}
+      { { echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5
+echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 
-  { $as_echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
-$as_echo_n "checking whether $GNUCP is GNU cp... " >&6; }
+  echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
+echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6
   if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; 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
   else
    if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; 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
    else
       if test "$_os" = "Darwin"; then
          GNUCP=''
-         { $as_echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
-$as_echo "no gnucp found - using the system's cp command" >&6; }
+         echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
+echo "${ECHO_T}no gnucp found - using the system's cp command" >&6
       else
-         { { $as_echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5
-$as_echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;}
+         { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5
+echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
@@ -24397,10 +22165,10 @@ if test "$_os" = "WINNT"; then
     CYGWIN_PATH=""
     # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; 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_CYGWIN_PATH+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CYGWIN_PATH in
   [\\/]* | ?:[\\/]*)
@@ -24413,28 +22181,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CYGWIN_PATH="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH
+
 if test -n "$CYGWIN_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5
-$as_echo "$CYGWIN_PATH" >&6; }
+  echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5
+echo "${ECHO_T}$CYGWIN_PATH" >&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
 
-
     CYGWIN_PATH=`dirname "$CYGWIN_PATH"`
 fi
 if test -z "$CYGWIN_PATH"; then
@@ -24443,18 +22210,18 @@ fi
 
 
 if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-  { $as_echo "$as_me:$LINENO: checking ml.exe assembler path" >&5
-$as_echo_n "checking ml.exe assembler path... " >&6; }
+  echo "$as_me:$LINENO: checking ml.exe assembler path" >&5
+echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6
   if test -n "$with_asm_home"; then
     with_asm_home=`cygpath -u "$with_asm_home"`
   fi
   if test ! -x "$with_asm_home/ml.exe"; then
     # Extract the first word of "ml.exe", so it can be a program name with args.
 set dummy ml.exe; 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_ML_EXE+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ML_EXE in
   [\\/]* | ?:[\\/]*)
@@ -24467,36 +22234,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ML_EXE="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ML_EXE=$ac_cv_path_ML_EXE
+
 if test -n "$ML_EXE"; then
-  { $as_echo "$as_me:$LINENO: result: $ML_EXE" >&5
-$as_echo "$ML_EXE" >&6; }
+  echo "$as_me:$LINENO: result: $ML_EXE" >&5
+echo "${ECHO_T}$ML_EXE" >&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 -z "$ML_EXE"; then
       if test -x "$with_cl_home/bin/ml.exe"; then
         with_asm_home=$with_cl_home/bin
-        { $as_echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5
-$as_echo "found ($with_asm_home)" >&6; }
+        echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5
+echo "${ECHO_T}found ($with_asm_home)" >&6
       else
-        { { $as_echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5
-$as_echo "$as_me: error: Configure did not find ml.exe assembler." >&2;}
+        { { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5
+echo "$as_me: error: Configure did not find ml.exe assembler." >&2;}
    { (exit 1); exit 1; }; }
       fi
     else
@@ -24508,8 +22274,8 @@ else
 fi
 ASM_HOME="$with_asm_home"
 if test -n "$ASM_HOME"; then
-  { $as_echo "$as_me:$LINENO: result: $ASM_HOME" >&5
-$as_echo "$ASM_HOME" >&6; }
+  echo "$as_me:$LINENO: result: $ASM_HOME" >&5
+echo "${ECHO_T}$ASM_HOME" >&6
 fi
 
 
@@ -24526,10 +22292,10 @@ if test -n "$with_zip_home" ; then
 else
     # Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; 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_ZIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ZIP in
   [\\/]* | ?:[\\/]*)
@@ -24542,34 +22308,33 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ZIP="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ZIP=$ac_cv_path_ZIP
+
 if test -n "$ZIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ZIP" >&5
-$as_echo "$ZIP" >&6; }
+  echo "$as_me:$LINENO: result: $ZIP" >&5
+echo "${ECHO_T}$ZIP" >&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
 
-
     # Extract the first word of "unzip", so it can be a program name with args.
 set dummy unzip; 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_UNZIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $UNZIP in
   [\\/]* | ?:[\\/]*)
@@ -24582,49 +22347,48 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_UNZIP="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 UNZIP=$ac_cv_path_UNZIP
+
 if test -n "$UNZIP"; then
-  { $as_echo "$as_me:$LINENO: result: $UNZIP" >&5
-$as_echo "$UNZIP" >&6; }
+  echo "$as_me:$LINENO: result: $UNZIP" >&5
+echo "${ECHO_T}$UNZIP" >&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
 
-
     ZIP_HOME=`dirname "$ZIP"`
 fi
 if test -z "$ZIP" -o -z "$UNZIP"; then
-    { { $as_echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5
-$as_echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;}
+    { { echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5
+echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "$_os" = "WINNT"; then
     if test "$with_use_shell" = "4nt" ; then
          if test -z "`$ZIP -h | grep -i WinNT`" ; then
-{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
+{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
 Probably there is a cygwin version in the path." >&5
-$as_echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
+echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
 Probably there is a cygwin version in the path." >&2;}
    { (exit 1); exit 1; }; }
          fi
     else
          if test -n "`$ZIP -h | grep -i WinNT`" ; then
-{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
-$as_echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
+{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
+echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
    { (exit 1); exit 1; }; }
          fi
     fi
@@ -24632,18 +22396,18 @@ fi
 
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:$LINENO: checking for unicows.dll" >&5
-$as_echo_n "checking for unicows.dll... " >&6; }
+   echo "$as_me:$LINENO: checking for unicows.dll" >&5
+echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6
    if test -x ./external/unicows/unicows.dll; then
-      { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      { { $as_echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+      { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
 Get it from the Microsoft site and put it into external/unicows.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
 <http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&5
-$as_echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
 Get it from the Microsoft site and put it into external/unicows.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
@@ -24653,18 +22417,18 @@ may have to search Microsoft's website.) Last time it was seen at:
 fi
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:$LINENO: checking for dbghelp.dll" >&5
-$as_echo_n "checking for dbghelp.dll... " >&6; }
+   echo "$as_me:$LINENO: checking for dbghelp.dll" >&5
+echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6
    if test -x ./external/dbghelp/dbghelp.dll; then
-      { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      { { $as_echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/.
+      { { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/.
 Get it from the Microsoft site and put it into external/dbghelp.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
 <http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&5
-$as_echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/.
+echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/.
 Get it from the Microsoft site and put it into external/dbghelp.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
@@ -24677,24 +22441,24 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
           :
        else
-          { { $as_echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5
-$as_echo "$as_me: error: oowintool failed to copy CRT" >&2;}
+          { { echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5
+echo "$as_me: error: oowintool failed to copy CRT" >&2;}
    { (exit 1); exit 1; }; }
        fi
 fi
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:$LINENO: checking for gdiplus.dll" >&5
-$as_echo_n "checking for gdiplus.dll... " >&6; }
+   echo "$as_me:$LINENO: checking for gdiplus.dll" >&5
+echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6
    if test -x ./external/gdiplus/gdiplus.dll; then
-      { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      { { $as_echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/.
+      { { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/.
 Get it from the Microsoft site and put it into external/gdiplus.
 You may have to search Microsoft's website. Last time it was seen at:
 <http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." >&5
-$as_echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/.
+echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/.
 Get it from the Microsoft site and put it into external/gdiplus.
 You may have to search Microsoft's website. Last time it was seen at:
 <http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." >&2;}
@@ -24708,11 +22472,11 @@ fi
 
 if test "$_os" = "WINNT"; then
    if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   { $as_echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5
-$as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; }
+   echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5
+echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6
    if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
-      { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
       MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
       MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
@@ -24721,36 +22485,36 @@ $as_echo "found" >&6; }
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
       fi
       if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         { { $as_echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
+         { { echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
 These programs are part of the Visual Studio installation and should be found in a
 directory similar to:
 \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
 As the automatic detection fails please copy the files to external/msi/." >&5
-$as_echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
+echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
 These programs are part of the Visual Studio installation and should be found in a
 directory similar to:
 \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
 As the automatic detection fails please copy the files to external/msi/." >&2;}
    { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:$LINENO: result: found and copied" >&5
-$as_echo "found and copied" >&6; }
+         echo "$as_me:$LINENO: result: found and copied" >&5
+echo "${ECHO_T}found and copied" >&6
       fi
    fi
 fi
 fi
 
-{ $as_echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5
-$as_echo_n "checking which polygon clipping code to use... " >&6; }
+echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5
+echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6
 WITH_GPC=NO
 
 if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then
   WITH_GPC=YES
-  { $as_echo "$as_me:$LINENO: result: GPC" >&5
-$as_echo "GPC" >&6; }
+  echo "$as_me:$LINENO: result: GPC" >&5
+echo "${ECHO_T}GPC" >&6
 
-  { $as_echo "$as_me:$LINENO: checking for GPC files" >&5
-$as_echo_n "checking for GPC files... " >&6; }
+  echo "$as_me:$LINENO: checking for GPC files" >&5
+echo $ECHO_N "checking for GPC files... $ECHO_C" >&6
   if test -f ./external/gpc/gpc.h; then
 	HAVE_GPC_H="yes"
   else
@@ -24763,25 +22527,25 @@ $as_echo_n "checking for GPC files... " >&6; }
   fi
 
   if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
-	{ $as_echo "$as_me:$LINENO: result: GPC files found" >&5
-$as_echo "GPC files found" >&6; }
+	echo "$as_me:$LINENO: result: GPC files found" >&5
+echo "${ECHO_T}GPC files found" >&6
   else
-	{ { $as_echo "$as_me:$LINENO: error: GPC files not found
+	{ { echo "$as_me:$LINENO: error: GPC files not found
 ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
 or use basegfx' implementation using --without-gpc" >&5
-$as_echo "$as_me: error: GPC files not found
+echo "$as_me: error: GPC files not found
 ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
 or use basegfx' implementation using --without-gpc" >&2;}
    { (exit 1); exit 1; }; }
   fi
 else
-  { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+  echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
-$as_echo_n "checking which VCLplugs shall be built... " >&6; }
+echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
+echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6
 ENABLE_GTK=""
 if test "x$enable_gtk" = "xyes"; then
     ENABLE_GTK="TRUE"
@@ -24797,31 +22561,31 @@ fi
 
 
 if test -z "$R"; then
-	{ $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+	echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
-	{ $as_echo "$as_me:$LINENO: result: $R" >&5
-$as_echo "$R" >&6; }
+	echo "$as_me:$LINENO: result: $R" >&5
+echo "${ECHO_T}$R" >&6
 fi
 
 
 ENABLE_GCONF=""
-{ $as_echo "$as_me:$LINENO: checking whether to enable GConf support" >&5
-$as_echo_n "checking whether to enable GConf support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable GConf support" >&5
+echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
     ENABLE_GCONF="TRUE"
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24834,29 +22598,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24867,25 +22630,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
-$as_echo_n "checking for gconf-2.0 ... " >&6; }
+        echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
+echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gconf-2.0 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
-$as_echo_n "checking GCONF_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
+echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
             GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
-$as_echo "$GCONF_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
+echo "${ECHO_T}$GCONF_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
-$as_echo_n "checking GCONF_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
+echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
             GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
-$as_echo "$GCONF_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
+echo "${ECHO_T}$GCONF_LIBS" >&6
         else
             GCONF_CFLAGS=""
             GCONF_LIBS=""
@@ -24906,35 +22669,35 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
 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
 
 
 
 ENABLE_GNOMEVFS=""
-{ $as_echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5
-$as_echo_n "checking whether to enable GNOME VFS support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5
+echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
     ENABLE_GNOMEVFS="TRUE"
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24947,29 +22710,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24980,25 +22742,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
-$as_echo_n "checking for gnome-vfs-2.0 >= 2.6.0 ... " >&6; }
+        echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
+echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5
-$as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5
+echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6
             GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5
-$as_echo "$GNOMEVFS_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5
+echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5
-$as_echo_n "checking GNOMEVFS_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5
+echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6
             GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5
-$as_echo "$GNOMEVFS_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5
+echo "${ECHO_T}$GNOMEVFS_LIBS" >&6
         else
             GNOMEVFS_CFLAGS=""
             GNOMEVFS_LIBS=""
@@ -25019,8 +22781,8 @@ $as_echo "$GNOMEVFS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -25031,10 +22793,10 @@ $as_echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met;
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -25047,29 +22809,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -25080,25 +22841,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
-$as_echo_n "checking for gconf-2.0 ... " >&6; }
+        echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
+echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gconf-2.0 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
-$as_echo_n "checking GCONF_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
+echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
             GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
-$as_echo "$GCONF_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
+echo "${ECHO_T}$GCONF_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
-$as_echo_n "checking GCONF_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
+echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
             GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
-$as_echo "$GCONF_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
+echo "${ECHO_T}$GCONF_LIBS" >&6
         else
             GCONF_CFLAGS=""
             GCONF_LIBS=""
@@ -25119,15 +22880,15 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
     fi
 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
 
 
@@ -25145,10 +22906,10 @@ if test  "$test_gtk" = "yes"; then
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -25161,29 +22922,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -25194,25 +22954,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... " >&6; }
+        echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
-$as_echo_n "checking GTK_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
+echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
             GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-            { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
-$as_echo "$GTK_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
+echo "${ECHO_T}$GTK_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5
-$as_echo_n "checking GTK_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GTK_LIBS" >&5
+echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
             GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-            { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
-$as_echo "$GTK_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
+echo "${ECHO_T}$GTK_LIBS" >&6
         else
             GTK_CFLAGS=""
             GTK_LIBS=""
@@ -25233,8 +22993,8 @@ $as_echo "$GTK_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5
-$as_echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;}
+     { { echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5
+echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -25245,22 +23005,22 @@ $as_echo "$as_me: error: requirements to build the gtk-plugin not met. Use --dis
          BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
       fi
 
-      { $as_echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5
-$as_echo_n "checking whether to enable DBUS support... " >&6; }
+      echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5
+echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6
       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
           ENABLE_DBUS="TRUE"
-          { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+          echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -25273,29 +23033,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -25306,25 +23065,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5
-$as_echo_n "checking for dbus-glib-1 >= 0.70 ... " >&6; }
+        echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5
+echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
-$as_echo_n "checking DBUS_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
+echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6
             DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "`
-            { $as_echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
-$as_echo "$DBUS_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
+echo "${ECHO_T}$DBUS_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
-$as_echo_n "checking DBUS_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
+echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6
             DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "`
-            { $as_echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
-$as_echo "$DBUS_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
+echo "${ECHO_T}$DBUS_LIBS" >&6
         else
             DBUS_CFLAGS=""
             DBUS_LIBS=""
@@ -25345,37 +23104,37 @@ $as_echo "$DBUS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
       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
 
-      { $as_echo "$as_me:$LINENO: checking whether to enable GIO support" >&5
-$as_echo_n "checking whether to enable GIO support... " >&6; }
+      echo "$as_me:$LINENO: checking whether to enable GIO support" >&5
+echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6
       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
           if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
-             { { $as_echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5
-$as_echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;}
+             { { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5
+echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;}
    { (exit 1); exit 1; }; }
           fi
           ENABLE_GIO="TRUE"
-          { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+          echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -25388,29 +23147,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -25421,25 +23179,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gio-2.0 " >&5
-$as_echo_n "checking for gio-2.0 ... " >&6; }
+        echo "$as_me:$LINENO: checking for gio-2.0 " >&5
+echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gio-2.0 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5
-$as_echo_n "checking GIO_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5
+echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6
             GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5
-$as_echo "$GIO_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5
+echo "${ECHO_T}$GIO_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GIO_LIBS" >&5
-$as_echo_n "checking GIO_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GIO_LIBS" >&5
+echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6
             GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "`
-            { $as_echo "$as_me:$LINENO: result: $GIO_LIBS" >&5
-$as_echo "$GIO_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GIO_LIBS" >&5
+echo "${ECHO_T}$GIO_LIBS" >&6
         else
             GIO_CFLAGS=""
             GIO_LIBS=""
@@ -25460,14 +23218,14 @@ $as_echo "$GIO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
       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
 
    fi
@@ -25486,18 +23244,18 @@ SYSTEM_CAIRO=""
 
 if test  "$test_cairo" = "yes"; then
 
-    { $as_echo "$as_me:$LINENO: checking whether to use cairo" >&5
-$as_echo_n "checking whether to use cairo... " >&6; }
+    echo "$as_me:$LINENO: checking whether to use cairo" >&5
+echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6
     if test "x$enable_cairo" != "xno" ; then
         ENABLE_CAIRO="TRUE"
-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-        { $as_echo "$as_me:$LINENO: checking which cairo to use" >&5
-$as_echo_n "checking which cairo to use... " >&6; }
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        echo "$as_me:$LINENO: checking which cairo to use" >&5
+echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6
         if test -n "$with_system_cairo" -o -n "$with_system_libs" && \
            test "$with_system_cairo" != "no"; then
-           { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+           echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
            SYSTEM_CAIRO=YES
 
 
@@ -25506,10 +23264,10 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -25522,29 +23280,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -25555,25 +23312,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5
-$as_echo_n "checking for cairo >= 1.0.2 ... " >&6; }
+        echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5
+echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
-$as_echo_n "checking CAIRO_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
+echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
             CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "`
-            { $as_echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
-$as_echo "$CAIRO_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
+echo "${ECHO_T}$CAIRO_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
-$as_echo_n "checking CAIRO_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
+echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
             CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "`
-            { $as_echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
-$as_echo "$CAIRO_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
+echo "${ECHO_T}$CAIRO_LIBS" >&6
         else
             CAIRO_CFLAGS=""
             CAIRO_LIBS=""
@@ -25594,29 +23351,28 @@ $as_echo "$CAIRO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
 	   if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-	      { { $as_echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5
-$as_echo "$as_me: error: Cairo library requires fontconfig." >&2;}
+	      { { echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5
+echo "$as_me: error: Cairo library requires fontconfig." >&2;}
    { (exit 1); exit 1; }; }
 	   fi
            if test "$with_system_xrender_headers" = "yes"; then
-              { $as_echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5
-$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; }
+              echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5
+echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6
               if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -25635,56 +23391,42 @@ int main(int argc, char **argv) {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  $as_echo "$as_me: 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 )
-{ { $as_echo "$as_me:$LINENO: error: no, X headers too old." >&5
-$as_echo "$as_me: error: no, X headers too old." >&2;}
+{ { echo "$as_me:$LINENO: error: no, X headers too old." >&5
+echo "$as_me: error: no, X headers too old." >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
            fi
         else
            BUILD_TYPE="$BUILD_TYPE CAIRO"
 	   	   if test "$build_cpu" != "x86_64"; then
 	      BUILD_PIXMAN=YES
 	   fi
-           { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+           echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
         fi
     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
 fi
 
@@ -25695,26 +23437,27 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5
-$as_echo_n "checking whether to build the OpenGL Transitions component... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5
+echo $ECHO_N "checking whether to build the OpenGL Transitions component... $ECHO_C" >&6
 ENABLE_OPENGL=
 
 if test "x$enable_opengl" != "xno" ; 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
    if test "${ac_cv_header_GL_gl_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-$as_echo_n "checking for GL/gl.h... " >&6; }
+  echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
 if test "${ac_cv_header_GL_gl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-$as_echo "$ac_cv_header_GL_gl_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
-$as_echo_n "checking GL/gl.h usability... " >&6; }
+echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
+echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -25724,39 +23467,33 @@ $ac_includes_default
 #include <GL/gl.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
-$as_echo_n "checking GL/gl.h presence... " >&6; }
+echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
+echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -25764,89 +23501,97 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <GL/gl.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: GL/gl.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: GL/gl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-$as_echo_n "checking for GL/gl.h... " >&6; }
+echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
 if test "${ac_cv_header_GL_gl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_GL_gl_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-$as_echo "$ac_cv_header_GL_gl_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
 
 fi
-if test "x$ac_cv_header_GL_gl_h" = x""yes; then
+if test $ac_cv_header_GL_gl_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: OpenGL headers not found" >&5
-$as_echo "$as_me: error: OpenGL headers not found" >&2;}
+  { { echo "$as_me:$LINENO: error: OpenGL headers not found" >&5
+echo "$as_me: error: OpenGL headers not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for main in -lGL" >&5
-$as_echo_n "checking for main in -lGL... " >&6; }
+echo "$as_me:$LINENO: checking for main in -lGL" >&5
+echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
 if test "${ac_cv_lib_GL_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGL  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -25857,48 +23602,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_GL_main=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_lib_GL_main=no
+ac_cv_lib_GL_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
-$as_echo "$ac_cv_lib_GL_main" >&6; }
-if test "x$ac_cv_lib_GL_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
+echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
+if test $ac_cv_lib_GL_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGL 1
 _ACEOF
@@ -25906,20 +23639,21 @@ _ACEOF
   LIBS="-lGL $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: libGL not installed or functional" >&5
-$as_echo "$as_me: error: libGL not installed or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: libGL not installed or functional" >&5
+echo "$as_me: error: libGL not installed or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for main in -lGLU" >&5
-$as_echo_n "checking for main in -lGLU... " >&6; }
+echo "$as_me:$LINENO: checking for main in -lGLU" >&5
+echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6
 if test "${ac_cv_lib_GLU_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGLU  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -25930,48 +23664,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_GLU_main=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_lib_GLU_main=no
+ac_cv_lib_GLU_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5
-$as_echo "$ac_cv_lib_GLU_main" >&6; }
-if test "x$ac_cv_lib_GLU_main" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5
+echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6
+if test $ac_cv_lib_GLU_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGLU 1
 _ACEOF
@@ -25979,58 +23701,58 @@ _ACEOF
   LIBS="-lGLU $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5
-$as_echo "$as_me: error: libGLU not installed or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5
+echo "$as_me: error: libGLU not installed or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
    ENABLE_OPENGL=TRUE
 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
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5
-$as_echo_n "checking whether to build the Presentation Minimizer extension... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5
+echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6
 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; 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
    ENABLE_MINIMIZER=YES
 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
    ENABLE_MINIMIZER=NO
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5
-$as_echo_n "checking whether to build the Presenter Screen extension... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5
+echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6
 if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; 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
    ENABLE_PRESENTER_SCREEN=YES
 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
    ENABLE_PRESENTER_SCREEN=NO
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5
-$as_echo_n "checking whether to build the PDF Import extension... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5
+echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6
 if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; 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
   ENABLE_PDFIMPORT=YES
 
-        { $as_echo "$as_me:$LINENO: checking which pdf backend to use" >&5
-$as_echo_n "checking which pdf backend to use... " >&6; }
+        echo "$as_me:$LINENO: checking which pdf backend to use" >&5
+echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6
   if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
        test "$with_system_poppler" != "no"; then
-      { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+      echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
       SYSTEM_POPPLER=YES
 
   succeeded=no
@@ -26038,10 +23760,10 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -26054,29 +23776,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -26087,25 +23808,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5
-$as_echo_n "checking for poppler >= 0.8.0 ... " >&6; }
+        echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5
+echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
-$as_echo_n "checking POPPLER_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
+echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6
             POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "`
-            { $as_echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
-$as_echo "$POPPLER_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
+echo "${ECHO_T}$POPPLER_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
-$as_echo_n "checking POPPLER_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
+echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6
             POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "`
-            { $as_echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
-$as_echo "$POPPLER_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
+echo "${ECHO_T}$POPPLER_LIBS" >&6
         else
             POPPLER_CFLAGS=""
             POPPLER_LIBS=""
@@ -26126,30 +23847,30 @@ $as_echo "$POPPLER_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
   else
-      { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+      echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
       SYSTEM_POPPLER=NO
       BUILD_TYPE="$BUILD_TYPE XPDF"
-      { $as_echo "$as_me:$LINENO: checking for xpdf module" >&5
-$as_echo_n "checking for xpdf module... " >&6; }
+      echo "$as_me:$LINENO: checking for xpdf module" >&5
+echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6
       if test -d ./xpdf; then
-       { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+       echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
       else
-        { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
-$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+        { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
    { (exit 1); exit 1; }; }
       fi
   fi
 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
    ENABLE_PDFIMPORT=NO
 fi
 
@@ -26158,62 +23879,62 @@ fi
 
 
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  { $as_echo "$as_me:$LINENO: checking for sdext module" >&5
-$as_echo_n "checking for sdext module... " >&6; }
+  echo "$as_me:$LINENO: checking for sdext module" >&5
+echo $ECHO_N "checking for sdext module... $ECHO_C" >&6
   if test -d ./sdext; then
-   { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+   echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
   else
-   { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
-$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
    { (exit 1); exit 1; }; }
   fi
   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5
-$as_echo_n "checking whether to build the Wiki Publisher extension... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5
+echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6
 if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-  { $as_echo "$as_me:$LINENO: checking for swext module" >&5
-$as_echo_n "checking for swext module... " >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  echo "$as_me:$LINENO: checking for swext module" >&5
+echo $ECHO_N "checking for swext module... $ECHO_C" >&6
   if test -d ./swext; then
-   { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+   echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
   else
-   { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
-$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
    { (exit 1); exit 1; }; }
   fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
 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
   ENABLE_MEDIAWIKI=NO
 fi
 
 
 if test "$ENABLE_MEDIAWIKI" == "YES"; then
-  { $as_echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
-$as_echo_n "checking which Servlet API Jar to use... " >&6; }
+  echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
+echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6
   if test -n "$with_system_servlet_api"; then
-    { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_SERVLETAPI=YES
       if test -z "$SERVLETAPI_JAR"; then
 	SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
       fi
-      as_ac_File=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5
-$as_echo_n "checking for $SERVLETAPI_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+      as_ac_File=`echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5
+echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$SERVLETAPI_JAR"; then
   eval "$as_ac_File=yes"
@@ -26221,23 +23942,19 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5
-$as_echo "$as_me: error: servlet-api.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5
+echo "$as_me: error: servlet-api.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
   else
-    { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_SERVLETAPI=NO
     BUILD_TYPE="$BUILD_TYPE TOMCAT"
   fi
@@ -26245,40 +23962,40 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5
-$as_echo_n "checking whether to build the Report Builder extension... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5
+echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6
 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; 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
   ENABLE_REPORTBUILDER=YES
-  { $as_echo "$as_me:$LINENO: checking for reportbuilder module" >&5
-$as_echo_n "checking for reportbuilder module... " >&6; }
+  echo "$as_me:$LINENO: checking for reportbuilder module" >&5
+echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6
   if test -d ./reportbuilder; then
-    { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+    echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
   else
-    { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
-$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+    { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
    { (exit 1); exit 1; }; }
   fi
-  { $as_echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
-$as_echo_n "checking which jfreereport libs to use... " >&6; }
+  echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
+echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
   if test "$with_system_jfreereport" == "yes"; then
    	SYSTEM_JFREEREPORT=YES
-  	   { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+  	   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
       fi
-      as_ac_File=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $SAC_JAR" >&5
-$as_echo_n "checking for $SAC_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+      as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $SAC_JAR" >&5
+echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$SAC_JAR"; then
   eval "$as_ac_File=yes"
@@ -26286,30 +24003,26 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: sac.jar not found." >&5
-$as_echo "$as_me: error: sac.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: sac.jar not found." >&5
+echo "$as_me: error: sac.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
       if test -z $LIBXML_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libxml-1.0.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libxml-1.0.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libxml-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes
@@ -26317,20 +24030,20 @@ else
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libxml_1_0_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6
+if test $ac_cv_file__usr_share_java_libxml_1_0_0_jar = yes; then
    LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5
-$as_echo_n "checking for /usr/share/java/libxml.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libxml.jar"; then
   ac_cv_file__usr_share_java_libxml_jar=yes
@@ -26338,13 +24051,13 @@ else
   ac_cv_file__usr_share_java_libxml_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6
+if test $ac_cv_file__usr_share_java_libxml_jar = yes; then
    LIBXML_JAR=/usr/share/java/libxml.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5
-$as_echo "$as_me: error: libxml.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5
+echo "$as_me: error: libxml.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26354,15 +24067,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5
-$as_echo_n "checking for $LIBXML_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5
+echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBXML_JAR"; then
   eval "$as_ac_File=yes"
@@ -26370,31 +24083,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: libxml.jar not found." >&5
-$as_echo "$as_me: error: libxml.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libxml.jar not found." >&5
+echo "$as_me: error: libxml.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $FLUTE_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/flute-1.3.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/flute-1.3.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flute-1.3.0.jar"; then
   ac_cv_file__usr_share_java_flute_1_3_0_jar=yes
@@ -26402,20 +24111,20 @@ else
   ac_cv_file__usr_share_java_flute_1_3_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flute_1_3_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6
+if test $ac_cv_file__usr_share_java_flute_1_3_0_jar = yes; then
    FLUTE_JAR=/usr/share/java/flute-1.3.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5
-$as_echo_n "checking for /usr/share/java/flute.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flute.jar"; then
   ac_cv_file__usr_share_java_flute_jar=yes
@@ -26423,13 +24132,13 @@ else
   ac_cv_file__usr_share_java_flute_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6
+if test $ac_cv_file__usr_share_java_flute_jar = yes; then
    FLUTE_JAR=/usr/share/java/flute.jar
 else
-   { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5
-$as_echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;}
+   { { echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5
+echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26439,15 +24148,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5
-$as_echo_n "checking for $FLUTE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5
+echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$FLUTE_JAR"; then
   eval "$as_ac_File=yes"
@@ -26455,31 +24164,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5
-$as_echo "$as_me: error: flute-1.3.0.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5
+echo "$as_me: error: flute-1.3.0.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $JFREEREPORT_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5
-$as_echo_n "checking for /usr/share/java/flow-engine-0.9.2.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/flow-engine-0.9.2.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes
@@ -26487,20 +24192,20 @@ else
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6
+if test $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar = yes; then
    JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5
-$as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/flow-engine.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flow-engine.jar"; then
   ac_cv_file__usr_share_java_flow_engine_jar=yes
@@ -26508,13 +24213,13 @@ else
   ac_cv_file__usr_share_java_flow_engine_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_jar" >&6
+if test $ac_cv_file__usr_share_java_flow_engine_jar = yes; then
    JFREEREPORT_JAR=/usr/share/java/flow-engine.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5
-$as_echo "$as_me: error: jfreereport.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5
+echo "$as_me: error: jfreereport.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26524,15 +24229,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5
-$as_echo_n "checking for $JFREEREPORT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5
+echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$JFREEREPORT_JAR"; then
   eval "$as_ac_File=yes"
@@ -26540,31 +24245,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5
-$as_echo "$as_me: error: jfreereport.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5
+echo "$as_me: error: jfreereport.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBLAYOUT_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5
-$as_echo_n "checking for /usr/share/java/liblayout-0.2.9.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.9.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/liblayout-0.2.9.jar"; then
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes
@@ -26572,20 +24273,20 @@ else
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6
+if test $ac_cv_file__usr_share_java_liblayout_0_2_9_jar = yes; then
    LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5
-$as_echo_n "checking for /usr/share/java/liblayout.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/liblayout.jar"; then
   ac_cv_file__usr_share_java_liblayout_jar=yes
@@ -26593,13 +24294,13 @@ else
   ac_cv_file__usr_share_java_liblayout_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6
+if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then
    LIBLAYOUT_JAR=/usr/share/java/liblayout.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5
-$as_echo "$as_me: error: liblayout.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5
+echo "$as_me: error: liblayout.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26609,15 +24310,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5
-$as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5
+echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBLAYOUT_JAR"; then
   eval "$as_ac_File=yes"
@@ -26625,31 +24326,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: liblayout.jar not found." >&5
-$as_echo "$as_me: error: liblayout.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: liblayout.jar not found." >&5
+echo "$as_me: error: liblayout.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBLOADER_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libloader-1.0.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libloader-1.0.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libloader-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes
@@ -26657,20 +24354,20 @@ else
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libloader_1_0_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6
+if test $ac_cv_file__usr_share_java_libloader_1_0_0_jar = yes; then
    LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5
-$as_echo_n "checking for /usr/share/java/libloader.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libloader.jar"; then
   ac_cv_file__usr_share_java_libloader_jar=yes
@@ -26678,13 +24375,13 @@ else
   ac_cv_file__usr_share_java_libloader_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6
+if test $ac_cv_file__usr_share_java_libloader_jar = yes; then
    LIBLOADER_JAR=/usr/share/java/libloader.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5
-$as_echo "$as_me: error: libloader.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5
+echo "$as_me: error: libloader.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26694,15 +24391,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5
-$as_echo_n "checking for $LIBLOADER_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5
+echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBLOADER_JAR"; then
   eval "$as_ac_File=yes"
@@ -26710,31 +24407,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: libloader.jar not found." >&5
-$as_echo "$as_me: error: libloader.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libloader.jar not found." >&5
+echo "$as_me: error: libloader.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBFORMULA_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libformula-0.2.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libformula-0.2.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libformula-0.2.0.jar"; then
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes
@@ -26742,20 +24435,20 @@ else
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libformula_0_2_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6
+if test $ac_cv_file__usr_share_java_libformula_0_2_0_jar = yes; then
    LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5
-$as_echo_n "checking for /usr/share/java/libformula.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libformula.jar"; then
   ac_cv_file__usr_share_java_libformula_jar=yes
@@ -26763,13 +24456,13 @@ else
   ac_cv_file__usr_share_java_libformula_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6
+if test $ac_cv_file__usr_share_java_libformula_jar = yes; then
    LIBFORMULA_JAR=/usr/share/java/libformula.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5
-$as_echo "$as_me: error: libformula.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5
+echo "$as_me: error: libformula.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26779,15 +24472,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5
-$as_echo_n "checking for $LIBFORMULA_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5
+echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBFORMULA_JAR"; then
   eval "$as_ac_File=yes"
@@ -26795,31 +24488,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: libformula.jar not found." >&5
-$as_echo "$as_me: error: libformula.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libformula.jar not found." >&5
+echo "$as_me: error: libformula.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBREPOSITORY_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/librepository-1.0.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/librepository-1.0.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/librepository-1.0.0.jar"; then
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes
@@ -26827,20 +24516,20 @@ else
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_librepository_1_0_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6
+if test $ac_cv_file__usr_share_java_librepository_1_0_0_jar = yes; then
    LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5
-$as_echo_n "checking for /usr/share/java/librepository.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/librepository.jar"; then
   ac_cv_file__usr_share_java_librepository_jar=yes
@@ -26848,13 +24537,13 @@ else
   ac_cv_file__usr_share_java_librepository_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6
+if test $ac_cv_file__usr_share_java_librepository_jar = yes; then
    LIBREPOSITORY_JAR=/usr/share/java/librepository.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5
-$as_echo "$as_me: error: librepository.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5
+echo "$as_me: error: librepository.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26864,15 +24553,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5
-$as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5
+echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBREPOSITORY_JAR"; then
   eval "$as_ac_File=yes"
@@ -26880,31 +24569,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: librepository.jar not found." >&5
-$as_echo "$as_me: error: librepository.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: librepository.jar not found." >&5
+echo "$as_me: error: librepository.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBFONTS_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libfonts-1.0.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libfonts-1.0.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libfonts-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes
@@ -26912,20 +24597,20 @@ else
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6
+if test $ac_cv_file__usr_share_java_libfonts_1_0_0_jar = yes; then
    LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5
-$as_echo_n "checking for /usr/share/java/libfonts.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libfonts.jar"; then
   ac_cv_file__usr_share_java_libfonts_jar=yes
@@ -26933,13 +24618,13 @@ else
   ac_cv_file__usr_share_java_libfonts_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6
+if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then
    LIBFONTS_JAR=/usr/share/java/libfonts.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5
-$as_echo "$as_me: error: libfonts.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5
+echo "$as_me: error: libfonts.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -26949,15 +24634,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5
-$as_echo_n "checking for $LIBFONTS_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5
+echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBFONTS_JAR"; then
   eval "$as_ac_File=yes"
@@ -26965,31 +24650,27 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: libfonts.jar not found." >&5
-$as_echo "$as_me: error: libfonts.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libfonts.jar not found." >&5
+echo "$as_me: error: libfonts.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBSERIALIZER_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libserializer-1.0.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libserializer-1.0.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libserializer-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes
@@ -26997,20 +24678,20 @@ else
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6
+if test $ac_cv_file__usr_share_java_libserializer_1_0_0_jar = yes; then
    LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5
-$as_echo_n "checking for /usr/share/java/libserializer.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libserializer.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libserializer.jar"; then
   ac_cv_file__usr_share_java_libserializer_jar=yes
@@ -27018,13 +24699,13 @@ else
   ac_cv_file__usr_share_java_libserializer_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_jar" >&6
+if test $ac_cv_file__usr_share_java_libserializer_jar = yes; then
    LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5
-$as_echo "$as_me: error: libserializer.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5
+echo "$as_me: error: libserializer.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -27034,15 +24715,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5
-$as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5
+echo $ECHO_N "checking for $LIBSERIALIZER_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBSERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
@@ -27050,17 +24731,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: libserializer.jar not found." >&5
-$as_echo "$as_me: error: libserializer.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libserializer.jar not found." >&5
+echo "$as_me: error: libserializer.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -27068,14 +24745,14 @@ fi
 
 
       if test -z $LIBBASE_JAR; then
-        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5
-$as_echo_n "checking for /usr/share/java/libbase-1.0.0.jar... " >&6; }
+        echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libbase-1.0.0.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libbase-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes
@@ -27083,20 +24760,20 @@ else
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libbase_1_0_0_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6
+if test $ac_cv_file__usr_share_java_libbase_1_0_0_jar = yes; then
    LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar
 else
 
-            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5
-$as_echo_n "checking for /usr/share/java/libbase.jar... " >&6; }
+            echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libbase.jar... $ECHO_C" >&6
 if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libbase.jar"; then
   ac_cv_file__usr_share_java_libbase_jar=yes
@@ -27104,13 +24781,13 @@ else
   ac_cv_file__usr_share_java_libbase_jar=no
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_jar" >&6
+if test $ac_cv_file__usr_share_java_libbase_jar = yes; then
    LIBBASE_JAR=/usr/share/java/libbase.jar
 else
-  { { $as_echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5
-$as_echo "$as_me: error: libbase.jar replacement not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5
+echo "$as_me: error: libbase.jar replacement not found." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -27120,15 +24797,15 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5
-$as_echo_n "checking for $LIBBASE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5
+echo $ECHO_N "checking for $LIBBASE_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$LIBBASE_JAR"; then
   eval "$as_ac_File=yes"
@@ -27136,33 +24813,29 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: libbase.jar not found." >&5
-$as_echo "$as_me: error: libbase.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: libbase.jar not found." >&5
+echo "$as_me: error: libbase.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
       fi
 
   else
-     { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
-     { $as_echo "$as_me:$LINENO: checking for jfreereport module" >&5
-$as_echo_n "checking for jfreereport module... " >&6; }
+     echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
+     echo "$as_me:$LINENO: checking for jfreereport module" >&5
+echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6
      if test -d ./jfreereport; then
-      { $as_echo "$as_me:$LINENO: result: OK" >&5
-$as_echo "OK" >&6; }
+      echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
      else
-      { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
-$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+      { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
    { (exit 1); exit 1; }; }
      fi
      SYSTEM_JFREEREPORT=NO
@@ -27170,8 +24843,8 @@ $as_echo "$as_me: error: not existing. get it (did you get the -extensions tarba
   fi
   BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 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
   ENABLE_REPORTBUILDER=NO
   SYSTEM_JFREEREPORT=NO
 fi
@@ -27192,25 +24865,25 @@ fi
 # this has to be here because both the wiki publisher and the SRB use
 # commons-logging
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-  { $as_echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
-$as_echo_n "checking which Apache commons-* libs to use... " >&6; }
+  echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
+echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6
   if test "$with_system_apache_commons" = "yes"; then
        SYSTEM_APACHE_COMMONS=YES
-       { $as_echo "$as_me:$LINENO: result: external" >&5
-$as_echo "external" >&6; }
+       echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
         if test -z "$COMMONS_CODEC_JAR"; then
                 COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
         fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
-$as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$COMMONS_CODEC_JAR"; then
   eval "$as_ac_File=yes"
@@ -27218,32 +24891,28 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5
-$as_echo "$as_me: error: commons-codec.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5
+echo "$as_me: error: commons-codec.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
         if test -z "$COMMONS_LANG_JAR"; then
                 COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
         fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
-$as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$COMMONS_LANG_JAR"; then
   eval "$as_ac_File=yes"
@@ -27251,32 +24920,28 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5
-$as_echo "$as_me: error: commons-lang.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5
+echo "$as_me: error: commons-lang.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
         if test -z "$COMMONS_HTTPCLIENT_JAR"; then
                 COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
         fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "$COMMONS_HTTPCLIENT_JAR"; then
   eval "$as_ac_File=yes"
@@ -27284,17 +24949,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5
-$as_echo "$as_me: error: commons-httpclient.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5
+echo "$as_me: error: commons-httpclient.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -27303,41 +24964,37 @@ fi
         if test -z "$COMMONS_LOGGING_JAR"; then
                 COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
         fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+   as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "$COMMONS_HTTPCLIENT_JAR"; then
+if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5
-$as_echo "$as_me: error: commons-httpclient.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5
+echo "$as_me: error: commons-logging.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
     fi
   else
-        { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
+        echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
         SYSTEM_APACHE_COMMONS=NO
         BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
@@ -27389,8 +25046,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     kde_test_include="ksharedptr.h"
     kde_test_library="libkdeui.so"
 
-        { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5
-$as_echo_n "checking for Qt headers... " >&6; }
+        echo "$as_me:$LINENO: checking for Qt headers" >&5
+echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6
     qt_incdir="no"
     for kde_check in $qt_incdirs ; do
         if test -r "$kde_check/$qt_test_include" ; then
@@ -27398,18 +25055,18 @@ $as_echo_n "checking for Qt headers... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:$LINENO: result: $qt_incdir" >&5
-$as_echo "$qt_incdir" >&6; }
+    echo "$as_me:$LINENO: result: $qt_incdir" >&5
+echo "${ECHO_T}$qt_incdir" >&6
     if test "x$qt_incdir" = "xno" ; then
-        { { $as_echo "$as_me:$LINENO: error: Qt headers not found.  Please specify the root of
+        { { echo "$as_me:$LINENO: error: Qt headers not found.  Please specify the root of
 your Qt installation by exporting QTDIR before running \"configure\"." >&5
-$as_echo "$as_me: error: Qt headers not found.  Please specify the root of
+echo "$as_me: error: Qt headers not found.  Please specify the root of
 your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-        { $as_echo "$as_me:$LINENO: checking for Qt libraries" >&5
-$as_echo_n "checking for Qt libraries... " >&6; }
+        echo "$as_me:$LINENO: checking for Qt libraries" >&5
+echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
         if test -r "$qt_check/$qt_test_library" ; then
@@ -27417,22 +25074,22 @@ $as_echo_n "checking for Qt libraries... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:$LINENO: result: $qt_libdir" >&5
-$as_echo "$qt_libdir" >&6; }
+    echo "$as_me:$LINENO: result: $qt_libdir" >&5
+echo "${ECHO_T}$qt_libdir" >&6
     if test "x$qt_libdir" = "xno" ; then
-        { { $as_echo "$as_me:$LINENO: error: Qt libraries not found.  Please specify the root of
+        { { echo "$as_me:$LINENO: error: Qt libraries not found.  Please specify the root of
 your Qt installation by exporting QTDIR before running \"configure\"." >&5
-$as_echo "$as_me: error: Qt libraries not found.  Please specify the root of
+echo "$as_me: error: Qt libraries not found.  Please specify the root of
 your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
     fi
 
     # Extract the first word of "moc", so it can be a program name with args.
 set dummy moc; 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_MOC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MOC in
   [\\/]* | ?:[\\/]*)
@@ -27446,39 +25103,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MOC="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no"
   ;;
 esac
 fi
 MOC=$ac_cv_path_MOC
+
 if test -n "$MOC"; then
-  { $as_echo "$as_me:$LINENO: result: $MOC" >&5
-$as_echo "$MOC" >&6; }
+  echo "$as_me:$LINENO: result: $MOC" >&5
+echo "${ECHO_T}$MOC" >&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 "$MOC" = "no" ; then
-        { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found.  Please specify
+        { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5
-$as_echo "$as_me: error: Qt Meta Object Compiler not found.  Please specify
+echo "$as_me: error: Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
      fi
 
-        { $as_echo "$as_me:$LINENO: checking for KDE headers" >&5
-$as_echo_n "checking for KDE headers... " >&6; }
+        echo "$as_me:$LINENO: checking for KDE headers" >&5
+echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6
     kde_incdir="no"
     for kde_check in $kde_incdirs ; do
         if test -r "$kde_check/$kde_test_include" ; then
@@ -27486,18 +25142,18 @@ $as_echo_n "checking for KDE headers... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5
-$as_echo "$kde_incdir" >&6; }
+    echo "$as_me:$LINENO: result: $kde_incdir" >&5
+echo "${ECHO_T}$kde_incdir" >&6
     if test "x$kde_incdir" = "xno" ; then
-        { { $as_echo "$as_me:$LINENO: error: KDE headers not found.  Please specify the root of
+        { { echo "$as_me:$LINENO: error: KDE headers not found.  Please specify the root of
 your KDE installation by exporting KDEDIR before running \"configure\"." >&5
-$as_echo "$as_me: error: KDE headers not found.  Please specify the root of
+echo "$as_me: error: KDE headers not found.  Please specify the root of
 your KDE installation by exporting KDEDIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-        { $as_echo "$as_me:$LINENO: checking for KDE libraries" >&5
-$as_echo_n "checking for KDE libraries... " >&6; }
+        echo "$as_me:$LINENO: checking for KDE libraries" >&5
+echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
         if test -r "$kde_check/$kde_test_library" ; then
@@ -27505,12 +25161,12 @@ $as_echo_n "checking for KDE libraries... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5
-$as_echo "$kde_libdir" >&6; }
+    echo "$as_me:$LINENO: result: $kde_libdir" >&5
+echo "${ECHO_T}$kde_libdir" >&6
     if test "x$kde_libdir" = "xno" ; then
-        { { $as_echo "$as_me:$LINENO: error: KDE libraries not found.  Please specify the root of
+        { { echo "$as_me:$LINENO: error: KDE libraries not found.  Please specify the root of
 your KDE installation by exporting KDEDIR before running \"configure\"." >&5
-$as_echo "$as_me: error: KDE libraries not found.  Please specify the root of
+echo "$as_me: error: KDE libraries not found.  Please specify the root of
 your KDE installation by exporting KDEDIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
     fi
@@ -27522,34 +25178,34 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5
-$as_echo_n "checking whether to enable the lockdown pieces... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5
+echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6
 ENABLE_LOCKDOWN=""
 if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then
   ENABLE_LOCKDOWN=YES
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5
-$as_echo_n "checking whether to enable evolution 2 support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5
+echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6
 if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; 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
 
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$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_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -27562,29 +25218,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$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
 done
-IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -27595,25 +25250,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for gobject-2.0" >&5
-$as_echo_n "checking for gobject-2.0... " >&6; }
+        echo "$as_me:$LINENO: checking for gobject-2.0" >&5
+echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "gobject-2.0" ; 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
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5
-$as_echo_n "checking GOBJECT_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5
+echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6
             GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"`
-            { $as_echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5
-$as_echo "$GOBJECT_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5
+echo "${ECHO_T}$GOBJECT_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5
-$as_echo_n "checking GOBJECT_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5
+echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6
             GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"`
-            { $as_echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5
-$as_echo "$GOBJECT_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5
+echo "${ECHO_T}$GOBJECT_LIBS" >&6
         else
             GOBJECT_CFLAGS=""
             GOBJECT_LIBS=""
@@ -27634,27 +25289,27 @@ $as_echo "$GOBJECT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
    ENABLE_EVOAB2="TRUE"
 else
    ENABLE_EVOAB2=""
-   { $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
 
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5
-$as_echo_n "checking whether to enable KDE address book support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5
+echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6
 if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-   ac_ext=cpp
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -27662,18 +25317,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-   { $as_echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5
-$as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; }
+   echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5
+echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6
        if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -27689,44 +25343,30 @@ int main(int argc, char **argv) {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  $as_echo "$as_me: 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 )
-{ { $as_echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5
-$as_echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;}
+{ { echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5
+echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
    CXXFLAGS=$save_CXXFLAGS
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -27736,55 +25376,56 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
    ENABLE_KAB=TRUE
 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
    ENABLE_KAB=
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include FontOOo" >&5
-$as_echo_n "checking whether to include FontOOo... " >&6; }
+echo "$as_me:$LINENO: checking whether to include FontOOo" >&5
+echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6
 if test -n "$enable_fontooo"; then
   if test "$enable_fontooo" = "no"; then
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
     WITH_FONTOOO=NO
     SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
   else
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
     WITH_FONTOOO=YES
     BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
   fi
 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
   WITH_FONTOOO=NO
   SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
 fi
 
 
 if test "$WITH_FONTOOO" = "YES"; then
-        { $as_echo "$as_me:$LINENO: checking whether to use system libmspack" >&5
-$as_echo_n "checking whether to use system libmspack... " >&6; }
+        echo "$as_me:$LINENO: checking whether to use system libmspack" >&5
+echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6
   if test -n "$with_system_mspack" -o -n "$with_system_libs" && \
 	  test "$with_system_mspack" != "no"; 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
     SYSTEM_MSPACK=YES
     if test "${ac_cv_header_mspack_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for mspack.h" >&5
-$as_echo_n "checking for mspack.h... " >&6; }
+  echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
 if test "${ac_cv_header_mspack_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-$as_echo "$ac_cv_header_mspack_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking mspack.h usability" >&5
-$as_echo_n "checking mspack.h usability... " >&6; }
+echo "$as_me:$LINENO: checking mspack.h usability" >&5
+echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -27794,39 +25435,33 @@ $ac_includes_default
 #include <mspack.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking mspack.h presence" >&5
-$as_echo_n "checking mspack.h presence... " >&6; }
+echo "$as_me:$LINENO: checking mspack.h presence" >&5
+echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -27834,147 +25469,143 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <mspack.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: mspack.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: mspack.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for mspack.h" >&5
-$as_echo_n "checking for mspack.h... " >&6; }
+echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
 if test "${ac_cv_header_mspack_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_mspack_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-$as_echo "$ac_cv_header_mspack_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
 
 fi
-if test "x$ac_cv_header_mspack_h" = x""yes; then
+if test $ac_cv_header_mspack_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5
-$as_echo "$as_me: error: mspack.h not found, install libmspack" >&2;}
+  { { echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5
+echo "$as_me: error: mspack.h not found, install libmspack" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5
-$as_echo_n "checking for mspack_create_cab_decompressor in -lmspack... " >&6; }
+echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5
+echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6
 if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmspack  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char mspack_create_cab_decompressor ();
 int
 main ()
 {
-return mspack_create_cab_decompressor ();
+mspack_create_cab_decompressor ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_mspack_mspack_create_cab_decompressor=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_lib_mspack_mspack_create_cab_decompressor=no
+ac_cv_lib_mspack_mspack_create_cab_decompressor=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5
-$as_echo "$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; }
-if test "x$ac_cv_lib_mspack_mspack_create_cab_decompressor" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5
+echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6
+if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMSPACK 1
 _ACEOF
@@ -27982,102 +25613,87 @@ _ACEOF
   LIBS="-lmspack $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5
-$as_echo "$as_me: error: libmspack not installed or functional" >&2;}
+  { { echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5
+echo "$as_me: error: libmspack not installed or functional" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
   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
     SYSTEM_MSPACK=NO
   fi
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5
-$as_echo_n "checking whether to include MathMLDTD... " >&6; }
+echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5
+echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6
 if test -n "$enable_mathmldtd"; then
   if test "$enable_mathmldtd" = "no"; then
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
     SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
   else
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
     BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
   fi
 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
   SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5
-$as_echo_n "checking whether to include Bitstream Vera fonts... " >&6; }
+echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5
+echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6
 if test "$with_fonts" != "no" ; 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
   WITH_FONTS=YES
   BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
 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
   WITH_FONTS=NO
   SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include PPDs" >&5
-$as_echo_n "checking whether to include PPDs... " >&6; }
+echo "$as_me:$LINENO: checking whether to include PPDs" >&5
+echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6
 if test "$with_ppds" != "no"; 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
 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
   WITHOUT_PPDS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include AFMs" >&5
-$as_echo_n "checking whether to include AFMs... " >&6; }
+echo "$as_me:$LINENO: checking whether to include AFMs" >&5
+echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6
 if test "$with_afms" != "no"; 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
 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
   WITHOUT_AFMS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include writer2latex" >&5
-$as_echo_n "checking whether to include writer2latex... " >&6; }
-if test "$with_writer2latex" != "no" ; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-  WITH_WRITER2LATEX=YES
-  BUILD_TYPE="$BUILD_TYPE WRITER2LATEX"
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-  WITH_WRITER2LATEX=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
-fi
-
-
 
 
-{ $as_echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5
-$as_echo_n "checking whether and how to use Xinerama... " >&6; }
+echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5
+echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6
 if test "$_os" = "Darwin"; then
    USE_XINERAMA=YES
    XINERAMA_LINK=dynamic
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
    if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
       # we have both versions, let the user decide but use the dynamic one
@@ -28107,21 +25723,22 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
       XINERAMA_LINK=none
    fi
    if test "$USE_XINERAMA" = "YES"; then
-      { $as_echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5
-$as_echo "yes, with $XINERAMA_LINK linking" >&6; }
+      echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5
+echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6
       if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
-$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; }
+  echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5
-$as_echo_n "checking X11/extensions/Xinerama.h usability... " >&6; }
+echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5
+echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -28131,39 +25748,33 @@ $ac_includes_default
 #include <X11/extensions/Xinerama.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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
+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; }
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5
-$as_echo_n "checking X11/extensions/Xinerama.h presence... " >&6; }
+echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5
+echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -28171,76 +25782,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/extensions/Xinerama.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;}
-
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
-$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; }
+echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
 
 fi
-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then
+if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: Xinerama header not found." >&5
-$as_echo "$as_me: error: Xinerama header not found." >&2;}
+  { { echo "$as_me:$LINENO: error: Xinerama header not found." >&5
+echo "$as_me: error: Xinerama header not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -28253,72 +25871,61 @@ fi
           XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
       fi
 
-{ $as_echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5
-$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; }
+echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5
+echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6
 if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XineramaIsActive ();
 int
 main ()
 {
-return XineramaIsActive ();
+XineramaIsActive ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xinerama_XineramaIsActive=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_lib_Xinerama_XineramaIsActive=no
+ac_cv_lib_Xinerama_XineramaIsActive=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
-$as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; }
-if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6
+if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXINERAMA 1
 _ACEOF
@@ -28326,18 +25933,18 @@ _ACEOF
   LIBS="-lXinerama $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Xinerama not functional?" >&5
-$as_echo "$as_me: error: Xinerama not functional?" >&2;}
+  { { echo "$as_me:$LINENO: error: Xinerama not functional?" >&5
+echo "$as_me: error: Xinerama not functional?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
    else
-      { $as_echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5
-$as_echo "no, libXinerama not found or wrong architecture." >&6; }
+      echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5
+echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6
    fi
 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
 
 
@@ -28351,10 +25958,10 @@ if test -z "$with_ant_home"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$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_ANT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -28367,28 +25974,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ANT="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ANT=$ac_cv_path_ANT
+
 if test -n "$ANT"; then
-  { $as_echo "$as_me:$LINENO: result: $ANT" >&5
-$as_echo "$ANT" >&6; }
+  echo "$as_me:$LINENO: result: $ANT" >&5
+echo "${ECHO_T}$ANT" >&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
 
-
   test -n "$ANT" && break
 done
 
@@ -28400,10 +26006,10 @@ else
 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_path_ANT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -28417,28 +26023,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ANT="$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
 done
-IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ANT=$ac_cv_path_ANT
+
 if test -n "$ANT"; then
-  { $as_echo "$as_me:$LINENO: result: $ANT" >&5
-$as_echo "$ANT" >&6; }
+  echo "$as_me:$LINENO: result: $ANT" >&5
+echo "${ECHO_T}$ANT" >&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
 
-
   test -n "$ANT" && break
 done
 
@@ -28447,8 +26052,8 @@ done
 fi
 
 if test -z "$ANT"; then
-  { { $as_echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5
-$as_echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;}
+  { { echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5
+echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;}
    { (exit 1); exit 1; }; }
 else
   # resolve relative or absolute symlink
@@ -28474,8 +26079,8 @@ else
   fi
   ant_minminor1=`echo $ant_minver | cut -d"." -f2`
 
-  { $as_echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
-$as_echo_n "checking whether ant is >= $ant_minver... " >&6; }
+  echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
+echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6
   ant_version=`$ANT -version | $AWK '{ print $4; }'`
   ant_version_major=`echo $ant_version | cut -d. -f1`
   ant_version_minor=`echo $ant_version | cut -d. -f2`
@@ -28483,18 +26088,18 @@ echo "configure: ant_version $ant_version " >&5
 echo "configure: ant_version_major $ant_version_major " >&5
 echo "configure: ant_version_minor $ant_version_minor " >&5
   if test "$ant_version_major" -ge "2"; then
-  	{ $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-$as_echo "yes, $ant_version" >&6; }
+  	echo "$as_me:$LINENO: result: yes, $ant_version" >&5
+echo "${ECHO_T}yes, $ant_version" >&6
   elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-  	{ $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-$as_echo "yes, $ant_version" >&6; }
+  	echo "$as_me:$LINENO: result: yes, $ant_version" >&5
+echo "${ECHO_T}yes, $ant_version" >&6
   else
-  	{ { $as_echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5
-$as_echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;}
+  	{ { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5
+echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;}
    { (exit 1); exit 1; }; }
   fi
-  { $as_echo "$as_me:$LINENO: checking if $ANT works" >&5
-$as_echo_n "checking if $ANT works... " >&6; }
+  echo "$as_me:$LINENO: checking if $ANT works" >&5
+echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6
 cat > conftest.java << EOF
     public class conftest {
 	int testmethod(int a, int b) {
@@ -28521,11 +26126,11 @@ EOF
   { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:$LINENO: result: Ant works" >&5
-$as_echo "Ant works" >&6; }
+    echo "$as_me:$LINENO: result: Ant works" >&5
+echo "${ECHO_T}Ant works" >&6
     if test -z "$WITH_ANT_HOME"; then
         ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
         if test -z "$ANT_HOME"; then
@@ -28538,8 +26143,8 @@ $as_echo "Ant works" >&6; }
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
-    { $as_echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5
-$as_echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5
+echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;}
     ANT_HOME=""
     echo "Ant does not work - Some Java projects will not build!" >>warn
   fi
@@ -28552,8 +26157,8 @@ fi
 
 
 if test "$ANT_HOME" != "NO_ANT_HOME"; then
-   { $as_echo "$as_me:$LINENO: checking Ant lib directory" >&5
-$as_echo_n "checking Ant lib directory... " >&6; }
+   echo "$as_me:$LINENO: checking Ant lib directory" >&5
+echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6
    if test -f $ANT_HOME/lib/ant.jar; then
 	  ANT_LIB="$ANT_HOME/lib"
    else
@@ -28569,23 +26174,23 @@ $as_echo_n "checking Ant lib directory... " >&6; }
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
-                    { { $as_echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
-$as_echo "$as_me: error: Ant libraries not found!" >&2;}
+                    { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
+echo "$as_me: error: Ant libraries not found!" >&2;}
    { (exit 1); exit 1; }; }
                 fi
              fi
           fi
       fi
    fi
-   { $as_echo "$as_me:$LINENO: result: Ant lib directory found." >&5
-$as_echo "Ant lib directory found." >&6; }
+   echo "$as_me:$LINENO: result: Ant lib directory found." >&5
+echo "${ECHO_T}Ant lib directory found." >&6
 fi
 
 fi
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
-{ $as_echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5
-$as_echo_n "checking whether ant supports mapper type=\"regexp\"... " >&6; }
+echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5
+echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6
 rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
@@ -28620,178 +26225,178 @@ EOF
   { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   if test $? = 0 && test -f ./conftest.class ; 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
     rm -rf confdir
   else
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
     rm -rf confdir
-    { { $as_echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5
-$as_echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;}
+    { { echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5
+echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
 rm -f conftest* core core.* *.core
 
-{ $as_echo "$as_me:$LINENO: checking which languages to be built" >&5
-$as_echo_n "checking which languages to be built... " >&6; }
+echo "$as_me:$LINENO: checking which languages to be built" >&5
+echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG"; then
-   { $as_echo "$as_me:$LINENO: result: en-US" >&5
-$as_echo "en-US" >&6; }
+   echo "$as_me:$LINENO: result: en-US" >&5
+echo "${ECHO_T}en-US" >&6
 else
-   { $as_echo "$as_me:$LINENO: result: $WITH_LANG" >&5
-$as_echo "$WITH_LANG" >&6; }
+   echo "$as_me:$LINENO: result: $WITH_LANG" >&5
+echo "${ECHO_T}$WITH_LANG" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5
-$as_echo_n "checking which languages have poor help localizations... " >&6; }
+echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5
+echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6
 WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
 if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then
-   { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+   echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
-   { $as_echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
-$as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; }
+   echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
+echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking which dictionaries to include" >&5
-$as_echo_n "checking which dictionaries to include... " >&6; }
+echo "$as_me:$LINENO: checking which dictionaries to include" >&5
+echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6
 if test -z "$with_dict"; then
    WITH_DICT=,ALL,
-   { $as_echo "$as_me:$LINENO: result: ALL" >&5
-$as_echo "ALL" >&6; }
+   echo "$as_me:$LINENO: result: ALL" >&5
+echo "${ECHO_T}ALL" >&6
 else
    WITH_DICT=","$with_dict","
-   { $as_echo "$as_me:$LINENO: result: $with_dict" >&5
-$as_echo "$with_dict" >&6; }
+   echo "$as_me:$LINENO: result: $with_dict" >&5
+echo "${ECHO_T}$with_dict" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5
-$as_echo_n "checking for additional 'intro' bitmaps... " >&6; }
+echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5
+echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6
 INTRO_BITMAPS=
 if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
    INTRO_BITMAPS=
-   { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+   echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
    for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
       case "$bitmap" in
          *.bmp) ;;
-         *)     bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5
-$as_echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;;
+         *)     bitmap= ; { echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5
+echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;;
       esac
       if test -n "$bitmap" ; then
          INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
       fi
    done
-   { $as_echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5
-$as_echo "$INTRO_BITMAPS" >&6; }
+   echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5
+echo "${ECHO_T}$INTRO_BITMAPS" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5
-$as_echo_n "checking for additional 'about' bitmaps... " >&6; }
+echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5
+echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6
 ABOUT_BITMAPS=
 if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
    ABOUT_BITMAPS=
-   { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+   echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
    for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
       case "$bitmap" in
          *.bmp) ;;
-         *)     bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5
-$as_echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;;
+         *)     bitmap= ; { echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5
+echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;;
       esac
       if test -n "$bitmap" ; then
          ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
       fi
    done
-   { $as_echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5
-$as_echo "$ABOUT_BITMAPS" >&6; }
+   echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5
+echo "${ECHO_T}$ABOUT_BITMAPS" >&6
 fi
 
 
 OOO_VENDOR=
-{ $as_echo "$as_me:$LINENO: checking for vendor" >&5
-$as_echo_n "checking for vendor... " >&6; }
+echo "$as_me:$LINENO: checking for vendor" >&5
+echo $ECHO_N "checking for vendor... $ECHO_C" >&6
 if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
-   { $as_echo "$as_me:$LINENO: result: not set" >&5
-$as_echo "not set" >&6; }
+   echo "$as_me:$LINENO: result: not set" >&5
+echo "${ECHO_T}not set" >&6
 else
    OOO_VENDOR="$with_vendor"
-   { $as_echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5
-$as_echo "$OOO_VENDOR" >&6; }
+   echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5
+echo "${ECHO_T}$OOO_VENDOR" >&6
 fi
 
 
 UNIXWRAPPERNAME=
-{ $as_echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5
-$as_echo_n "checking for UNIX wrapper name... " >&6; }
+echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5
+echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6
 if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no"  -o "$with_unix_wrapper" = "yes" ; then
-   { $as_echo "$as_me:$LINENO: result: not set" >&5
-$as_echo "not set" >&6; }
+   echo "$as_me:$LINENO: result: not set" >&5
+echo "${ECHO_T}not set" >&6
 else
    UNIXWRAPPERNAME="$with_unix_wrapper"
-   { $as_echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5
-$as_echo "$UNIXWRAPPERNAME" >&6; }
+   echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5
+echo "${ECHO_T}$UNIXWRAPPERNAME" >&6
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5
-$as_echo_n "checking whether to statically link to Gtk... " >&6; }
+echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5
+echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6
 if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
    ENABLE_STATIC_GTK="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
    ENABLE_STATIC_GTK="FALSE"
-   { $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
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5
-$as_echo_n "checking whether to use layout dialogs... " >&6; }
+echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5
+echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6
 if test -n "$enable_layout" && test "$enable_layout" != "no"; then
    ENABLE_LAYOUT="TRUE"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
    ENABLE_LAYOUT="FALSE"
-   { $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
 
 
 # ===================================================================
 # De- or increase default verbosity of build process
 # ===================================================================
-{ $as_echo "$as_me:$LINENO: checking build verbosity" >&5
-$as_echo_n "checking build verbosity... " >&6; }
+echo "$as_me:$LINENO: checking build verbosity" >&5
+echo $ECHO_N "checking build verbosity... $ECHO_C" >&6
 if test -n "$enable_verbose"; then
    if test "$enable_verbose" == "yes"; then
       VERBOSE="TRUE"
-      { $as_echo "$as_me:$LINENO: result: high" >&5
-$as_echo "high" >&6; }
+      echo "$as_me:$LINENO: result: high" >&5
+echo "${ECHO_T}high" >&6
    fi
    if test "$enable_verbose" == "no"; then
       VERBOSE="FALSE"
-      { $as_echo "$as_me:$LINENO: result: low" >&5
-$as_echo "low" >&6; }
+      echo "$as_me:$LINENO: result: low" >&5
+echo "${ECHO_T}low" >&6
    fi
 else
-   { $as_echo "$as_me:$LINENO: result: not set" >&5
-$as_echo "not set" >&6; }
+   echo "$as_me:$LINENO: result: not set" >&5
+echo "${ECHO_T}not set" >&6
 fi
 
 
@@ -28802,22 +26407,22 @@ echo "*                                                                  *"
 echo "********************************************************************"
 
 if test -z "$COMPATH"; then
-   { { $as_echo "$as_me:$LINENO: error: No compiler found." >&5
-$as_echo "$as_me: error: No compiler found." >&2;}
+   { { echo "$as_me:$LINENO: error: No compiler found." >&5
+echo "$as_me: error: No compiler found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking solver path" >&5
-$as_echo_n "checking solver path... " >&6; }
+echo "$as_me:$LINENO: checking solver path" >&5
+echo $ECHO_N "checking solver path... $ECHO_C" >&6
 if test -z "$with_local_solver"; then
    LOCAL_SOLVER="DEFAULT"
-   { $as_echo "$as_me:$LINENO: result: default" >&5
-$as_echo "default" >&6; }
+   echo "$as_me:$LINENO: result: default" >&5
+echo "${ECHO_T}default" >&6
 else
    LOCAL_SOLVER=$with_local_solver
-   { $as_echo "$as_me:$LINENO: result: $with_local_solver" >&5
-$as_echo "$with_local_solver" >&6; }
+   echo "$as_me:$LINENO: result: $with_local_solver" >&5
+echo "${ECHO_T}$with_local_solver" >&6
 fi
 
 
@@ -28826,8 +26431,7 @@ fi
 # make sure config.guess is +x; we execute config.guess, so it has to be so;
 chmod +x ./config.guess
 
-ac_config_files="$ac_config_files set_soenv Makefile"
-
+                    ac_config_files="$ac_config_files set_soenv Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -28846,59 +26450,39 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    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;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
+{
   (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
-    esac |
-    sort
-) |
+    esac;
+} |
   sed '
-     /^ac_cv_env_/b end
      t clear
-     :clear
+     : clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-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;}
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
     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 "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
@@ -28907,54 +26491,63 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
+fi
+
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 #
 # If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
+# take arguments), then we branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
-ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
+cat >confdef2opt.sed <<\_ACEOF
 t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
 t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
 t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 
 ac_libobjs=
 ac_ltlibobjs=
 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"`
-  # 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"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_i=`echo "$ac_i" |
+         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -28962,14 +26555,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-
 : ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$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.
@@ -28982,141 +26573,57 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-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=';'
-  }
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
 fi
 
 # Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# 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.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
 # Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 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 -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -29124,168 +26631,200 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
 
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
     sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
       N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
       t loop
-      s/-\n.*//
+      s,-$,,
+      s,^['$as_cr_digits']*\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
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
   # Exit status is that of the last command.
   exit
 }
 
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-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
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
     as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
   fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
 
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
 
 exec 6>&1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -29293,107 +26832,125 @@ generated by GNU Autoconf 2.63.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
 _ACEOF
 
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
 
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
 
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
 
-_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
+  -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
+  --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
 
 Configuration files:
 $config_files
 
 Report bugs to <bug-autoconf@gnu.org>."
-
 _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.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.57,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+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'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+srcdir=$srcdir
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
   --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  *)
+  -*)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
   -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 ;;
-  --debug | --debu | --deb | --de | --d | -d )
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --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;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    $as_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
-Try \`$0 --help' for more information." >&2
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
+  *) ac_config_targets="$ac_config_targets $1" ;;
 
   esac
   shift
@@ -29407,47 +26964,31 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-# Handling of arguments.
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
-  case $ac_config_target in
-    "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "set_soenv" ) CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  *) { { 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
 
-
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -29457,464 +26998,617 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
+# simply because there is no reason to put it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# Create a temporary directory, and hook for its removal unless debugging.
 $debug ||
 {
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
+
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
+  tmp=./confstat$$-$RANDOM
+  (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'.
-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; }; }
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    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;}
-   { (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
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
+cat >>$CONFIG_STATUS <<_ACEOF
 
-eval set X "  :F $CONFIG_FILES      "
-shift
-for ac_tag
-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;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) 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;}
-   { (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'"
-    done
+#
+# CONFIG_FILES section.
+#
 
-    # 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.'
-    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;}
+# 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
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@EGREP@,$EGREP,;t t
+s,@AWK@,$AWK,;t t
+s,@SED@,$SED,;t t
+s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t
+s,@_solenv@,$_solenv,;t t
+s,@UPD@,$UPD,;t t
+s,@SOURCEVERSION@,$SOURCEVERSION,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@target@,$target,;t t
+s,@target_cpu@,$target_cpu,;t t
+s,@target_vendor@,$target_vendor,;t t
+s,@target_os@,$target_os,;t t
+s,@GNUTAR@,$GNUTAR,;t t
+s,@OSVERSION@,$OSVERSION,;t t
+s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
+s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
+s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
+s,@VC_STANDARD@,$VC_STANDARD,;t t
+s,@ENABLE_WERROR@,$ENABLE_WERROR,;t t
+s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
+s,@PRODUCT@,$PRODUCT,;t t
+s,@PROFULLSWITCH@,$PROFULLSWITCH,;t t
+s,@PROEXT@,$PROEXT,;t t
+s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t
+s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t
+s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t
+s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t
+s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t
+s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t
+s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t
+s,@DISABLE_ATL@,$DISABLE_ATL,;t t
+s,@ENABLE_RPATH@,$ENABLE_RPATH,;t t
+s,@WITH_MYSPELL_DICTS@,$WITH_MYSPELL_DICTS,;t t
+s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t
+s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t
+s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t
+s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t
+s,@USE_SHELL@,$USE_SHELL,;t t
+s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t
+s,@SHELLPATH@,$SHELLPATH,;t t
+s,@GCC_HOME@,$GCC_HOME,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@COMPATH@,$COMPATH,;t t
+s,@GCCVER@,$GCCVER,;t t
+s,@HAVE_LD_BSYMBOLIC_FUNCTIONS@,$HAVE_LD_BSYMBOLIC_FUNCTIONS,;t t
+s,@ENABLE_PCH@,$ENABLE_PCH,;t t
+s,@GNUMAKE@,$GNUMAKE,;t t
+s,@_cc@,$_cc,;t t
+s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t
+s,@PERL@,$PERL,;t t
+s,@MSPDB_PATH@,$MSPDB_PATH,;t t
+s,@COMEX@,$COMEX,;t t
+s,@USE_MINGW@,$USE_MINGW,;t t
+s,@MIDL_PATH@,$MIDL_PATH,;t t
+s,@CSC_PATH@,$CSC_PATH,;t t
+s,@FRAME_HOME@,$FRAME_HOME,;t t
+s,@CPP@,$CPP,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t
+s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t
+s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t
+s,@ENABLE_VBA@,$ENABLE_VBA,;t t
+s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t
+s,@PAM@,$PAM,;t t
+s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t
+s,@PAM_LINK@,$PAM_LINK,;t t
+s,@CRYPT_LINK@,$CRYPT_LINK,;t t
+s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t
+s,@MINGW_LIB_INCLUDE_PATH@,$MINGW_LIB_INCLUDE_PATH,;t t
+s,@STLPORT4@,$STLPORT4,;t t
+s,@STLPORT_VER@,$STLPORT_VER,;t t
+s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t
+s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t
+s,@ALLOC@,$ALLOC,;t t
+s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t
+s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t
+s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t
+s,@JAVACOMPILER@,$JAVACOMPILER,;t t
+s,@JAVACISGCJ@,$JAVACISGCJ,;t t
+s,@JAVADOC@,$JAVADOC,;t t
+s,@AWTLIB@,$AWTLIB,;t t
+s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t
+s,@JAVA_HOME@,$JAVA_HOME,;t t
+s,@JDK@,$JDK,;t t
+s,@JAVAFLAGS@,$JAVAFLAGS,;t t
+s,@DMAKE@,$DMAKE,;t t
+s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t
+s,@EPM@,$EPM,;t t
+s,@DPKG@,$DPKG,;t t
+s,@PKGMK@,$PKGMK,;t t
+s,@BUILD_EPM@,$BUILD_EPM,;t t
+s,@PKGFORMAT@,$PKGFORMAT,;t t
+s,@RPM@,$RPM,;t t
+s,@GPERF@,$GPERF,;t t
+s,@MINGWCXX@,$MINGWCXX,;t t
+s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t
+s,@MINGWSTRIP@,$MINGWSTRIP,;t t
+s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t
+s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t
+s,@BUILD_QADEVOOO@,$BUILD_QADEVOOO,;t t
+s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t
+s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t
+s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t
+s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t
+s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t
+s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t
+s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t
+s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t
+s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t
+s,@LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
+s,@LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
+s,@XSLTPROC@,$XSLTPROC,;t t
+s,@SYSTEM_LIBXSLT@,$SYSTEM_LIBXSLT,;t t
+s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
+s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
+s,@SYSTEM_LIBXML@,$SYSTEM_LIBXML,;t t
+s,@PYTHON@,$PYTHON,;t t
+s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t
+s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t
+s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t
+s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t
+s,@pythondir@,$pythondir,;t t
+s,@pkgpythondir@,$pkgpythondir,;t t
+s,@pyexecdir@,$pyexecdir,;t t
+s,@pkgpyexecdir@,$pkgpyexecdir,;t t
+s,@BZIP2@,$BZIP2,;t t
+s,@SYSTEM_PYTHON@,$SYSTEM_PYTHON,;t t
+s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t
+s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t
+s,@HOME@,$HOME,;t t
+s,@SYSTEM_DB@,$SYSTEM_DB,;t t
+s,@DB_VERSION@,$DB_VERSION,;t t
+s,@DB_INCLUDES@,$DB_INCLUDES,;t t
+s,@DB_JAR@,$DB_JAR,;t t
+s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t
+s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t
+s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t
+s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t
+s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t
+s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t
+s,@BSH_JAR@,$BSH_JAR,;t t
+s,@SERIALIZER_JAR@,$SERIALIZER_JAR,;t t
+s,@SYSTEM_SAXON@,$SYSTEM_SAXON,;t t
+s,@SAXON_JAR@,$SAXON_JAR,;t t
+s,@CURLCONFIG@,$CURLCONFIG,;t t
+s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t
+s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t
+s,@CURL_LIBS@,$CURL_LIBS,;t t
+s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t
+s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t
+s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t
+s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t
+s,@WITH_LDAP@,$WITH_LDAP,;t t
+s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t
+s,@MOZ_NSS_CFLAGS@,$MOZ_NSS_CFLAGS,;t t
+s,@MOZ_NSS_LIBS@,$MOZ_NSS_LIBS,;t t
+s,@NSS_LIB@,$NSS_LIB,;t t
+s,@MOZ_NSPR_CFLAGS@,$MOZ_NSPR_CFLAGS,;t t
+s,@MOZ_NSPR_LIBS@,$MOZ_NSPR_LIBS,;t t
+s,@NSPR_LIB@,$NSPR_LIB,;t t
+s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t
+s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t
+s,@MOZILLA_VERSION@,$MOZILLA_VERSION,;t t
+s,@MOZILLA_TOOLKIT@,$MOZILLA_TOOLKIT,;t t
+s,@MOZGTK2_CFLAGS@,$MOZGTK2_CFLAGS,;t t
+s,@MOZGTK2_LIBS@,$MOZGTK2_LIBS,;t t
+s,@MOZLIBREQ_CFLAGS@,$MOZLIBREQ_CFLAGS,;t t
+s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t
+s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t
+s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t
+s,@MOZ_FLAVOUR@,$MOZ_FLAVOUR,;t t
+s,@MOZ_INC@,$MOZ_INC,;t t
+s,@MOZ_LIB@,$MOZ_LIB,;t t
+s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t
+s,@MOZ_LDAP_CFLAGS@,$MOZ_LDAP_CFLAGS,;t t
+s,@SYSTEM_SANE_HEADER@,$SYSTEM_SANE_HEADER,;t t
+s,@SYSTEM_GENBRK@,$SYSTEM_GENBRK,;t t
+s,@SYSTEM_GENCCODE@,$SYSTEM_GENCCODE,;t t
+s,@SYSTEM_GENCMN@,$SYSTEM_GENCMN,;t t
+s,@SYSTEM_ICU@,$SYSTEM_ICU,;t t
+s,@X_CFLAGS@,$X_CFLAGS,;t t
+s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
+s,@X_LIBS@,$X_LIBS,;t t
+s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+s,@XINC@,$XINC,;t t
+s,@XLIB@,$XLIB,;t t
+s,@XAU_LIBS@,$XAU_LIBS,;t t
+s,@DISABLE_XAW@,$DISABLE_XAW,;t t
+s,@SYSTEM_XRENDER_HEADERS@,$SYSTEM_XRENDER_HEADERS,;t t
+s,@XRENDER_LINK@,$XRENDER_LINK,;t t
+s,@XRANDR_CFLAGS@,$XRANDR_CFLAGS,;t t
+s,@XRANDR_LIBS@,$XRANDR_LIBS,;t t
+s,@XRANDR_DLOPEN@,$XRANDR_DLOPEN,;t t
+s,@ENABLE_RANDR@,$ENABLE_RANDR,;t t
+s,@DISABLE_NEON@,$DISABLE_NEON,;t t
+s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t
+s,@NEON_LIBS@,$NEON_LIBS,;t t
+s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
+s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
+s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t
+s,@SYSTEM_NEON@,$SYSTEM_NEON,;t t
+s,@NEON_VERSION@,$NEON_VERSION,;t t
+s,@ENABLE_AGG@,$ENABLE_AGG,;t t
+s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t
+s,@AGG_LIBS@,$AGG_LIBS,;t t
+s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t
+s,@AGG_VERSION@,$AGG_VERSION,;t t
+s,@REDLAND_CFLAGS@,$REDLAND_CFLAGS,;t t
+s,@REDLAND_LIBS@,$REDLAND_LIBS,;t t
+s,@SYSTEM_REDLAND@,$SYSTEM_REDLAND,;t t
+s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t
+s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t
+s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
+s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t
+s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t
+s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t
+s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t
+s,@PSDK_HOME@,$PSDK_HOME,;t t
+s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t
+s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t
+s,@DIRECTXSDK_LIB@,$DIRECTXSDK_LIB,;t t
+s,@NSIS_PATH@,$NSIS_PATH,;t t
+s,@BISON@,$BISON,;t t
+s,@FLEX@,$FLEX,;t t
+s,@PATCH@,$PATCH,;t t
+s,@GNUCP@,$GNUCP,;t t
+s,@GNUPATCH@,$GNUPATCH,;t t
+s,@CYGWIN_PATH@,$CYGWIN_PATH,;t t
+s,@ML_EXE@,$ML_EXE,;t t
+s,@ASM_HOME@,$ASM_HOME,;t t
+s,@ZIP@,$ZIP,;t t
+s,@UNZIP@,$UNZIP,;t t
+s,@ZIP_HOME@,$ZIP_HOME,;t t
+s,@WITH_GPC@,$WITH_GPC,;t t
+s,@ENABLE_GTK@,$ENABLE_GTK,;t t
+s,@ENABLE_KDE@,$ENABLE_KDE,;t t
+s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t
+s,@GCONF_LIBS@,$GCONF_LIBS,;t t
+s,@ENABLE_GCONF@,$ENABLE_GCONF,;t t
+s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t
+s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t
+s,@ENABLE_GNOMEVFS@,$ENABLE_GNOMEVFS,;t t
+s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
+s,@GTK_LIBS@,$GTK_LIBS,;t t
+s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t
+s,@DBUS_LIBS@,$DBUS_LIBS,;t t
+s,@GIO_CFLAGS@,$GIO_CFLAGS,;t t
+s,@GIO_LIBS@,$GIO_LIBS,;t t
+s,@ENABLE_GIO@,$ENABLE_GIO,;t t
+s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t
+s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t
+s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
+s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
+s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t
+s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t
+s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t
+s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t
+s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t
+s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t
+s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t
+s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t
+s,@ENABLE_PDFIMPORT@,$ENABLE_PDFIMPORT,;t t
+s,@SYSTEM_POPPLER@,$SYSTEM_POPPLER,;t t
+s,@ENABLE_MEDIAWIKI@,$ENABLE_MEDIAWIKI,;t t
+s,@SYSTEM_SERVLETAPI@,$SYSTEM_SERVLETAPI,;t t
+s,@SERVLETAPI_JAR@,$SERVLETAPI_JAR,;t t
+s,@ENABLE_REPORTBUILDER@,$ENABLE_REPORTBUILDER,;t t
+s,@SYSTEM_JFREEREPORT@,$SYSTEM_JFREEREPORT,;t t
+s,@SAC_JAR@,$SAC_JAR,;t t
+s,@LIBXML_JAR@,$LIBXML_JAR,;t t
+s,@FLUTE_JAR@,$FLUTE_JAR,;t t
+s,@JFREEREPORT_JAR@,$JFREEREPORT_JAR,;t t
+s,@LIBBASE_JAR@,$LIBBASE_JAR,;t t
+s,@LIBLAYOUT_JAR@,$LIBLAYOUT_JAR,;t t
+s,@LIBLOADER_JAR@,$LIBLOADER_JAR,;t t
+s,@LIBFORMULA_JAR@,$LIBFORMULA_JAR,;t t
+s,@LIBREPOSITORY_JAR@,$LIBREPOSITORY_JAR,;t t
+s,@LIBFONTS_JAR@,$LIBFONTS_JAR,;t t
+s,@LIBSERIALIZER_JAR@,$LIBSERIALIZER_JAR,;t t
+s,@SYSTEM_APACHE_COMMONS@,$SYSTEM_APACHE_COMMONS,;t t
+s,@COMMONS_CODEC_JAR@,$COMMONS_CODEC_JAR,;t t
+s,@COMMONS_LANG_JAR@,$COMMONS_LANG_JAR,;t t
+s,@COMMONS_HTTPCLIENT_JAR@,$COMMONS_HTTPCLIENT_JAR,;t t
+s,@COMMONS_LOGGING_JAR@,$COMMONS_LOGGING_JAR,;t t
+s,@MOC@,$MOC,;t t
+s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t
+s,@KDE_LIBS@,$KDE_LIBS,;t t
+s,@ENABLE_LOCKDOWN@,$ENABLE_LOCKDOWN,;t t
+s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t
+s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t
+s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t
+s,@ENABLE_KAB@,$ENABLE_KAB,;t t
+s,@WITH_FONTOOO@,$WITH_FONTOOO,;t t
+s,@SYSTEM_MSPACK@,$SYSTEM_MSPACK,;t t
+s,@WITH_FONTS@,$WITH_FONTS,;t t
+s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t
+s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t
+s,@SCPDEFS@,$SCPDEFS,;t t
+s,@USE_XINERAMA@,$USE_XINERAMA,;t t
+s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t
+s,@ANT@,$ANT,;t t
+s,@ANT_HOME@,$ANT_HOME,;t t
+s,@ANT_LIB@,$ANT_LIB,;t t
+s,@WITH_LANG@,$WITH_LANG,;t t
+s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t
+s,@WITH_DICT@,$WITH_DICT,;t t
+s,@INTRO_BITMAPS@,$INTRO_BITMAPS,;t t
+s,@ABOUT_BITMAPS@,$ABOUT_BITMAPS,;t t
+s,@OOO_VENDOR@,$OOO_VENDOR,;t t
+s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t
+s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
+s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t
+s,@VERBOSE@,$VERBOSE,;t t
+s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t
+s,@BUILD_TYPE@,$BUILD_TYPE,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     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
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-    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; }; } ;;
-    esac
-    ;;
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  ac_dir=`$as_dirname -- "$ac_file" ||
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
     as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
     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 ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_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|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_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/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
 case $srcdir in
-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.
     ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
 
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# 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/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $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;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 _ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@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
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;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; }; }
-
-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'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  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; }; }
- ;;
-
-
-
-  esac
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
-done # for ac_tag
+done
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF
 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.
@@ -29936,10 +27630,6 @@ if test "$no_create" != yes; then
   # 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
 
 
 chmod a+x set_soenv
diff --git a/configure.in b/configure.in
index 33950defa86d..94d57c0245df 100644
--- a/configure.in
+++ b/configure.in
@@ -303,11 +303,6 @@ AC_ARG_WITH(external-hyph-dir,
 AC_ARG_WITH(external-thes-dir,
 [  --with-external-thes-dir Specify external thesaurus dir
 ],,)
-AC_ARG_WITH(writer2latex,
-[  --without-writer2latex Removes writer2latex from openoffice.org installation
-                          set, for people building for specific distributions
-                          where writer2latex is known to be already available
-],,)
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla and
@@ -881,6 +876,11 @@ case "$build_os" in
         test_randr=yes
 		test_freetype=yes
 		_os=SunOS
+		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
+		if test -z "$GNUTAR"; then
+			AC_MSG_ERROR([gtar (gnu tar) not found but needed. Install it (SUN Freeware package).])
+		fi
+		AC_SUBST(GNUTAR)
 
 		dnl ===========================================================
 		dnl check whether we're using solaris 6,7,8 - sparc or intel.
@@ -1450,6 +1450,25 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
 fi 
 AC_SUBST(GCCVER)
 
+HAVE_LD_BSYMBOLIC_FUNCTIONS=
+if test "$GCC" = "yes"; then
+   AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
+   bsymbolic_functions_ldflags_save=$LDFLAGS
+   LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
+   AC_LINK_IFELSE([AC_LANG_PROGRAM([
+   #include <stdio.h>
+   ],[
+    printf ("hello world\n");
+   ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
+   if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
+     AC_MSG_RESULT( found )
+   else
+     AC_MSG_RESULT( not found )
+   fi
+   LDFLAGS=$bsymbolic_functions_ldflags_save
+fi
+AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
+
 dnl ===================================================================
 dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
 dnl ===================================================================
@@ -1507,6 +1526,24 @@ fi
 AC_SUBST(GNUMAKE)
 
 dnl ===================================================================
+dnl Search all the common names for GNU tar
+dnl ===================================================================
+AC_MSG_CHECKING([for GNU tar])
+for a in $GNUTAR gtar gnutar tar; do
+      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
+      if test $? -eq 0;  then
+           GNUTAR=$a
+           break
+      fi
+done
+AC_MSG_RESULT($GNUTAR)
+if test -z "$GNUTAR"; then
+    AC_MSG_ERROR([not found. install GNU tar.])
+fi
+
+AC_SUBST(GNUTAR)
+
+dnl ===================================================================
 dnl  Test the solaris compiler version
 dnl ===================================================================
 if test "$_os" = "SunOS"; then
@@ -5672,8 +5709,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
         if test -z "$COMMONS_LOGGING_JAR"; then
                 COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
         fi
-   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+   AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+        [AC_MSG_ERROR(commons-logging.jar not found.)], [])
 
     fi
   else
@@ -5963,21 +6000,6 @@ else
 fi
 AC_SUBST(WITHOUT_AFMS)
 
-dnl ===================================================================
-dnl Test whether to include writer2latex
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include writer2latex])
-if test "$with_writer2latex" != "no" ; then
-  AC_MSG_RESULT([yes])
-  WITH_WRITER2LATEX=YES
-  BUILD_TYPE="$BUILD_TYPE WRITER2LATEX"
-else
-  AC_MSG_RESULT([no])
-  WITH_WRITER2LATEX=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
-fi
-AC_SUBST(WITH_WRITER2LATEX)
-
 AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index d7cee0a598df..d819d6045816 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -169,7 +169,6 @@ MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
 MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
 MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
 MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
-#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
 .ELSE			# "$(BUILD_SPECIAL)"!=""
 NOLOGOSPLASH:=$(BIN)$/intro.zip
 DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
@@ -381,21 +380,25 @@ hack_msitemplates .PHONY:
     -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
     -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
     -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-#	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-    $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-    $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-    $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-    $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-#	$(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
+    -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
+    -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
+    -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
+    -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
+    $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
+    $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
+    $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+    $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
+    $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
+    $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
+    $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+    $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
     $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
     $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
     $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-#	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-#	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 
 
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index bddc90bb5516..cdbc6f8ce20d 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -23,10 +23,6 @@
 #define DOCONCAT9( x, y, z, a, b, c, u, v, w)   x##y##z##a##b##c##u##v##w
 #define CONCAT9( x, y, z, a, b, c, u, v, w)     DOCONCAT9(x,y,z,a,b,c,u,v,w)
 
-#define CURL_MAJOR 3
-#define CURL_MINOR 0
-#define CURL_MICRO 0
-
 #define MOD_NAME_DESC(id) \
         ALL_LANG(Name,STR_NAME_##id); \
         ALL_LANG(Description,STR_DESC_##id)
@@ -481,6 +477,16 @@ End
         Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
     End
 
+#define REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
+        Name = STRING(CONCAT2(.,key)); \
+        Value = STRING(CONCAT3(opendocument.,doc_type,Document.1)); \
+        Styles = (); \
+    End
+
 #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
     REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
@@ -492,6 +498,7 @@ End
     REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+    REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
 
 // ---------------------------------------
 
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index e069d7392790..fa6c1cfcd661 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -34,7 +34,12 @@ File gid_File_Exe_Sbase
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sbase);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Base";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 #if defined WNT
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 035c3ffd1976..616084e9b967 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -132,9 +132,9 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odb
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Base_Bin;
     Name = ".odb";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.DatabaseDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index e49770f4ec0b..904960fdbdb1 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -155,5 +155,10 @@ File gid_File_Exe_Scalc
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(scalc);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Calc";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 0e767128194b..133dc6952c94 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -526,7 +526,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxc
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".sxc";
     Value = "soffice.StarCalcDocument.6";
     Styles = ();
@@ -573,7 +573,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".ods";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -983,7 +983,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".stc";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -992,7 +992,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dif
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dif";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -1001,53 +1001,35 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dbf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dbf";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xls
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".xls";
-    Value = "opendocument.CalcDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".xlw";
-    Value = "opendocument.CalcDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlt
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".xlt";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".slk";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".slk";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".csv";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".csv";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".xlw";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
@@ -1055,7 +1037,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wk1
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wk1";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -1064,7 +1046,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wks
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wks";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -1073,7 +1055,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_123
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".123";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep_dynamic.scp
index 0a6c40e19d89..21710ccbd2f8 100644
--- a/scp2/source/crashrep/file_crashrep_dynamic.scp
+++ b/scp2/source/crashrep/file_crashrep_dynamic.scp
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_crashrep_dynamic.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,6 +38,7 @@ File gid_Brand_File_Bin_Crashreport
   #endif
     Dir = gid_Brand_Dir_Program;
   #ifdef WNT
+    FileDescription = "%PRODUCTNAME Crashreporter";
     Styles = (PACKED, PATCH_SO_NAME);
   #else
     Styles = (PACKED);
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 641f29b4b645..b613f62ad97f 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -48,7 +48,12 @@ File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sdraw);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Draw";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 // new user interface configuration files
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index cf4dc241dc8e..f1f1a086c997 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -527,7 +527,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxd
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".sxd";
     Value = "soffice.StarDrawDocument.6";
     Styles = ();
@@ -589,7 +589,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".odg";
     Value = "opendocument.DrawDocument.1";
     Styles = ();
@@ -866,18 +866,18 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".otg";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Std
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".std";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index f5b0ca6266fc..5b8475e8cc9f 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -59,7 +59,12 @@ File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(simpress);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Impress";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 // new user interface configuration files
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 69a7fa22efbe..5ba0cecb95d5 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -541,7 +541,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxi
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sxi";
     Value = "soffice.StarImpressDocument.6";
     Styles = ();
@@ -587,7 +587,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".odp";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -914,7 +914,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".otp";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -923,39 +923,12 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sti
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ppt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".ppt";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Pps
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".pps";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Pot
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".pot";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simpress_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\simpress.exe";
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 124be9c91616..64629d480a20 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -35,11 +35,18 @@ Directory gid_Dir_Share_Layout
     DosName = "layout";
 End
 
-File gid_File_Zip_Sw_Layout
+File gid_File_Zip_Toolkit_Layout
    Dir = gid_Dir_Share_Layout;
    USER_FILE_BODY;
    Styles = (ARCHIVE, PATCH);
-   Name = "sw-layout.zip";
+   Name = "toolkit-layout.zip";
+End
+
+File gid_File_Zip_Sc_Layout
+   Dir = gid_Dir_Share_Layout;
+   USER_FILE_BODY;
+   Styles = (ARCHIVE, PATCH);
+   Name = "sc-layout.zip";
 End
 
 File gid_File_Zip_Svx_Layout
@@ -48,3 +55,11 @@ File gid_File_Zip_Svx_Layout
    Styles = (ARCHIVE, PATCH);
    Name = "svx-layout.zip";
 End
+
+File gid_File_Zip_Sw_Layout
+   Dir = gid_Dir_Share_Layout;
+   USER_FILE_BODY;
+   Styles = (ARCHIVE, PATCH);
+   Name = "sw-layout.zip";
+End
+
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 7ae718f102b7..43436a75f82d 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -38,12 +38,6 @@ File gid_File_Html_W3c_Ipr
     Name = "w3c_ipr_software_notice.html";
 End
 
-File gid_File_Dtd_Math
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Math_1_01;
-    Name = "math.dtd";
-End
 #endif
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm)
@@ -70,7 +64,12 @@ File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(smath);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Math";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 // new user interface configuration files
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 333a424046b2..08ab1725ed1e 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -45,7 +45,7 @@ Module gid_Module_Prg_Math_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Html_W3c_Ipr,gid_File_Dtd_Math,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+    Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
     gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
     gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
 	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 789daa837cc9..5a55f1bf4b83 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -427,7 +427,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = ".sxm";
     Value = "soffice.StarMathDocument.6";
     Styles = ();
@@ -489,7 +489,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = ".odf";
     Value = "opendocument.MathDocument.1";
     Styles = ();
@@ -648,7 +648,7 @@ End
 // RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
 //     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
 //     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-//     ModuleID = gid_Module_Root;
+//     ModuleID = gid_Module_Prg_Math_Bin;
 //     Name = ".mml";
 //     Value = "opendocument.MathDocument.1";
 //     Styles = ();
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 0a4e953920d8..a7b58c83e72b 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -430,11 +430,6 @@ Directory gid_Dir_Share_Xslt_Docbook
     DosName = "docbook";
 End
 
-Directory gid_Dir_Share_Xslt_Wiki
-    ParentID = gid_Dir_Share_Xslt;
-    DosName = "wiki";
-End
-
 Directory gid_Dir_Share_Xslt_Common
     ParentID = gid_Dir_Share_Xslt;
     DosName = "common";
@@ -887,6 +882,11 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Inet
     HostName = "Inet";
 End
 
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
+    HostName = "Accelerators";
+End
+
 Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common
     ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
     HostName = "Common";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1a76476049ee..e5cb237cf1ce 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -210,7 +210,7 @@ File gid_File_Lib_Curl
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
     #endif
   #else
    #ifdef _gcc3
@@ -433,9 +433,6 @@ End
 #endif
 
 #ifdef UNX
-#ifndef ENABLE_EVOAB2
-STD_UNO_LIB_FILE( gid_File_Lib_Evoab_1 , evoab)
-#endif
 
 #ifdef ENABLE_KAB
 
@@ -473,15 +470,15 @@ File gid_File_Lib_Macab_Drv_1
     Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
 End
 
-#endif
-
-#endif
+#endif  // #ifdef ENABLE_KAB
 
 #ifdef ENABLE_EVOAB2
 
 STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
-#endif
+#endif  // #ifdef ENABLE_EVOAB2
+
+#endif  // #ifdef UNX
 
 File gid_File_Lib_Evtatt
     TXT_FILE_BODY;
@@ -1339,18 +1336,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
-File gid_File_Lib_Stocserv
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-  #ifdef UNX
-    Name = STRING(CONCAT2(stocservices.uno,UNXSUFFIX));
-  #else
-    Name = "stocservices.uno.dll";
-  #endif
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-End
-
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
 STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
@@ -1534,9 +1519,9 @@ File gid_File_Lib_Xslt
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(libxslt,.,LIBXSLT_MAJOR,.,LIBXSLT_MINOR,.,LIBXSLT_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR,.,LIBXSLT_MINOR,.,LIBXSLT_MICRO));
+       Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
     #endif
   #else
    #ifdef _gcc3
@@ -1730,9 +1715,9 @@ File gid_File_Lib_Raptor
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(libraptor,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO));
+       Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
     #endif
   #else
    #ifdef _gcc3
@@ -1749,9 +1734,9 @@ File gid_File_Lib_Rasqal
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(librasqal,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(librasqal,UNXSUFFIX,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO));
+       Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
     #endif
   #else
    #ifdef _gcc3
@@ -1768,9 +1753,9 @@ File gid_File_Lib_Rdf
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(librdf,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(librdf,UNXSUFFIX,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO));
+       Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
     #endif
   #else
    #ifdef _gcc3
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 3472ac513c86..69afeed98f26 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -830,6 +830,13 @@ File gid_File_Lm_Lithuanian
     Styles = (PACKED);
 End
 
+File gid_File_Lm_Luxembourgish
+    TXT_FILE_BODY;
+    Name = "luxembourgish.lm";
+    Dir = gid_Dir_Share_Fingerprint;
+    Styles = (PACKED);
+End
+
 File gid_File_Lm_Malay
     TXT_FILE_BODY;
     Name = "malay.lm";
@@ -865,6 +872,13 @@ File gid_File_Lm_Mingo
     Styles = (PACKED);
 End
 
+File gid_File_Lm_Mongolian_Cyrillic
+    TXT_FILE_BODY;
+    Name = "mongolian_cyrillic.lm";
+    Dir = gid_Dir_Share_Fingerprint;
+    Styles = (PACKED);
+End
+
 File gid_File_Lm_Nepali
     TXT_FILE_BODY;
     Name = "nepali.lm";
@@ -2220,6 +2234,17 @@ File gid_File_Registry_Spool_Langpack_Lang
     FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu);
 End
 
+File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators;
+#ifdef QUARTZ 
+    Name = "/registry/spool/org/openoffice/Office/Accelerators-macosx.xcu";
+#else
+    Name = "/registry/spool/org/openoffice/Office/Accelerators-unxwnt.xcu";
+#endif
+End
+
 File gid_File_Registry_Spool_Oo_Common_System_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 18828834ea16..adb0175252c1 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -111,10 +111,7 @@ SCPDEFS+=-DSYSTEM_LIBXML
 SCPDEFS+=-DSYSTEM_LIBXSLT
 .ELSE
 .INCLUDE :  libxsltversion.mk
-SCPDEFS+=\
-    -DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
-    -DLIBXSLT_MINOR=$(LIBXSLT_MINOR) \
-    -DLIBXSLT_MICRO=$(LIBXSLT_MICRO)
+SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 .ENDIF
 
 .IF "$(SYSTEM_DB)" == "YES"
@@ -167,14 +164,8 @@ SCPDEFS+=-DSYSTEM_REDLAND
 .INCLUDE :  redlandversion.mk
 SCPDEFS+=\
     -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-    -DRAPTOR_MINOR=$(RAPTOR_MINOR) \
-    -DRAPTOR_MICRO=$(RAPTOR_MICRO) \
     -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-    -DRASQAL_MINOR=$(RASQAL_MINOR) \
-    -DRASQAL_MICRO=$(RASQAL_MICRO) \
-    -DREDLAND_MAJOR=$(REDLAND_MAJOR) \
-    -DREDLAND_MINOR=$(REDLAND_MINOR) \
-    -DREDLAND_MICRO=$(REDLAND_MICRO)
+    -DREDLAND_MAJOR=$(REDLAND_MAJOR)
 .ENDIF
 
 .IF "$(SYSTEM_BSH)" == "YES"
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a36591098edc..09be710ee4b6 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -285,7 +285,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Dbpool,
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
-	gid_File_Lib_Evoab_1,
+	gid_File_Lib_Evoab_2,
 	gid_File_Lib_Kab_1,
     gid_File_Lib_Kab_Drv_1,
 	gid_File_Lib_Macab_1,
@@ -579,11 +579,13 @@ Module gid_Module_Root_Files_6
     gid_File_Lm_Latin,
     gid_File_Lm_Latvian,
     gid_File_Lm_Lithuanian,
+    gid_File_Lm_Luxembourgish,
     gid_File_Lm_Malay,
     gid_File_Lm_Manx_Gaelic,
     gid_File_Lm_Marathi,
     gid_File_Lm_Middle_Frisian,
     gid_File_Lm_Mingo,
+    gid_File_Lm_Mongolian_Cyrillic,
     gid_File_Lm_Nepali,
     gid_File_Lm_Norwegian,
     gid_File_Lm_Persian,
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 6d0d12f6a879..2740fe563b69 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -30,60 +30,6 @@
 
 #include "macros.inc"
 
-#ifndef SYSTEM_LIBXSLT
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Xslt
-    FileID = gid_File_Lib_Xslt;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
-#endif
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Xslt_2
-    ShortcutID = gid_Shortcut_Lib_Xslt;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-#endif
-#endif
-
-#ifndef SYSTEM_CURL
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Curl_0
-    FileID = gid_File_Lib_Curl;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Curl_1
-    FileID = gid_File_Lib_Curl;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libcurl,UNXSUFFIX,.,CURL_MAJOR));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#endif
-
 #ifdef UNX
 #ifndef SYSTEM_ICU
 
@@ -130,72 +76,3 @@ End
 #endif
 
 //i44154 -end-
-
-#ifndef SYSTEM_REDLAND
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Raptor_1
-    FileID = gid_File_Lib_Raptor;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
-#endif
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Raptor_2
-    ShortcutID = gid_Shortcut_Lib_Raptor_1;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rasqal_1
-    FileID = gid_File_Lib_Rasqal;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
-#endif
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rasqal_2
-    ShortcutID = gid_Shortcut_Lib_Rasqal_1;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rdf_1
-    FileID = gid_File_Lib_Rdf;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
-#endif
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rdf_2
-    ShortcutID = gid_Shortcut_Lib_Rdf_1;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
-    Styles = (RELATIVE);
-End
-#endif
-#endif // SYSTEM_REDLAND
-
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index e4157a3f6a74..2328cbc9ae40 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -153,7 +153,7 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll4
 	Source = "shlxtmsi.dll";
 	Target = "DeinstallStartmenuFolderIcon";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "qslnkmsidll");
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_Shellextensionsdll5
@@ -483,3 +483,11 @@ WindowsCustomAction gid_Customaction_ShowReleaseNotes2
 	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
 End
 
+WindowsCustomAction gid_Customaction_ShowSurvey
+	Name = "ShowSurveyAfterUninstall";
+	Typ = "65";
+	Source = "relnotes.dll";
+	Target = "ShowSurveyAfter";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
+End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 892a1dd76bb6..403e6385dcfd 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -35,7 +35,7 @@ File gid_File_Lib_Pyuno
   #ifdef UNX
     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
   #else
-    Name = "pyuno.dll";
+    Name = "pyuno.pyd";
   #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED);
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index e32fe4ee0d11..75bb6710f0f9 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -69,9 +69,17 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
 		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
 		   /lib/site-packages $ORIGIN);
   #else
+   #ifdef _gcc3
+    Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
+		   /lib $ORIGIN/python-core-,PYVERSION,
+		   /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
+		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
+		   /lib/site-packages $ORIGIN));
+   #else
     Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION,
                    /lib $ORIGIN/python-core-,PYVERSION,
 		   /lib/site-packages $ORIGIN));
+   #endif
   #endif
 #endif
 End
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 8df9f80c5a2e..96960dc6283a 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -48,7 +48,12 @@ File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(swriter);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Writer";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 #ifdef WNT
@@ -56,21 +61,11 @@ File gid_File_Exe_Sweb
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sweb);
-    Styles = (PACKED);
+    FileDescription = "%PRODUCTNAME Writer(Web)";
+    Styles = (PACKED, PATCH_SO_NAME);
 End
 #endif
 
-#ifdef SOLAR_JAVA
-#ifndef WITHOUT_WRITER2LATEX
-File gid_File_Oxt_Writer2latex
-    TXT_FILE_BODY;
-    Name = "writer2latex.oxt";
-    Dir = gid_Brand_Dir_Share_Extension_Install;
-    Styles = (PACKED);
-End
-#endif
-#endif
-
 File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -268,17 +263,3 @@ File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu
     Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu";
 End
 
-File gid_File_Stw_MediaWikiTemplate
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Wiki;
-    Name = "/xslt/export/wiki/oopedia-style.ott";
-End
-
-File gid_File_Xsl_MediaWiki
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Wiki;
-    Name = "/xslt/export/wiki/odt2mediawiki.xsl";
-End
-
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index b931c954bff1..6384bc28f3e3 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -75,9 +75,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu,
     gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu,
     gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu,
-    gid_File_Tmp_Userinstall_Wrt_Inf,
-    gid_File_Stw_MediaWikiTemplate,
-    gid_File_Xsl_MediaWiki);
+    gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
 // Module gid_Module_Prg_Wrt_Help
@@ -111,15 +109,5 @@ Module gid_Module_Langpack_Writer_Template
              gid_File_Res_T602Filter);
 End
 
-Module gid_Module_Optional_Writer2latex
-    MOD_NAME_DESC(MODULE_PRG_WRT_WRITER2LATEX);
-    ParentID = gid_Module_Optional;
-    Default = YES;
-    InstallOrder = "1980";
-    PackageInfo = "packinfo_office.txt";
-    Styles = (FORCEINTOUPDATE);
-    Files = (gid_File_Oxt_Writer2latex);
-End
-
 #include "alllangmodules_writer.inc"
 
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 0d8d18d4db78..545225ca8950 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -640,7 +640,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxw
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".sxw";
     Value = "soffice.StarWriterDocument.6";
     Styles = ();
@@ -687,7 +687,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odt";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1317,7 +1317,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1326,43 +1326,16 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stw
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Doc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".doc";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dot
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".dot";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Rtf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".rtf";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Txt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".txt";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1371,7 +1344,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Htm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".htm";
     Value = "opendocument.WriterWebDocument.1";
     Styles = ();
@@ -1380,7 +1353,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Html
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".html";
     Value = "opendocument.WriterWebDocument.1";
     Styles = ();
@@ -1389,7 +1362,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xml
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".xml";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1398,7 +1371,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wpd
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".wpd";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1407,7 +1380,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Hwp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".hwp";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1416,7 +1389,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1425,7 +1398,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1434,7 +1407,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".sxg";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
diff --git a/set_soenv.in b/set_soenv.in
index 70dab1f20307..3219c4493c50 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
 	 $PROEXT,
-     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
+     $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -1516,11 +1516,9 @@ else
 
 if ($SYSTEM_PYTHON eq "NO") {
     $PYTHONPATH           = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
-    $PYTHONHOME           = $SOLARVER.$ds.$INPATH;
     if ($GUIBASE eq "WIN") {
-        # PYTHONPATH and PYTHONHOME need to use '\' directory seperators;
+        # PYTHONPATH need to use '\' directory seperators;
         $PYTHONPATH = WinPath( $PYTHONPATH, ";" );
-        $PYTHONHOME = WinPath( $PYTHONHOME, ";" );
     }
 }
 
@@ -1756,6 +1754,7 @@ ToFile( "RPM",               "@RPM@",            "e" );
 ToFile( "DPKG",              "@DPKG@",           "e" );
 ToFile( "PKGMK",             "@PKGMK@",          "e" );
 ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );
+ToFile( "GNUTAR",            "@GNUTAR@",         "e" );
 ToFile( "UPD",               $UPD,               "e" );
 ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
@@ -1800,6 +1799,8 @@ ToFile( "CC",                $CC,                "e" );
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
 		"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
+ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
+		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
 ToFile( "CXX",               $CXX,               "e" );
 ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
 ToFile( "MINGWSTRIP",        "@MINGWSTRIP@",     "e" );
@@ -1836,7 +1837,6 @@ ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
 ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
 ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
 ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
-ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
 ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
@@ -1990,7 +1990,6 @@ ToFile( "ZIPDEP",        $perlpre."zipdep.pl",      "e" );
 ToFile( "USE_SHELL",             '@USE_SHELL@',     "e" );
 if ($SYSTEM_PYTHON eq "NO") {
     ToFile( "PYTHONPATH",        $PYTHONPATH,        "e" );
-    ToFile( "PYTHONHOME",        $PYTHONHOME,        "e" );
 }
 
 #
diff --git a/soldep/bootstrp/XmlBuildList.cxx b/soldep/bootstrp/XmlBuildList.cxx
index f15b94a54536..670a3eb7f771 100644
--- a/soldep/bootstrp/XmlBuildList.cxx
+++ b/soldep/bootstrp/XmlBuildList.cxx
@@ -75,8 +75,10 @@ static void dl_init(pTHX)
         targ=sv_newmortal();
         FREETMPS;
 /* end Dynamic bootstrapping code */
-    *file=0;
+#ifdef MACOSX
+    *file=0; // how does this works???
     sp=0;
+#endif
 }
 
 FullByteStringList::FullByteStringList()
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index af03557704c2..c6a0fedd12b4 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -1233,14 +1233,25 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi
                             sSourceRoot = aEntry.GetFull();
                             GenericInformationList *pProjects = pProjectsKey->GetSubList();
                             if ( pProjects ) {
-                                for ( ULONG k = 0; k < pProjects->Count(); k++ ) {
-                                    ByteString sProject( *pProjects->GetObject( k ));
+                                GenericInformation * pProject = pProjects->First();
+                                while (pProject) {
+                                    String sLocalSourceRoot = sSourceRoot;
+                                    ByteString sProject( *pProject );
                                     String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
 
-                                    String aBuildListPath = CreateFileName(ssProject);
+                                    ByteString aDirStr ("Directory");
+                                    GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
+                                    if (pDir) {
+                                        ByteString aDir = pDir->GetValue();
+                                        DirEntry aRootEntry = aEntry.GetPath() + DirEntry(aDir);
+                                        sLocalSourceRoot = aRootEntry.GetFull();
+                                    }
+
+                                    String aBuildListPath = CreateFileName(ssProject, sLocalSourceRoot);
 
                                     pFileList->Insert( new String( aBuildListPath ), LIST_APPEND );
                                     ByteString sFile( aBuildListPath, RTL_TEXTENCODING_ASCII_US );
+                                    pProject = pProjects->Next();
                                 }
                             }
                         }
@@ -1483,7 +1494,7 @@ void Star::Read( SolarFileList *pSolarFiles )
 }
 
 /*****************************************************************************/
-String Star::CreateFileName( String sProject )
+String Star::CreateFileName( String& rProject, String& rSourceRoot )
 /*****************************************************************************/
 {
     // this method is used to find solarlist parts of nabours (other projects)
@@ -1491,14 +1502,20 @@ String Star::CreateFileName( String sProject )
     String sBuildList( String::CreateFromAscii( "build.lst" ));
     String sXmlBuildList( String::CreateFromAscii( "build.xlist" ));
 
-    DirEntry aEntry( sSourceRoot );
-    aEntry += DirEntry( sProject );
+    DirEntry aEntry( rSourceRoot );
+    aEntry += DirEntry( rProject );
 
     // if this project not exists, maybe it's a not added project of a CWS
 
-    aEntry.SetExtension(String::CreateFromAscii( "lnk" ));
-    if ( !aEntry.Exists() )
-        aEntry.CutExtension();
+    if ( !aEntry.Exists() ) {
+        aEntry.SetExtension(String::CreateFromAscii( "lnk" ));
+        if ( !aEntry.Exists() )
+            aEntry.CutExtension();
+
+        aEntry.SetExtension(String::CreateFromAscii( "link" ));
+        if ( !aEntry.Exists() )
+            aEntry.CutExtension();
+    }
 
     aEntry += DirEntry( sPrjDir );
 
@@ -1511,7 +1528,7 @@ String Star::CreateFileName( String sProject )
     if (aPossibleEntry.Exists()) {
         aActualEntry = aPossibleEntry;
     } else if ( !aActualEntry.Exists() && aDBNotFoundHdl.IsSet())
-        aDBNotFoundHdl.Call( &sProject );
+        aDBNotFoundHdl.Call( &rProject );
     return aActualEntry.GetFull();
 }
 
@@ -1520,7 +1537,7 @@ void Star::InsertSolarList( String sProject )
 /*****************************************************************************/
 {
     // inserts a new solarlist part of another project
-    String sFileName_l( CreateFileName( sProject ));
+    String sFileName_l( CreateFileName( sProject, sSourceRoot ));
 
     for ( ULONG i = 0; i < aFileList.Count(); i++ ) {
         if (( *aFileList.GetObject( i )) == sFileName_l )
@@ -1733,10 +1750,12 @@ void Star::InsertToken ( char *yytext )
                         pPrj->HasHardDependencies( bHardDep );
                         pPrj->HasFixedDependencies( bFixedDep );
 
+/*
                         if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
                             String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
                             InsertSolarList( sItem );
                         }
+                        */
                     }
                 }
                 break;
@@ -1782,6 +1801,7 @@ void Star::InsertToken ( char *yytext )
     i++;
 
     // und wer raeumt die depLst wieder ab ?
+    // CommandData macht das
 }
 
 /*****************************************************************************/
@@ -2363,12 +2383,20 @@ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *
                                 String sPrjDir( String::CreateFromAscii( "prj" ));
                                 String sSolarFile( String::CreateFromAscii( "build.lst" ));
 
-                                for ( ULONG k = 0; k < pProjects->Count(); k++ ) {
-                                    ByteString sProject( *pProjects->GetObject( k ));
+                                GenericInformation * pProject = pProjects->First();
+                                while (pProject) {
+                                    ByteString sProject( *pProject);
                                     String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
 
                                     DirEntry aPrjEntry( aEntry );
 
+                                    ByteString aDirStr ("Directory");
+                                    GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
+                                    if (pDir) {
+                                        ByteString aDir = pDir->GetValue();
+                                        aPrjEntry = aEntry.GetPath() + DirEntry(aDir);
+                                    }
+
                                     aPrjEntry += DirEntry( ssProject );
                                     aPrjEntry += DirEntry( sPrjDir );
                                     aPrjEntry += DirEntry( sSolarFile );
@@ -2377,6 +2405,7 @@ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *
 
                                     ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
                                     fprintf( stdout, "%s\n", sFile.GetBuffer());
+                                    pProject = pProjects->Next();
                                 }
                             }
                         }
@@ -2737,7 +2766,6 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
                             sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 );
                             aWhatOS = aWhatOS.GetToken( 0, ',' );
                         }
-                        aWhatOS = aWhatOS.GetToken( 0, ',' );
                         nOSType = GetOSType (aWhatOS);
                     }
                     break;
@@ -2801,14 +2829,15 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
                                 pPrj->AddDependencies( aItem, sMode );
                             else
                                 pPrj->AddDependencies( aItem );
-                            pPrj->AddDependencies( aItem );
                             pPrj->HasHardDependencies( bHardDep );
                             pPrj->HasFixedDependencies( bFixedDep );
 
+                            /*
                             if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
                                 String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
                                 InsertSolarList( sItem );
                             }
+                            */
                         }
 
                     }
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
index 4047e50c0164..478cf2843cc3 100644
--- a/soldep/inc/soldep/connctr.hxx
+++ b/soldep/inc/soldep/connctr.hxx
@@ -81,6 +81,7 @@ public:
     void    SetVisibility( BOOL visible ) { bVisible = visible; }
     void    UpdateVisibility();
     void    SetHideMode(BOOL bHide) { msbHideMode = bHide; };
+    void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
 };
 
 DECLARE_LIST( ConnectorList, Connector* )
diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx
index 29ccf25e56e8..152e81fe2f19 100644
--- a/soldep/inc/soldep/depwin.hxx
+++ b/soldep/inc/soldep/depwin.hxx
@@ -72,6 +72,7 @@ public:
     void            SetSelectedProject( ObjectWin* object ) { mpSelectedProject = object; };
     ObjectWin*      GetSelectedProject() { return mpSelectedProject; };
 //  DECL_LINK( PopupSelected, PopupMenu* );
+    void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
 };
 
 #endif
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index cf95109b9e57..13568561c95d 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -138,6 +138,7 @@ public:
         virtual void LoseFocus();
 
         BOOL            ConnectionExistsInAnyDirection( ObjectWin *pWin );
+        void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
 };
 
 DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* )
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 671683091bf9..df6833eb8bcd 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -358,7 +358,7 @@ public:
 DECLARE_LIST( StarFileList, StarFile * )
 
 #define STAR_MODE_SINGLE_PARSE          0x0000
-#define STAR_MODE_RECURSIVE_PARSE       0x0001
+//#define STAR_MODE_RECURSIVE_PARSE     0x0001      it dosen't work anymore
 #define STAR_MODE_MULTIPLE_PARSE        0x0002
 
 class Star : public StarList
@@ -382,7 +382,7 @@ protected:
     Link aFileIOErrorHdl; // called with &String as parameter!!!
 
     void InsertSolarList( String sProject );
-    String CreateFileName( String sProject );
+    String CreateFileName( String& rProject, String& rSourceRoot );
 
     void            Expand_Impl();
     void            ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
diff --git a/soldep/inc/soldep/soldlg.hrc b/soldep/inc/soldep/soldlg.hrc
index cf34292e777b..95bea8e50880 100644
--- a/soldep/inc/soldep/soldlg.hrc
+++ b/soldep/inc/soldep/soldlg.hrc
@@ -77,5 +77,6 @@
 #define TID_SOLDEP_HIDE_INDEPENDEND     (TID_SOLDEP_MAIN+4)
 #define TID_SOLDEP_SELECT_WORKSPACE     (TID_SOLDEP_MAIN+5)
 #define TID_SOLDEP_BACK                 (TID_SOLDEP_MAIN+6)
+#define TID_SOLDEP_CREATEMETA           (TID_SOLDEP_MAIN+7)
 #define TID_SMALL_PIN_PINED             (TID_SOLDEP_MAIN+100)
 #define TID_SMALL_PIN_UNPINED           (TID_SOLDEP_MAIN+101)
diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
index d81a26f885ee..8eaba9ace236 100644
--- a/soldep/source/connctr.cxx
+++ b/soldep/source/connctr.cxx
@@ -121,25 +121,9 @@ void Connector::Paint( const Rectangle& rRect )
     //SolDep *pSoldep = pApp->GetSolDep();
     if (msbHideMode)
     {
-    /*
-        if ((mpStartWin->GetMarkMode() == 0) || (mpEndWin->GetMarkMode() == 0))
-        {
-            //bVisible = FALSE;
-            UpdateVisibility();
-            fprintf( ((MyApp*)GetpApp())->pDebugFile, "FALSE connctr: Start: %s %i - End: %s %i\n",
-                mpStartWin->GetBodyText().GetBuffer(),mpStartWin->GetMarkMode(),
-                mpEndWin->GetBodyText().GetBuffer(),mpEndWin->GetMarkMode());
-        } else
-        {
-            bVisible = TRUE;
-            fprintf( ((MyApp*)GetpApp())->pDebugFile, "TRUE connctr: Start: %s %i - End: %s %i\n",
-                mpStartWin->GetBodyText().GetBuffer(),mpStartWin->GetMarkMode(),
-                mpEndWin->GetBodyText().GetBuffer(),mpEndWin->GetMarkMode());
-        }
-     */
     if (!(mpStartWin->IsNullObject())) //null_project
     {
-        if (mpStartWin->GetMarkMode() == 0)
+        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
         {
             mpStartWin->SetViewMask(0); //objwin invisible
         } else
@@ -149,7 +133,7 @@ void Connector::Paint( const Rectangle& rRect )
     }
     if (!(mpEndWin->IsNullObject()))
     {
-        if (mpEndWin->GetMarkMode() == 0)
+        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
         {
             mpEndWin->SetViewMask(0); //objwin invisible
         } else
@@ -179,6 +163,18 @@ void Connector::Paint( const Rectangle& rRect )
     }
 }
 
+void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

+{

+    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project

+         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project

+    {

+        pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );

+        Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );

+        aRect.Move( -rOffset.X(), -rOffset.Y() );

+        pDevice->DrawEllipse( aRect );

+    }

+}

+
 void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
 {
 //  more than one call ?
diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx
index aa448d8d688a..ab64557dbcf1 100644
--- a/soldep/source/depapp.cxx
+++ b/soldep/source/depapp.cxx
@@ -30,7 +30,8 @@
 
 // -----------------------------------------------------------------------
 #include "depapp.hxx"
-
+#include <ucbhelper/contentbroker.hxx>

+#include <ucbhelper/configurationkeys.hxx>

 
 void MyApp::Main()
 {
@@ -44,12 +45,12 @@ void MyApp::Main()
    // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );
     //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));
 
-
     pSolDep = new SolDep( &aMainWin );
     pSolDep->Init();
     aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));
-
-    aMainWin.Show();    Help aHelp;
+    pSolDep->Hide();
+    aMainWin.Show();
+    Help aHelp;
     SetHelp(&aHelp);
     aHelp.EnableContextHelp();
     aHelp.EnableQuickHelp();
@@ -125,15 +126,24 @@ void MyWin::Resize()
 
 SAL_IMPLEMENT_MAIN()
 {
-    Reference< XMultiServiceFactory > xMS;
+    //Reference< XMultiServiceFactory > xMS;
 
     // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
     Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
-    xMS = cppu::createRegistryServiceFactory(
-                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+
+    //xMS = cppu::createRegistryServiceFactory(
+    //              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+
+    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
 
     InitVCL( xMS );
     ::comphelper::setProcessServiceFactory(xMS);
+    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
+    aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );

+    aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );

+
+    ::ucbhelper::ContentBroker::initialize( xMS, aArgs );

+
     aMyApp.Main();
     DeInitVCL();
     return 0;
diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx
index 8f42ff7a864a..c6a4b4899d54 100644
--- a/soldep/source/depper.cxx
+++ b/soldep/source/depper.cxx
@@ -349,6 +349,17 @@ ULONG Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &L
     return pWin->GetId();
 }
 
+/*void Depper::DrawOutput( OutputDevice* pDevice )
+{
+    GetDepWin()->DrawOutput( pDevice );
+    ObjectList* pObjList = GetObjectList();
+    for ( USHORT i = pObjList->Count(); i > 0; i-- )
+    {
+        ObjectWin* pWin = pObjList->GetObject( i - 1 );
+        pWin->DrawOutput( pDevice );
+    }
+}*/
+
 ObjectWin* Depper::RemoveObjectFromList( ObjectList* pObjLst, ULONG &WinCount, USHORT nId, BOOL bDelete )
 {
     ObjectWin* pWin = ObjIdToPtr( pObjLst, nId );
diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx
index 24cc78cef6f7..2f4fe79cf410 100644
--- a/soldep/source/depwin.cxx
+++ b/soldep/source/depwin.cxx
@@ -116,6 +116,21 @@ void DepWin::Paint( const Rectangle& rRect )
     }
 }
 
+void DepWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset  )
+{
+    ULONG i = 0;
+    ULONG nListCount = ConList.Count();
+
+    for ( i=0 ; i < nListCount ; i++ )
+    {
+        ConList.GetObject( i )->DrawOutput( pDevice, rOffset );
+    }
+    if ( mbStartNewCon )
+    {
+        pDevice->DrawLine( maNewConStart, maNewConEnd );
+    }
+}
+
 void DepWin::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsRight() )
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 57eace045867..63f6d422b6f5 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -70,6 +70,7 @@ SHL1STDLIBS     = $(SVTOOLLIB)		\
                 $(CPPUHELPERLIB)	\
                 $(COMPHELPERLIB)	\
                 $(VCLLIB)			\
+                $(UCBHELPERLIB)	\
                 $(SOTLIB)			\
                 $(BTSTRPLIB)		\
                 $(TOOLSLIB) 		\
@@ -109,6 +110,7 @@ APP1STDLIBS= \
             $(SVTOOLLIB)		\
             $(CPPUHELPERLIB)	\
             $(COMPHELPERLIB)	\
+            $(UCBHELPERLIB)	\
             $(VCLLIB)			\
             $(SOTLIB)			\
             $(BTSTRPLIB)		\
@@ -116,9 +118,6 @@ APP1STDLIBS= \
             $(VOSLIB)			\
             $(SALLIB)           \
                $(CPPULIB)  \
-        $(TKLIB) $(SVLLIB) $(UNOTOOLSLIB) $(I18NISOLANGLIB)\
-        $(I18NUTILLIB) $(UCBHELPERLIB) $(ICUUCLIB) $(ICUDATALIB) $(ICULELIB) \
-        $(JVMFWKLIB) $(SALHELPERLIB) $(BASEGFXLIB) \
                $(PERL_LIB)
 
 APP1LIBS=\
diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
index 286bf3c71a62..56eacedb4093 100644
--- a/soldep/source/objwin.cxx
+++ b/soldep/source/objwin.cxx
@@ -32,6 +32,7 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
+#include <vcl/wall.hxx>

 
 #include <soldep/objwin.hxx>
 #include <soldep/depwin.hxx>
@@ -96,10 +97,15 @@ ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
     LINK( this, ObjectWin, TipHdl ));
 
     SetFont( Font( GetFont() ) );
+    Font aFont( GetFont() );

+    Size aSize = aFont.GetSize();

+    aFont.SetSize( aSize );

+    SetFont( aFont );
+
     EnableClipSiblings();
     SetZOrder( NULL, WINDOW_ZORDER_FIRST );
     mpPopup = new PopupMenu();
-//  mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
+    mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
     mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
     mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
     mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
@@ -426,6 +432,9 @@ void ObjectWin::MarkNeeded( BOOL bReset )
 void ObjectWin::MarkDepending( BOOL bReset )
 /*****************************************************************************/
 {
+    //if ( !bReset )
+    //  return;
+
     Connector* pCon;
     ObjectWin* pWin;
 
@@ -454,7 +463,6 @@ void ObjectWin::MarkDepending( BOOL bReset )
 void ObjectWin::Paint( const Rectangle& rRect )
 /*****************************************************************************/
 {
-
     Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );
     Size  aTextSize;
     ByteString sbt = msBodyText;                         //debug
@@ -474,6 +482,34 @@ void ObjectWin::Paint( const Rectangle& rRect )
         DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
 }
 
+void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

+/*****************************************************************************/

+{

+    Size aWinSize  = PixelToLogic( GetSizePixel() );

+    Size aTextSize;

+    ByteString sbt = msBodyText;                      

+    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));

+    aTextSize.Height() = GetTextHeight();

+    Point aPos = GetPosPixel();

+    Point aTextPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,

+                aWinSize.Height() / 2 - aTextSize.Height() / 2 );

+    aTextPos += aPos;

+    aPos = pDevice->PixelToLogic( aPos ) - rOffset;

+    aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;

+    if ( msBodyText !="null" ) 

+    {

+        pDevice->SetFillColor( GetBackground().GetColor() );

+        pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );

+        Font aFont( GetFont() );

+        Size aSize = aFont.GetSize();

+        aSize = pDevice->PixelToLogic( aSize );

+        aFont.SetSize( aSize );

+        pDevice->SetFont( aFont );

+        pDevice->SetTextColor( GetTextColor() );

+        pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );

+    }

+}
+
 /*****************************************************************************/
 void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
 /*****************************************************************************/
@@ -538,7 +574,7 @@ void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
 
             for( i = 0; i < mConnections.Count() ; i++ )
             {
-                mpPopup->InsertItem( mnPopupStaticItems + i, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
+                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
             }
         }
         mbMenuExecute = TRUE;
@@ -644,7 +680,7 @@ IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
                 break;
         default :
 //          DBG_ASSERT( FALSE, String (nItemId) );
-            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems );
+            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
             pCon = 0;
 //          delete pCon;
 //          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index e6fe7272a61a..30e19985a9cf 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -36,6 +36,8 @@
 #include <svtools/filedlg.hxx>
 #include <tools/iparser.hxx>
 #include <tools/geninfo.hxx>
+#include <vcl/gdimtf.hxx>

+#include <vcl/bitmap.hxx>

 #include <appdef.hxx>
 #include "time.h"
 #include <soldep/depper.hxx>
@@ -172,7 +174,7 @@ void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
                         {
                             // handle mouse click on ObjectWin object
                             ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            GetObjectList()->ResetSelectedObject();
+                            //GetObjectList()->ResetSelectedObject();
                             if (IsHideMode())      // simple mouse click left
                             {
                                 pWin->CaptureMouse();
@@ -250,9 +252,57 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
         case TID_SOLDEP_FIND:
             FindProject();
             break;
+        case TID_SOLDEP_CREATEMETA :

+        {

+            VirtualDevice   aVDev;

+            aVDev.SetMapMode( MAP_100TH_MM );

+            GDIMetaFile     aMtf;

+            aVDev.EnableOutput( FALSE );

+            aMtf.Record( &aVDev );

+

+            aVDev.SetLineColor( Color( COL_BLACK ) );

+            aVDev.SetTextAlign( ALIGN_TOP );

+

+            Size aSize( GetDepWin()->GetOutputSizePixel() );

+            long nXMin = aSize.Width();

+            long nXMax = 0;

+            long nYMax = 0;

+            long nYMin = aSize.Height();

+

+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )

+            {

+                Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();

+                Size aSize = mpObjectList->GetObject(i)->GetSizePixel();

+                nXMin = MIN( aPoint.X(), nXMin );

+                nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );

+                nYMin = MIN( aPoint.Y(), nYMin );

+                nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );

+            }

+

+            Point aOffset( nXMin, nYMin );

+            aOffset = aVDev.PixelToLogic( aOffset );

+

+            GetDepWin()->DrawOutput( &aVDev, aOffset );

+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )

+                if ( mpObjectList->GetObject(i)->IsVisible() )

+                    mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );

+

+            aMtf.Stop();

+            aMtf.WindStart();

+            aMtf.SetPrefMapMode( aVDev.GetMapMode() );

+            Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);

+            aDevSize =  aVDev.PixelToLogic( aDevSize );

+            aMtf.SetPrefSize( aDevSize );

+            SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );

+            aMtf.Write( aStream );

+            break;

+        }
         case TID_SOLDEP_HIDE_INDEPENDEND:
             {
                 ToggleHideDependency();
+                for ( USHORT i=0; i<mpObjectList->Count(); i++ )

+                    mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);

+
                    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
                    GetDepWin()->Invalidate(); //repaint Main-View
             }
@@ -559,7 +609,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater)
             {
                 pStr = pLst->GetObject(m);
                 pHObject = mpSolIdMapper->Find( *pStr );
-                if ( !pHObject )
+                /*if ( !pHObject )
                 {
     // create new prj
                     Prj *pNewPrj = new Prj( *pStr );
@@ -567,8 +617,10 @@ USHORT SolDep::ReadSource(BOOL bUpdater)
                     nObjectId = AddObject( sPrjName, FALSE );
                     pHObject = mpSolIdMapper->Find( *pStr );
                     ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
-                }
+                }*/
 
+                if ( pHObject )
+                {
                 nHashedId = pHObject->GetId();
                 ByteString sF_Os2 = pPrj->GetProjectName();
                 pStr = &sF_Os2;
@@ -580,6 +632,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater)
             }
         }
     }
+    }
     if (!IsPrjView())
     {
         AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src
index be7f28f6bf20..9d9897971826 100644
--- a/soldep/source/soldlg.src
+++ b/soldep/source/soldlg.src
@@ -1,370 +1,377 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: soldlg.src,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <dtsodcmp.hrc>
-#include <soldep/soldlg.hrc>
-
-//========================================================================
-// Dialogs
-ModalDialog RID_SD_DIALOG_NEWPROJECT
-{
-    OutputSize = TRUE;
-    Text = "New Project";
-    PosSize = MAP_SYSFONT(18,18,142,142);
-    SVLook = TRUE;
-    MOVEABLE = TRUE;
-    CLOSEABLE = TRUE;
-    OKButton BTN_OK
-    {
-        PosSize = MAP_SYSFONT(5,123,40,14);
-        TabStop = TRUE;
-        Hide = FALSE;
-        DefButton = TRUE;
-    };
-    CancelButton BTN_CANCEL {
-        PosSize = MAP_SYSFONT(50,123,40,14);
-        TabStop = TRUE;
-    };
-    FixedText FT_PRJNAME {
-        PosSize = MAP_SYSFONT( 5, 10, 100, 10 );
-        Text = "Project Name";
-    };
-    Edit EDIT_PRJNAME {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,20,132,10);
-    };
-    FixedText FT_PRJSHORT {
-        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
-        Text = "Project Short Name";
-    };
-    Edit EDIT_PRJSHORT {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,40,132,10);
-    };
-    FixedText FT_PRJDEPS {
-        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
-        Text = "Project Depends on";
-    };
-    Edit EDIT_PRJDEPS {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,60,132,10);
-    };
-};
-
-ModalDialog RID_SD_DIALOG_NEWDIRECTORY
-{
-    OutputSize = TRUE;
-    Text = "New Directory";
-    PosSize = MAP_SYSFONT(18,18,142,142);
-    SVLook = TRUE;
-    MOVEABLE = TRUE;
-    CLOSEABLE = TRUE;
-    OKButton BTN_OK
-    {
-        PosSize = MAP_SYSFONT(5,123,40,14);
-        TabStop = TRUE;
-        Hide = FALSE;
-        DefButton = TRUE;
-    };
-    CancelButton BTN_CANCEL {
-        PosSize = MAP_SYSFONT(50,123,40,14);
-        TabStop = TRUE;
-    };
-    FixedText FT_DIRNAME {
-        PosSize = MAP_SYSFONT( 5, 10, 132, 10 );
-        Text = "Directory Name ( with projectname )";
-    };
-    Edit EDIT_DIRNAME {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,20,132,10);
-    };
-    FixedText FT_DIRFLAG {
-        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
-        Text = "Directory Flag";
-    };
-    Edit EDIT_DIRFLAG {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,40,132,10);
-    };
-    FixedText FT_DIRDEPS {
-        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
-        Text = "Directory Depends on";
-    };
-    Edit EDIT_DIRDEPS {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,60,132,10);
-    };
-    FixedText FT_DIRACTION {
-        PosSize = MAP_SYSFONT( 5, 70, 100, 10 );
-        Text = "What To Do";
-    };
-    Edit EDIT_DIRACTION {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,80,132,10);
-    };
-    FixedText FT_DIRENV {
-        PosSize = MAP_SYSFONT( 5, 90, 100, 10 );
-        Text = "Which Environments";
-    };
-    Edit EDIT_DIRENV {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,100,132,10);
-    };
-};
-
-
-ModalDialog RID_SD_DIALOG_HELP
-{
-    OutputSize = TRUE;
-    Text = "Help";
-    PosSize = MAP_SYSFONT(18,18,242,242);
-    SVLook = TRUE;
-    MOVEABLE = TRUE;
-    CLOSEABLE = TRUE;
-    OKButton BTN_OK
-    {
-        PosSize = MAP_SYSFONT(101,223,40,14);
-        TabStop = TRUE;
-        Hide = FALSE;
-        DefButton = TRUE;
-    };
-    MultiLineEdit EDIT_HELP {
-        Border = TRUE;
-        PosSize = MAP_SYSFONT(5,5,232,213);
-    };
-};
-
-ModalDialog DLG_VERSIONSELECT {
-    OutputSize = TRUE;
-    Pos = MAP_APPFONT( 92, 40 );
-    Size = MAP_APPFONT( 161, 98 );
-    Text = "Open workspace";
-    Moveable = TRUE;
-    Closeable = TRUE;
-    ListBox DLG_VERSIONSELECT_LISTBOX {
-            Border = TRUE;
-            Pos = MAP_APPFONT( 8, 16 );
-            Size = MAP_APPFONT( 96, 72 );
-            TabStop = TRUE;
-        };
-    GroupBox DLG_VERSIONSELECT_GROUP {
-            Pos = MAP_APPFONT( 4, 4 );
-            Size = MAP_APPFONT( 104, 88 );
-            Text = "Workspaces";
-        };
-    OKButton DLG_VERSIONSELECT_OK {
-            Pos = MAP_APPFONT( 116, 64 );
-            Size = MAP_APPFONT( 40, 12 );
-            DefButton = TRUE;
-            TabStop = TRUE;
-        };
-    CancelButton DLG_VERSIONSELECT_CANCEL {
-            Pos = MAP_APPFONT( 116, 80 );
-            Size = MAP_APPFONT( 40, 12 );
-            TabStop = TRUE;
-        };
-    GroupBox DLG_MINORSELECT_GROUP {
-            Pos = MAP_APPFONT( 110, 4 );
-            Size = MAP_APPFONT( 47, 30 );
-            Text = "Minor";
-        };
-    Edit    DLG_MINORSELECT_EDIT {
-            Border = TRUE;
-            Pos = MAP_APPFONT( 115, 16 );
-            Size = MAP_APPFONT( 36, 12 );
-            TabStop = TRUE;
-        };
-};
-
-ModelessDialog DLG_AUTOARRANGE {
-    OutputSize = TRUE;
-    Pos = MAP_APPFONT( 40, 12 );
-    Size = MAP_APPFONT( 225, 82 );
-    Text = "Autoarrange";
-    Moveable = TRUE;
-    GroupBox DLG_AUTOARRANGE_GROUP {
-            Pos = MAP_APPFONT( 4, 4 );
-            Size = MAP_APPFONT( 216, 72 );
-            Text = "Progress";
-        };
-    FixedText DLG_AUTOARRANGE_TEXT_MODULE {
-            Pos = MAP_APPFONT( 8, 16 );
-            Size = MAP_APPFONT( 208, 10 );
-            Text = "";
-        };
-    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {
-            Pos = MAP_APPFONT( 8, 48 );
-            Size = MAP_APPFONT( 208, 10 );
-            Text = "";
-        };
-};
-
-ModalDialog DLG_FIND_PROJECT {
-    OutputSize = TRUE;
-    Pos = MAP_APPFONT( 40, 12 );
-    Size = MAP_APPFONT( 155, 55 );
-    Text = "Find Project";
-    Moveable = TRUE;
-    SVLook          = TRUE;
-    ComboBox DLG_FIND_PROJECT_COMBOBOX
-    {
-        Pos = MAP_APPFONT ( 5 , 18 ) ;
-        Size = MAP_APPFONT ( 100 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        VScroll = TRUE ;
-        Sort = TRUE ;
-    };
-    OKButton DLG_FIND_PROJECT_OK {
-            Pos = MAP_APPFONT( 110, 10 );
-            Size = MAP_APPFONT( 40, 12 );
-            DefButton = TRUE;
-            TabStop = TRUE;
-        };
-    CancelButton DLG_FIND_PROJECT_CANCEL {
-            Pos = MAP_APPFONT( 110, 26 );
-            Size = MAP_APPFONT( 40, 12 );
-            TabStop = TRUE;
-        };
-};
-
-ToolBox TID_SOLDEP_MAIN
-{
-    ButtonType      = BUTTON_SYMBOL;
-    Align           = BOXALIGN_TOP;
-        LineCount       = 1;
-        SVLook          = TRUE;
-        Border          = TRUE;
-        Sizeable                = TRUE;
-        Dockable                = TRUE;
-        Scroll                  = TRUE;
-        Moveable                = TRUE;
-        Closeable               = TRUE;
-        Zoomable                = TRUE;
-        ItemList        =
-        {
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_OPEN;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Load";
-                        HelpId          = TID_SOLDEP_OPEN;
-                        HelpText        = "Load";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "sx03190.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_SAVE;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Save";
-                        HelpId          = TID_SOLDEP_SAVE;
-                        HelpText        = "Save";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "sc05505.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                         Type            = TOOLBOXITEM_SEPARATOR;
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Select Workspace";
-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
-                        HelpText        = "Select Workspace";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "selectupd_16.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_FIND;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Find Module";
-                        HelpId          = TID_SOLDEP_FIND;
-                        HelpText        = "Find Module";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "sc05961.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_BACK;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Back to Overview";
-                        HelpId          = TID_SOLDEP_BACK;
-                        HelpText        = "Back to Overview";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "arrowup_16.png";
-                        };
-                };
-                ToolBoxItem
-                {
-                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;
-                        Type            = TOOLBOXITEM_BUTTON;
-                        Text            = "Hide Independend Modules";
-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
-                        HelpText        = "Hide Independend Modules";
-                        Checkable               = TRUE;
-                        ItemBitmap      = Bitmap
-                        {
-                                File = "hidedependency_16.png";
-                        };
-                };
-        };
-};
-
-/*****************************************************************************/
-Bitmap TID_SMALL_PIN_PINED
-/*****************************************************************************/
-{
-    File = "ballgreen_7.png";
-};
-
-/*****************************************************************************/
-Bitmap TID_SMALL_PIN_UNPINED
-/*****************************************************************************/
-{
-    File = "ballred_7.png";
-};
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2008 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * $RCSfile: soldlg.src,v $

+ * $Revision: 1.7 $

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ ************************************************************************/

+

+#include <dtsodcmp.hrc>

+#include <soldep/soldlg.hrc>

+

+//========================================================================

+// Dialogs

+ModalDialog RID_SD_DIALOG_NEWPROJECT

+{

+    OutputSize = TRUE;

+    Text = "New Project";

+    PosSize = MAP_SYSFONT(18,18,142,142);

+    SVLook = TRUE;

+    MOVEABLE = TRUE;

+    CLOSEABLE = TRUE;

+    OKButton BTN_OK

+    {

+        PosSize = MAP_SYSFONT(5,123,40,14);

+        TabStop = TRUE;

+        Hide = FALSE;

+        DefButton = TRUE;

+    };

+    CancelButton BTN_CANCEL {

+        PosSize = MAP_SYSFONT(50,123,40,14);

+        TabStop = TRUE;

+    };

+    FixedText FT_PRJNAME {

+        PosSize = MAP_SYSFONT( 5, 10, 100, 10 );

+        Text = "Project Name";

+    };

+    Edit EDIT_PRJNAME {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,20,132,10);

+    };

+    FixedText FT_PRJSHORT {

+        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );

+        Text = "Project Short Name";

+    };

+    Edit EDIT_PRJSHORT {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,40,132,10);

+    };

+    FixedText FT_PRJDEPS {

+        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );

+        Text = "Project Depends on";

+    };

+    Edit EDIT_PRJDEPS {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,60,132,10);

+    };

+};

+

+ModalDialog RID_SD_DIALOG_NEWDIRECTORY

+{

+    OutputSize = TRUE;

+    Text = "New Directory";

+    PosSize = MAP_SYSFONT(18,18,142,142);

+    SVLook = TRUE;

+    MOVEABLE = TRUE;

+    CLOSEABLE = TRUE;

+    OKButton BTN_OK

+    {

+        PosSize = MAP_SYSFONT(5,123,40,14);

+        TabStop = TRUE;

+        Hide = FALSE;

+        DefButton = TRUE;

+    };

+    CancelButton BTN_CANCEL {

+        PosSize = MAP_SYSFONT(50,123,40,14);

+        TabStop = TRUE;

+    };

+    FixedText FT_DIRNAME {

+        PosSize = MAP_SYSFONT( 5, 10, 132, 10 );

+        Text = "Directory Name ( with projectname )";

+    };

+    Edit EDIT_DIRNAME {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,20,132,10);

+    };

+    FixedText FT_DIRFLAG {

+        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );

+        Text = "Directory Flag";

+    };

+    Edit EDIT_DIRFLAG {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,40,132,10);

+    };

+    FixedText FT_DIRDEPS {

+        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );

+        Text = "Directory Depends on";

+    };

+    Edit EDIT_DIRDEPS {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,60,132,10);

+    };

+    FixedText FT_DIRACTION {

+        PosSize = MAP_SYSFONT( 5, 70, 100, 10 );

+        Text = "What To Do";

+    };

+    Edit EDIT_DIRACTION {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,80,132,10);

+    };

+    FixedText FT_DIRENV {

+        PosSize = MAP_SYSFONT( 5, 90, 100, 10 );

+        Text = "Which Environments";

+    };

+    Edit EDIT_DIRENV {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,100,132,10);

+    };

+};

+

+

+ModalDialog RID_SD_DIALOG_HELP

+{

+    OutputSize = TRUE;

+    Text = "Help";

+    PosSize = MAP_SYSFONT(18,18,242,242);

+    SVLook = TRUE;

+    MOVEABLE = TRUE;

+    CLOSEABLE = TRUE;

+    OKButton BTN_OK

+    {

+        PosSize = MAP_SYSFONT(101,223,40,14);

+        TabStop = TRUE;

+        Hide = FALSE;

+        DefButton = TRUE;

+    };

+    MultiLineEdit EDIT_HELP {

+        Border = TRUE;

+        PosSize = MAP_SYSFONT(5,5,232,213);

+    };

+};

+

+ModalDialog DLG_VERSIONSELECT {

+    OutputSize = TRUE;

+    Pos = MAP_APPFONT( 92, 40 );

+    Size = MAP_APPFONT( 161, 98 );

+    Text = "Open workspace";

+    Moveable = TRUE;

+    Closeable = TRUE;

+    ListBox DLG_VERSIONSELECT_LISTBOX {

+            Border = TRUE;

+            Pos = MAP_APPFONT( 8, 16 );

+            Size = MAP_APPFONT( 96, 72 );

+            TabStop = TRUE;

+        };

+    GroupBox DLG_VERSIONSELECT_GROUP {

+            Pos = MAP_APPFONT( 4, 4 );

+            Size = MAP_APPFONT( 104, 88 );

+            Text = "Workspaces";

+        };

+    OKButton DLG_VERSIONSELECT_OK {

+            Pos = MAP_APPFONT( 116, 64 );

+            Size = MAP_APPFONT( 40, 12 );

+            DefButton = TRUE;

+            TabStop = TRUE;

+        };

+    CancelButton DLG_VERSIONSELECT_CANCEL {

+            Pos = MAP_APPFONT( 116, 80 );

+            Size = MAP_APPFONT( 40, 12 );

+            TabStop = TRUE;

+        };

+    GroupBox DLG_MINORSELECT_GROUP {

+            Pos = MAP_APPFONT( 110, 4 );

+            Size = MAP_APPFONT( 47, 30 );

+            Text = "Minor";

+        };

+    Edit    DLG_MINORSELECT_EDIT {

+            Border = TRUE;

+            Pos = MAP_APPFONT( 115, 16 );

+            Size = MAP_APPFONT( 36, 12 );

+            TabStop = TRUE;

+        };

+};

+

+ModelessDialog DLG_AUTOARRANGE {

+    OutputSize = TRUE;

+    Pos = MAP_APPFONT( 40, 12 );

+    Size = MAP_APPFONT( 225, 82 );

+    Text = "Autoarrange";

+    Moveable = TRUE;

+    GroupBox DLG_AUTOARRANGE_GROUP {

+            Pos = MAP_APPFONT( 4, 4 );

+            Size = MAP_APPFONT( 216, 72 );

+            Text = "Progress";

+        };

+    FixedText DLG_AUTOARRANGE_TEXT_MODULE {

+            Pos = MAP_APPFONT( 8, 16 );

+            Size = MAP_APPFONT( 208, 10 );

+            Text = "";

+        };

+    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {

+            Pos = MAP_APPFONT( 8, 48 );

+            Size = MAP_APPFONT( 208, 10 );

+            Text = "";

+        };

+};

+

+ModalDialog DLG_FIND_PROJECT {

+    OutputSize = TRUE;

+    Pos = MAP_APPFONT( 40, 12 );

+    Size = MAP_APPFONT( 155, 55 );

+    Text = "Find Project";

+    Moveable = TRUE;

+    SVLook          = TRUE;

+    ComboBox DLG_FIND_PROJECT_COMBOBOX

+    {

+        Pos = MAP_APPFONT ( 5 , 18 ) ;

+        Size = MAP_APPFONT ( 100 , 90 ) ;

+        TabStop = TRUE ;

+        DropDown = TRUE ;

+        VScroll = TRUE ;

+        Sort = TRUE ;

+    };

+    OKButton DLG_FIND_PROJECT_OK {

+            Pos = MAP_APPFONT( 110, 10 );

+            Size = MAP_APPFONT( 40, 12 );

+            DefButton = TRUE;

+            TabStop = TRUE;

+        };

+    CancelButton DLG_FIND_PROJECT_CANCEL {

+            Pos = MAP_APPFONT( 110, 26 );

+            Size = MAP_APPFONT( 40, 12 );

+            TabStop = TRUE;

+        };

+};

+

+ToolBox TID_SOLDEP_MAIN

+{

+    ButtonType      = BUTTON_SYMBOL;

+    Align           = BOXALIGN_TOP;

+        LineCount       = 1;

+        SVLook          = TRUE;

+        Border          = TRUE;

+        Sizeable                = TRUE;

+        Dockable                = TRUE;

+        Scroll                  = TRUE;

+        Moveable                = TRUE;

+        Closeable               = TRUE;

+        Zoomable                = TRUE;

+        ItemList        =

+        {

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_OPEN;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Load";

+                        HelpId          = TID_SOLDEP_OPEN;

+                        HelpText        = "Load";

+                        Checkable               = TRUE;

+                        ItemBitmap      = Bitmap

+                        {

+                                File = "sx03190.png";

+                        };

+                };

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_SAVE;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Save";

+                        HelpId          = TID_SOLDEP_SAVE;

+                        HelpText        = "Save";

+                        Checkable               = TRUE;

+                        ItemBitmap      = Bitmap

+                        {

+                                File = "sc05505.png";

+                        };

+                };

+                ToolBoxItem

+                {

+                         Type            = TOOLBOXITEM_SEPARATOR;

+                };

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Select Workspace";

+                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;

+                        HelpText        = "Select Workspace";

+                        Checkable               = TRUE;

+                        ItemBitmap      = Bitmap

+                        {

+                                File = "selectupd_16.png";

+                        };

+                };

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_FIND;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Find Module";

+                        HelpId          = TID_SOLDEP_FIND;

+                        HelpText        = "Find Module";

+                        Checkable               = TRUE;

+                        ItemBitmap      = Bitmap

+                        {

+                                File = "sc05961.png";

+                        };

+                };

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_BACK;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Back to Overview";

+                        HelpId          = TID_SOLDEP_BACK;

+                        HelpText        = "Back to Overview";

+                        Checkable               = TRUE;

+                        ItemBitmap      = Bitmap

+                        {

+                                File = "arrowup_16.png";

+                        };

+                };

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Hide Independend Modules";

+                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;

+                        HelpText        = "Hide Independend Modules";

+                        Checkable               = TRUE;

+                        ItemBitmap      = Bitmap

+                        {

+                                File = "hidedependency_16.png";

+                        };

+                };

+                ToolBoxItem

+                {

+                        Identifier      = TID_SOLDEP_CREATEMETA;

+                        Type            = TOOLBOXITEM_BUTTON;

+                        Text            = "Create MetaFile";

+                        Checkable       = TRUE;

+                };                

+        };

+};

+

+/*****************************************************************************/

+Bitmap TID_SMALL_PIN_PINED

+/*****************************************************************************/

+{

+    File = "ballgreen_7.png";

+};

+

+/*****************************************************************************/

+Bitmap TID_SMALL_PIN_UNPINED

+/*****************************************************************************/

+{

+    File = "ballred_7.png";

+};

diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk
index 7eefded99e1d..21591d1b1ecb 100644
--- a/soldep/util/perl.mk
+++ b/soldep/util/perl.mk
@@ -30,8 +30,13 @@
 #*************************************************************************
 
 .IF "$(GUI)"=="WNT"
+.IF "$(USE_SHELL)"=="4nt"
+SOLARINC+=-I$(BUILD_TOOLS)$/perl$/lib$/core
+PERL_LIB=$(BUILD_TOOLS)$/perl$/lib$/core$/perl58.lib
+.ELSE			# "$(USE_SHELL)"=="4nt"
 SOLARINC+=-I$(BUILD_TOOLS)$/..$/perl$/lib$/core
 PERL_LIB=$(BUILD_TOOLS)$/..$/perl$/lib$/core$/perl58.lib
+.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF 
 
 .IF "$(OS)$(CPU)" == "LINUXI"
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index c07610411669..13dde7bb0691 100644
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -300,7 +300,7 @@
 #
 sub get_build_list_path {
     my $module = shift;
-    my @possible_dirs = ($module, $module. '.lnk');
+    my @possible_dirs = ($module, $module. '.lnk', $module. '.link');
     return $build_list_paths{$module} if (defined $build_list_paths{$module});
     foreach (@possible_dirs) {
         my $possible_dir_path = $StandDir.$_.'/prj/';
@@ -952,7 +952,7 @@ sub RemoveFromDependencies {
     my ($ExclPrj, $i, $Prj, $Dependencies);
     $ExclPrj = shift;
     my $ExclPrj_orig = '';
-    $ExclPrj_orig = $` if ($ExclPrj =~ /\.lnk$/o);
+    $ExclPrj_orig = $` if (($ExclPrj =~ /\.lnk$/o) || ($ExclPrj =~ /\.link$/o));
     $Dependencies = shift;
     foreach $Prj (keys %$Dependencies) {
         my $prj_deps_hash = $$Dependencies{$Prj};
@@ -1813,12 +1813,12 @@ sub are_all_dependent {
 sub modules_classify {
     my @modules = @_;
     foreach my $module (sort @modules) {
-        if (-d $StandDir.$module) {
-            $modules_types{$module} = 'mod';
+        if ((-e $StandDir.$module.'.lnk') || (-e $StandDir.$module.'.link')) {
+            $modules_types{$module} = 'lnk';
             next;
         };
-        if (-e $StandDir.$module.'.lnk') {
-            $modules_types{$module} = 'lnk';
+        if (-d $StandDir.$module) {
+            $modules_types{$module} = 'mod';
             next;
         };
         $modules_types{$module} = 'img';
@@ -1836,6 +1836,7 @@ sub provide_consistency {
         if ($$var_ref) {
             return if (-d $StandDir.$$var_ref);
             $$var_ref .= '.lnk' and return if (-d $StandDir.$$var_ref.'.lnk');
+            $$var_ref .= '.link' and return if (-d $StandDir.$$var_ref.'.link');
             print_error("Cannot find module '$$var_ref'", 9);
             return;
         };
@@ -1872,21 +1873,15 @@ sub get_workspace_lst
 sub ensure_clear_module {
     my $module = shift;
     my $module_type = $modules_types{$module};
-    my $lnk_name = $module . '.lnk';
     if ($module_type eq 'mod') {
-        if (-e ($StandDir.$lnk_name)) {
-            print "Last checkout for $module seems to have been interrupted...\n";
-            print "Checking it out again...\n";
-            #rmtree("$StandDir$module", 0, 1);
-            $module_type = 'lnk';
-        } else {
-            clear_module($module);
-            return;
-        };
+         clear_module($module);
+         return;
     };
     if ($module_type eq 'lnk') {
-        if(!rename("$StandDir$lnk_name", "$StandDir$module")) {
-            print_error("Cannot rename $StandDir$lnk_name. Please rename it manually");
+        if((!rename("$StandDir$module.lnk", "$StandDir$module")) && (!rename("$StandDir$module.link", "$StandDir$module"))) {
+            print_error("Cannot rename link to $module. Please rename it manually");
+        } else {
+            clear_module($module);
         };
     };
 };
@@ -2000,7 +1995,10 @@ sub prepare_incompatible_build {
     $deps_hash = shift;
     foreach (keys %incompatibles) {
         my $incomp_prj = $_;
-        $incomp_prj .= '.lnk' if (!defined $$deps_hash{$_});
+        if (!defined $$deps_hash{$_}) {
+            $incomp_prj .= '.lnk' if (-e $StandDir.$incomp_prj . '.lnk');
+            $incomp_prj .= '.link' if (-e $StandDir.$incomp_prj . '.link');
+        }
         delete $incompatibles{$_};
         $incompatibles{$incomp_prj} = $$deps_hash{$incomp_prj};
         delete $$deps_hash{$incomp_prj};
@@ -2084,6 +2082,7 @@ sub prepare_build_all_cont {
     while ($prj = PickPrjToBuild($deps_hash)) {
         $orig_prj = '';
         $orig_prj = $` if ($prj =~ /\.lnk$/o);
+        $orig_prj = $` if ($prj =~ /\.link$/o);
         if (($border_prj ne $prj) &&
             ($border_prj ne $orig_prj)) {
             RemoveFromDependencies($prj, $deps_hash);
@@ -2199,7 +2198,7 @@ sub clear_delivered {
 #        my $current_dir = getcwd();
         foreach my $module (sort @modules_built) {
             my $module_path = CorrectPath($StandDir.$module);
-            if (!(chdir($module_path.'.lnk') or chdir($module_path))) {
+            if (!(chdir($module_path.'.lnk') or chdir($module_path.'.link') or chdir($module_path))) {
                 push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
             } else {
                 print "Removing delivered from module $module\n";
@@ -2281,11 +2280,12 @@ sub get_solar_vars {
 }
 
 #
-# Procedure renames <module>.lnk into <module>
+# Procedure renames <module>.lnk (.link) into <module>
 #
 sub get_current_module {
     my $module_name = shift;
     my $link_name = $module_name . '.lnk';
+    $link_name .= '.link' if (-e $StandDir.$module_name . '.link');
     chdir $StandDir;
     getcwd();
     print "\nBreaking link to module $module_name";
@@ -2304,8 +2304,8 @@ sub check_dir {
     my $start_dir = getcwd();
     my @dir_entries = split(/[\\\/]/, $start_dir);
     my $current_module = $dir_entries[$#dir_entries];
-    $current_module = $` if ($current_module =~ /(\.lnk)$/);
-    my $link_name = $ENV{SRC_ROOT}.'/'.$current_module.'.lnk';
+    $current_module = $` if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/));
+    my $link_name = $ENV{SRC_ROOT}.'/'.$current_module.$1;
     if ( $^O eq 'MSWin32' ) {
         $start_dir =~ s/\\/\//go;
         $link_name =~ s/\\/\//go;
diff --git a/solenv/bin/cws-commit-patch b/solenv/bin/cws-commit-patch
deleted file mode 100755
index d1081ad82bc0..000000000000
--- a/solenv/bin/cws-commit-patch
+++ /dev/null
@@ -1,403 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: cws-commit-patch,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use Cwd 'abs_path';
-
-$default_mws = 'SRC680';
-
-sub usage()
-{
-    print STDERR <<EOS;
-cws-commit-patch - automate the creation of CWSes
-Usage: cws-commit-patch ...params... patch1.diff patch2.diff ...
-
-  -i, --iz        IZ number (XXXX or iXXXX)
-  -c, --cws       CWS name (to be created or existing)
-  -d, --default   Default to the latest milestone in MWS $default_mws
-  -h, --help      Help
-  -m, --milestone Milestone to base the CWS on (when -d is not used)
-  -r, --root      cvs root
-  -s, --summary   Summary describing the change (for cvs commit)
-  -w, --mws       MWS (Master Workspace) (when -d is not used)
-  
-Eg. cws-commit-patch -i 1234 -c fix01 -d -r :pserver:me\@localhost:/cvs \\
-                     -s \"Fixes this and that\" fix01-patch.diff
-EOS
-    exit 1;
-}
-
-sub cws_create($$$)
-{
-    my ( $mws, $cws, $milestone ) = @_;
-    system( "echo '===== cws_create =====' >> .log" );
-
-    my $tmp = `mktemp -d /tmp/cws-$cws.XXXXXX`;
-    chomp( $tmp );
-    print "Temp dir:\t$tmp\n";
-
-    chdir( $tmp );
-    $ENV{SRC_ROOT} = $tmp;
-
-    my $state = `cwsquery -m $mws -c $cws state 2>> .log`;
-    $state =~ s/\n//g;
-    if ( $state ne "" && $state ne "planned" ) {
-        print "CWS:\t\t'$cws' already exists, its state is '$state'\n";
-    }
-    else {
-        print "CWS:\t\tcreating '$cws'\n";
-
-        if ( system( "cwscreate -f $mws $milestone $cws 2>> .log" ) != 0 ) {
-            print STDERR "Unable to execute cwscreate.\n";
-            exit 1;
-        }
-        print "CWS:\t\t'$cws' created\n";
-    }
-}
-
-sub cws_modules($$)
-{
-    my ( $mws, $cws ) = @_;
-
-    my $mod_str = `cwsquery -m $mws -c $cws modules 2>> .log`;
-    return split( '\n', $mod_str );
-}
-
-sub cws_add_modules($$$@)
-{
-    my ( $mws, $cws, $milestone, @patches ) = @_;
-    system( "echo '===== cws_add_modules =====' >> .log" );
-
-    my %modules = ();
-
-    for $patch ( @patches ) {
-        if ( ! open( $PATCH, "$patch" ) ) {
-            print STDERR "Unable to open patch '$patch'.";
-            exit 1;
-        }
-        while (<$PATCH>) {
-            if ( /^\+\+\+ ([^\/]*)/ ) {
-                if ( $1 ne "" ) {
-                    $modules{$1} = "add";
-                }
-                else {
-                    print STDERR "Unable to guess module name ($1) from $patch.\n";
-                    close( $PATCH );
-                    exit 1;
-                }
-            }
-        }
-        close( $PATCH );
-    }
-
-    my @cws_modules = cws_modules( $mws, $cws );
-    for $cws_mod ( @cws_modules ) {
-        if ( defined( $modules{$cws_mod} ) ) {
-            $modules{$cws_mod} = "checkout";
-        }
-    }
-
-    while ( ( $module, $what ) = each( %modules ) ) {
-        if ( $what eq "add" ) {
-            print "Tagging:\tModule '$module'... Be patient, please ;)\n";
-            if ( system( "cvs checkout -r " . uc($mws) . "_$milestone $module >> .log 2>&1" ) != 0 ) {
-                print STDERR "Unable to execute cvs checkout.\n";
-                exit 1;
-            }
-            if ( system( "cwsadd -a -f $module >> .log 2>&1" ) != 0 ) {
-                print STDERR "Unable to execute cwsadd.\n";
-                exit 1;
-            }
-            print "Module:\t\t'$module' added to $cws\n";
-        }
-        elsif ( $what eq "checkout" ) {
-            print "Checking out:\tModule '$module'\n";
-            if ( system( "cvs checkout -r cws_" . lc($mws) . "_$cws $module >> .log 2>&1" ) != 0 ) {
-                print STDERR "Unable to execute cvs checkout.\n";
-                exit 1;
-            }
-            print "Module:\t\t'$module' already exists in $cws, checked out\n";
-        }
-    }
-}
-
-sub cws_add_task($)
-{
-    my ( $iz ) = @_;
-    system( "echo '===== cws_add_task =====' >> .log" );
-
-    if ( system( "cwsaddtask i$iz 2>> .log" ) != 0 ) {
-        print STDERR "Unable to add task number $iz.\n";
-        exit 1;
-    }
-
-    print "IZ:\t\tSet to '$iz'\n";
-}
-
-sub apply_patches(@)
-{
-    my ( @patches ) = @_;
-    system( "echo '===== apply_patches =====' >> .log" );
-
-    for $patch ( @patches ) {
-        print "Patch:\t\tApplying '$patch'\n";
-        if ( system( "unset POSIXLY_CORRECT ; patch -p0 -i $patch" ) != 0 ) {
-            print STDERR "Unable to apply patch $patch.\n";
-            exit 1;
-        }
-        print "Patch:\t\t'$patch' OK\n";
-    }
-}
-
-sub cvs_add_files(@)
-{
-    my ( @patches ) = @_;
-    system( "echo '===== cvs_add_files =====' >> .log" );
-
-    my %modules = ();
-
-    for my $patch ( @patches ) {
-        if ( ! open( $PATCH, "$patch" ) ) {
-            print STDERR "Unable to open patch '$patch'.";
-            exit 1;
-        }
-	my $file_add = "";
-        while (<$PATCH>) {
-            if ( /^\+\+\+ ([^\s]*)/ ) {
-                if ( $1 ne "" ) {
-		    $file_add = $1;
-                }
-            }
-            elsif ( /^\@\@ -0,0 / && $file_add ne "" ) {
-		my @to_add = split( /\//, $file_add );
-		my $current = "";
-		for my $add ( @to_add ) {
-		    $current .= "/" unless ( $current eq "" );
-		    my $where_add_dir = $current;
-		    $current .= $add;
-
-		    if ( ( -d "$current" && ! -d "$current/CVS" ) || ( -f "$current" ) ) {
-			if ( system( "cd $where_add_dir && cvs add $add" ) != 0 ) {
-			    print STDERR "Unable to exec 'cd $where_add_dir && cvs add $add'.\n";
-			    close( $PATCH );
-			    exit 1;
-			}
-		    }
-		}
-	    }
-        }
-        close( $PATCH );
-    }
-}
-
-sub cws_commit($$$$$@)
-{
-    my ( $mws, $cws, $iz, $summary, $milestone, @patches ) = @_;
-
-    cws_create( $mws, $cws, $milestone );
-    cws_add_modules( $mws, $cws, $milestone, @patches );
-    cws_add_task( $iz );
-
-    apply_patches( @patches );
-
-    cvs_add_files( @patches );
-
-    my @cws_modules = cws_modules( $mws, $cws );
-    my $commit_message = "#i$iz#\n" . $summary;
-    $commit_message =~ s/'/'\\''/g;
-
-    my $commit = "cvs commit -m '$commit_message' ";
-    for $module ( @cws_modules ) {
-        if ( -d $module ) {
-            $commit .= $module . " ";
-        }
-    }
-    print "CVS:\t\t$commit\n";
-    if ( system( $commit ) != 0 ) {
-        print STDERR "cvs commit failed.\n";
-        exit 1;
-    }
-}
-
-#
-# main()
-#
-if ( !defined( $ENV{'SOLARENV'} ) || $ENV{'SOLARENV'} eq '' ) {
-    my $build_dir = abs_path( $0 );
-    $build_dir =~ s#/solenv/bin/[^/]*$##;
-    my $env_script = "";
-    if ( -f "$build_dir/LinuxIntelEnv.Set.sh" ) {
-	$env_script = "$build_dir/LinuxIntelEnv.Set.sh";
-    }
-    elsif ( -f "$build_dir/LinuxX86-64Env.Set.sh" ) {
-	$env_script = "$build_dir/LinuxX86-64Env.Set.sh";
-    }
-    else {
-        print STDERR "Unable to find '$build_dir/Linux(Intel|X86-64)Env.Set.sh'.\n";
-        print STDERR "Please use 'configure' or 'setsolar'.\n";
-        exit 1;
-    }
-    open( $VARS, "bash -c '. $env_script ; set'|");
-    while ( <$VARS> ) {
-        /([^=]*)=(.*)/ || next;
-        $ENV{$1} = $2 unless "$1" eq "SHELLOPTS";
-    }
-    close( $VARS );
-}
-
-my $iz = "";
-my $cws = "";
-my $mws = "";
-my $milestone = "";
-my $summary = "";
-my @patches = ();
-my $use_default = 0;
-
-( my $pwd = `pwd` ) =~ s/\n//;
-
-while (@ARGV) {
-    $opt = shift @ARGV;
-
-    if ( $opt eq "-i" || $opt eq "--iz" ) {
-        $iz = shift @ARGV;
-    }
-    elsif ( $opt eq "-c" || $opt eq "--cws" ) {
-        $cws = shift @ARGV;
-    }
-    elsif ( $opt eq "-d" || $opt eq "--default" ) {
-        $use_default = 1;
-    }
-    elsif ( $opt eq "-h" || $opt eq "--help" ) {
-        usage();
-    }
-    elsif ( $opt eq "-r" || $opt eq "--root" ) {
-        $ENV{'CVSROOT'} = shift @ARGV;
-    }
-    elsif ( $opt eq "-s" || $opt eq "--summary" ) {
-        $summary = shift @ARGV;
-    }
-    elsif ( $opt eq "-m" || $opt eq "--milestone" ) {
-        $milestone = shift @ARGV;
-	if (! ( $milestone =~ m/^m/ ) ) {
-	    $milestone = "m$milestone";
-	    print "Re-writing milestone to $milestone\n";
-	}
-    }
-    elsif ( $opt eq "-w" || $opt eq "--mws" ) {
-        $mws = shift @ARGV;
-    }
-    else {
-        my $patch = $opt;
-        if ( $patch =~ /^[^\/]/ ) {
-            $patch = "$pwd/$opt";
-        }
-
-        if ( -f $patch ) {
-            push @patches, $patch;
-        }
-        else {
-            print STDERR "Unable to find patch '$patch'.\n";
-            exit 1;
-        }
-    }
-}
-
-if ( !@patches ) {
-    print STDERR "No patches to apply.\n";
-    exit 1;
-}
-if ( !defined( $ENV{'CVSROOT'} ) || $ENV{'CVSROOT'} eq "" ) {
-    print STDERR "Please specify cvs root (using -r or environment variable).\n";
-    exit 1;
-}
-if ( !defined( $iz ) || !( $iz =~ /^i?[0-9]+$/ ) ) {
-    print STDERR "Please specify the IZ number (as XXXX, or iXXXX).\n";
-    exit 1;
-}
-if ( !defined( $cws ) || $cws eq "" ) {
-    print STDERR "Please specify the CWS name (where to commit).\n";
-    exit 1;
-}
-if ( !defined( $summary ) || $summary eq "" ) {
-    print STDERR "Please provide summary.\n";
-    exit 1;
-}
-
-if ( !defined( $mws ) || $mws eq "" ) {
-    if ( $use_default ) {
-        $mws = $default_mws;
-        print "MWS:\t\tnot specified, assuming '$mws'\n";
-    }
-    else {
-        print STDERR "Please specify MWS, or use -d.\n";
-        exit 1;
-    }
-}
-else {
-    print "MWS:\t\t$mws\n";
-}
-
-if ( !defined( $milestone ) || $milestone eq "" ) {
-    ( $milestone = `cwsquery -m $mws -c $cws current 2> /dev/null` ) =~ s/\n//;
-}
-if ( $milestone ne "" ) {
-    print "Milestone:\t$milestone\n";
-}
-else {
-    if ( $use_default ) {
-        my $latest = `cwsquery -m $mws latest 2> /dev/null`;
-
-        ( $_, $milestone ) = split( ' ', $latest );
-        print "Milestone:\tnot specified, assuming '$milestone'\n";
-    }
-    else {
-        print STDERR "Please specify milestone, or use -d.\n";
-        exit 1;
-    }
-}
-
-$iz =~ s/^i//;
-$ENV{'CWS_WORK_STAMP'} = $cws;
-$ENV{'WORK_STAMP'} = $mws;
-
-cws_commit( $mws, $cws, $iz, $summary, $milestone, @patches );
-
-( my $tmp = `pwd` ) =~ s/\n//;
-print "
-Finished, please check '$tmp' that everything is as expected.
-Then:
-
-- Set 'http://www.openoffice.org/issues/show_bug.cgi?id=$iz' to FIXED
-  with a 'Committed to CWS $cws.' comment.
-- Fill the '$cws' info in 'http://eis.services.openoffice.org'.
-\n";
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 2ea012beab35..bca7fe3cc271 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -1016,7 +1016,7 @@ sub relink_workspace {
     # if these are not present.
     my %added_modules_hash;
     if (defined $ENV{ADDED_MODULES}) {
-        for ( split /\s/, $ENV{ADDED_MODULES} ) {
+        for ( split(/\s/, $ENV{ADDED_MODULES}) ) {
             $added_modules_hash{$_}++;
         }
     }
@@ -1039,12 +1039,16 @@ sub relink_workspace {
         }
     }
 
+    # Originally the extension .lnk indicated a linked module. This turned out to be
+    # not an overly smart choice. Cygwin has some heuristics which regards .lnk
+    # files as Windows shortcuts, breaking the build. Use .link instead.
+    # When in restoring mode still consider .lnk as link to modules (for old CWSs)
     my $old_link_dir = "$bd/" . $old_link_dirs[0];
     if ( $restore ) {
         if ( !opendir(DIR, $old_link_dir) ) {
             print_error("Can't open directory '$old_link_dir': $!.", 44);
         }
-        my @links = grep { !/\.lnk/ } readdir(DIR);
+        my @links = grep { !(/\.lnk/ || /\.link/)   } readdir(DIR);
         close(DIR);
         # everything which is not a link to a directory can't be an "added" module
         foreach (@links) {
@@ -1076,7 +1080,7 @@ sub relink_workspace {
     if ( !chdir($linkdir) ) {
         print_error("Can't chdir() to directory '$linkdir': $!.", 44);
     }
-    my $suffix = '.lnk';
+    my $suffix = '.link';
     foreach(@ooo_top_level_dirs) {
         if ( $_ eq 'REBASE.LOG' || $_ eq 'REBASE.CONFIG_DONT_DELETE'  ) {
             next;
diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl
index 11cce3fff36a..25321cfa3614 100644
--- a/solenv/bin/cwstestresult.pl
+++ b/solenv/bin/cwstestresult.pl
@@ -56,11 +56,12 @@ use Cws;
 ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
 
 my $is_debug = 1;           # enable debug
-my $opt_master = '';        # option: master workspace
-my $opt_child  = '';        # option: child workspace
+my $opt_master;             # option: master workspace
+my $opt_child;              # option: child workspace
+my $opt_milestone;              # option: milestone
 my $opt_testrunName;        # option: testrunName
-my $opt_testrunPlatform;    # option: testrunName
-my $opt_resultPage;         # option: testrunName
+my $opt_testrunPlatform;    # option: testrunPlatfrom
+my $opt_resultPage;         # option: resultPage
 
 
 #### main #####
@@ -76,33 +77,42 @@ sub testresult
     my $status = shift;
     # get master and child workspace
     my $masterws = $opt_master ? uc($opt_master) : $ENV{WORK_STAMP};
-    my $childws  = $opt_child  ? $opt_child  : $ENV{CWS_WORK_STAMP};
+    my $milestone = $opt_milestone ? $opt_milestone : $ENV{UPDMINOR};
+    my $childws  = $opt_milestone ? undef : ( $opt_child  ? $opt_child  : $ENV{CWS_WORK_STAMP} );
 
     if ( !defined($masterws) ) {
         print_error("Can't determine master workspace environment.\n"
                     . "Please initialize environment with setsolar ...", 1);
     }
 
-    if ( !defined($childws) ) {
-        print_error("Can't determine child workspace environment.\n"
+    if ( !defined($childws) && !defined($milestone) ) {
+        print_error("Can't determine child workspace environment or milestone.\n"
                     . "Please initialize environment with setsolar ...", 1);
     }
     if ( !defined($opt_resultPage) ) {
     $opt_resultPage="";
     }
     my $cws = Cws->new();
-    $cws->child($childws);
+    if ( defined($childws) ) {
+        $cws->child($childws);
+    }
     $cws->master($masterws);
-    my $id = $cws->eis_id();
     my $eis = $cws->eis();
 
     no strict;
+    my $result='';
 
-    if ( is_valid_cws($cws) ) {
-        my $result=$eis->submitTestResult($id,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
+    if ( defined($childws) ) {
+        my $id = $cws->eis_id();
+        if ( is_valid_cws($cws) ) {
+            $result=$eis->submitTestResult($id,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
+    } else {
+         print STDERR "cws is not valid";
+    }
     } else {
-        print STDERR "cws is not valid";
+        $result=$eis->submitTestResultMWS($masterws,$milestone,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
     }
+
     exit(0)
 }
 
@@ -124,12 +134,16 @@ sub is_valid_cws
 sub parse_options
 {
     # parse options and do some sanity checks
+    Getopt::Long::Configure("no_ignore_case");
     my $help = 0;
-    my $success = GetOptions('h' => \$help, 'm=s' => \$opt_master, 'c=s'=> \$opt_child, 'n=s' => \$opt_testrunName, 'p=s' => \$opt_testrunPlatform , 'r=s' => \$opt_resultPage );
+    my $success = GetOptions('h' => \$help, 'M=s' => \$opt_master, 'm=s' => \$opt_milestone, 'c=s' => \$opt_child, 'n=s' => \$opt_testrunName, 'p=s' => \$opt_testrunPlatform , 'r=s' => \$opt_resultPage );
     if ( $help || !$success || $#ARGV < 0 || (!defined($opt_testrunName)) || ( !defined($opt_testrunPlatform)) ) {
         usage();
         exit(1);
     }
+    if ( defined($opt_milestone) && defined($opt_child) ) {
+    print_error("-m and -c are mutually exclusive options",1);
+    }
 
     return $ARGV[0];
 }
@@ -160,13 +174,14 @@ sub print_error
 
 sub usage
 {
-    print STDERR "Usage: cwstestresult[-h] [-m masterws] [-c childws] <-n testrunName> <-p testrunPlatform> <-r resultPage> statusName\n";
+    print STDERR "Usage: cwstestresult[-h] [-m masterws] [-m milestone|-c childws] <-n testrunName> <-p testrunPlatform> <-r resultPage> statusName\n";
     print STDERR "\n";
-    print STDERR "Publish result of CWS test to EIS\n";
+    print STDERR "Publish result of CWS- or milestone-test to EIS\n";
     print STDERR "\n";
     print STDERR "Options:\n";
     print STDERR "\t-h\t\t\thelp\n";
-    print STDERR "\t-m master\t\toverride MWS specified in environment\n";
+    print STDERR "\t-M master\t\toverride MWS specified in environment\n";
+    print STDERR "\t-m milestone\t\toverride milestone specified in environment\n";
     print STDERR "\t-c child\t\toverride CWS specified in environment\n";
     print STDERR "\t-n testrunName\t\tspecifiy name of the test\n";
     print STDERR "\t-p testrunPlatform\tspecify platform where the test ran on\n";
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index a3e0450f4e08..74ed2020184a 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -339,6 +339,7 @@ sub do_symlink
 
     $line = expand_macros($line);
     ($from, $to) = split(' ',$line);
+    my $fullfrom = $from;
     if ( dirname($from) eq dirname($to) ) {
         $from = basename($from);
     }
@@ -369,7 +370,7 @@ sub do_symlink
             push_on_ziplist($to) if $opt_zip;
             return;
         }
-
+        return unless -e $fullfrom;
         print "SYMLIB: $from -> $to\n" if $opt_verbose;
         if ( !symlink("$from", "$to") ) {
             print_error("can't symlink $from -> $to: $!",0);
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
index 4db9bcb8d0f7..464b0d75e25d 100644
--- a/solenv/bin/make_download.pl
+++ b/solenv/bin/make_download.pl
@@ -52,6 +52,7 @@ use installer::windows::sign;
 installer::downloadsigner::getparameter();
 installer::downloadsigner::checkparameter();
 
+my $temppath = installer::downloadsigner::set_temp_path();
 my $infofilelist = installer::downloadsigner::createproductlist();
 installer::downloadsigner::publishproductlist($infofilelist);
 
@@ -62,19 +63,21 @@ foreach my $infofilename ( @{$infofilelist} )
     my $success = 1;
     my $do_copy = 1;
     my $followmeinfohash = installer::followme::read_followme_info($infofilename);
-    installer::downloadsigner::setlogfilename();
+    installer::downloadsigner::setlogfilename();    # Successful after reading followme file, resetting log file
+    if ( $installer::globals::writetotemp ) { installer::downloadsigner::set_output_pathes_to_temp($followmeinfohash, $temppath); }
+    if ( $installer::globals::useminor ) { installer::downloadsigner::set_minor_into_pathes($followmeinfohash, $temppath); }
 
     if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
     {
         installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" );
     }
 
-    installer::logger::include_header_into_logfile("Reading include pathes");
-    installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'});
+    # installer::logger::include_header_into_logfile("Reading include pathes");
+    # installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'});
 
     if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
     {
-        $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy);
+        $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
 
         ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
                                                                                                             $followmeinfohash->{'finalinstalldir'},
@@ -86,37 +89,45 @@ foreach my $infofilename ( @{$infofilelist} )
         if ( ! $success ) { installer::exiter::exit_program("ERROR: Signing installation set failed: $followmeinfohash->{'finalinstalldir'}", "Main"); }
     }
 
-    $followmeinfohash->{'finalinstalldir'} = installer::download::create_download_sets($followmeinfohash->{'finalinstalldir'},
-                                                                                        $followmeinfohash->{'includepatharray'},
-                                                                                        $followmeinfohash->{'allvariableshash'},
-                                                                                        $followmeinfohash->{'downloadname'},
-                                                                                        \$followmeinfohash->{'languagestring'},
-                                                                                        $followmeinfohash->{'languagesarray'});
-
-    ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                    $followmeinfohash->{'finalinstalldir'},
-                                                                                                    $followmeinfohash->{'installlogdir'},
-                                                                                                    "",
-                                                                                                    \$followmeinfohash->{'languagestring'},
-                                                                                                    $followmeinfohash->{'currentinstallnumber'});
-
-    if (( $success ) && ( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
+    if ( ! $installer::globals::nodownload )
     {
-        $do_copy = 0;
-        $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy);
-
-        $followmeinfohash->{'finalinstalldir'} = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                $followmeinfohash->{'finalinstalldir'},
-                                                                                                $followmeinfohash->{'installlogdir'},
-                                                                                                "",
-                                                                                                \$followmeinfohash->{'languagestring'},
-                                                                                                $followmeinfohash->{'currentinstallnumber'});
+        $followmeinfohash->{'finalinstalldir'} = installer::download::create_download_sets($followmeinfohash->{'finalinstalldir'},
+                                                                                            $followmeinfohash->{'includepatharray'},
+                                                                                            $followmeinfohash->{'allvariableshash'},
+                                                                                            $followmeinfohash->{'downloadname'},
+                                                                                            \$followmeinfohash->{'languagestring'},
+                                                                                            $followmeinfohash->{'languagesarray'});
+
+        ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
+                                                                                                        $followmeinfohash->{'finalinstalldir'},
+                                                                                                        $followmeinfohash->{'installlogdir'},
+                                                                                                        "",
+                                                                                                        \$followmeinfohash->{'languagestring'},
+                                                                                                        $followmeinfohash->{'currentinstallnumber'});
+
+        if (( $success ) && ( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
+        {
+            $do_copy = 0;
+            $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
+
+            ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
+                                                                                                            $followmeinfohash->{'finalinstalldir'},
+                                                                                                            $followmeinfohash->{'installlogdir'},
+                                                                                                            "",
+                                                                                                            \$followmeinfohash->{'languagestring'},
+                                                                                                            $followmeinfohash->{'currentinstallnumber'});
+        }
+    }
+
+    if ( $success )
+    {
+        installer::worker::clean_output_tree();
+        if ( $installer::globals::followme_from_directory ) { installer::downloadsigner::rename_followme_infofile($infofilename); }
     }
 
     installer::logger::stoptime();
 }
 
-
 ####################################
 # Main program end
 ####################################
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 8d1dbed78b97..eefe7930afb3 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -8,8 +8,6 @@
 #
 # $RCSfile: make_installer.pl,v $
 #
-# $Revision: 1.121 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -412,6 +410,9 @@ if ( $installer::globals::globallogging ) { installer::files::save_array_of_hash
 
 if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { $dirsinproductarrayref = installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); }
 if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1a.log", $dirsinproductarrayref); }
+if ( $allvariableshashref->{'OFFICEDIRECTORYNAME'} ) { installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, $allvariableshashref->{'OFFICEDIRECTORYNAME'}); }
+if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); }
+
 
 installer::scriptitems::resolve_all_directory_names($dirsinproductarrayref);
 if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2.log", $dirsinproductarrayref); }
@@ -1359,7 +1360,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # try it again later.
             ####################################################
 
-            if (( $installer::globals::patch ) || ( $installer::globals::languagepack )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
+            if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
 
             if ( $allvariableshashref->{'POOLPRODUCT'} )
             {
@@ -1809,6 +1810,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             chdir($currentdir); # changing back into start directory
         }
 
+        if (( $installer::globals::issolarispkgbuild ) && ( $allvariableshashref->{'COLLECT_PKGMAP'} )) { installer::worker::collectpackagemaps($installdir, $languagestringref, $allvariableshashref); }
+
         #######################################################
         # Analyzing the log file
         #######################################################
@@ -2219,14 +2222,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         }
 
         # Analyzing the ScpActions and copying the files into the installation set
-        # At least the loader, instmsia.exe and instmsiw.exe
+        # At least the loader.exe
 
         installer::logger::print_message( "... copying files into installation set ...\n" );
 
         # installer::windows::msiglobal::copy_scpactions_into_installset($defaultlanguage, $installdir, $scpactionsinproductlanguageresolvedarrayref);
         installer::worker::put_scpactions_into_installset($installdir);
 
-        # ... copying the setup.exe, instmsia.exe and instmsiw.exe
+        # ... copying the setup.exe
 
         installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref);
 
@@ -2298,7 +2301,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         # Creating Windows msp patches
         #######################################################
 
-        if (( $is_success ) && ( $installer::globals::updatedatabase ) && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} ) && ( ! ( $^O =~ /cygwin/i ))) # not supported for cygwin yet
+        if (( $is_success ) && ( $installer::globals::updatedatabase ) && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} ))
         {
             # Required:
             # Temp path for administrative installations: $installer::globals::temppath
diff --git a/solenv/bin/merge2top b/solenv/bin/merge2top
deleted file mode 100755
index a2ad53e40cfa..000000000000
--- a/solenv/bin/merge2top
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: merge2top,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# merge2top - merge branch into top level revision, shell wrapper
-#
-
-
-if [ x${SOLARENV}x = 'xx' ]; then
-    echo "Please configure environment with setsolar"
-    exit 1
-fi
-perl -I${SOLARENV}/bin/modules ${SOLARENV}/bin/merge2top.pl "$@"
diff --git a/solenv/bin/merge2top.btm b/solenv/bin/merge2top.btm
deleted file mode 100644
index e8a82dab5214..000000000000
--- a/solenv/bin/merge2top.btm
+++ /dev/null
@@ -1,9 +0,0 @@
-rem @echo off
-iff "%SOLARENV%" == "" then
-    echo Please configure environment with setsolar
-endiff
-iff "%PERL%" == "" then
-	call perl5 -I%SOLARENV%\bin\modules %SOLARENV%\bin\merge2top.pl %1&
-else
-	call %PERL% -I%SOLARENV%\bin\modules %SOLARENV%\bin\merge2top.pl %1&
-endiff
diff --git a/solenv/bin/merge2top.pl b/solenv/bin/merge2top.pl
deleted file mode 100644
index 0401719a0532..000000000000
--- a/solenv/bin/merge2top.pl
+++ /dev/null
@@ -1,206 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: merge2top.pl,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# merge2top.pl - merge branch into top level revision
-#
-
-use Cvs;
-use Cwd;
-use File::Basename;
-
-#### script id #####
-
-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-$id_str = ' $Revision: 1.4 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print "$script_name -- version: $script_rev\n";
-
-#### globals ####
-
-$is_debug    = 0;       # debug flag
-
-$files       = ();      # files to merge
-
-#### main ####
-
-my $branchlabel = parse_args(\@ARGV);
-my ($success, $failure) = process_files($branchlabel, \@files);
-
-print "Merged $success file(s) successfully\n" if $success;
-print "Failed to merge $failure file(s)\n" if $failure;
-$failure ? exit(2) : exit(0);
-
-#### subroutines #####
-
-sub parse_args
-{
-    # parse command line arguments
-
-    my $args_ref = shift;
-
-    # check for branchlabel
-    my $branchlabel_next = 0;
-    foreach (@{$args_ref}) {
-        /^-b$/ && ++$branchlabel_next && next;
-        /^-b(\w+)$/ && ($branchlabel=$1) && next;
-        if ( $branchlabel_next ) {
-            $branchlabel = $_;
-            $branchlabel_next = 0;
-        }
-        else {
-            push(@files, $_);
-        }
-    }
-
-    print STDERR "branchlabel: $branchlabel\n" if $is_debug;
-    print STDERR "file(s) to merge: " . join(',', @files) . "\n" if $is_debug;
-
-    if ( !$branchlabel || $#files < 0 ) {
-        usage();
-        exit(1);
-    }
-    return $branchlabel;
-}
-
-sub process_files
-{
-    # iterate over file list and merge
-
-    my $branchlabel = shift;
-    my $files_ref   = shift;
-    my $success;
-    my $failure;
-    my $cwd = getcwd();
-    foreach my $file (@{$files_ref}) {
-        if ( -r $file ) {
-            chdir(dirname($file));
-            merge($branchlabel, basename($file)) ? $success++ : $failure++;
-            chdir($cwd);
-        }
-        else {
-            print STDERR "$script_name: can't read $file: $!\n";
-        }
-    }
-    return ($success, $failure);
-}
-
-sub merge
-{
-    # Merge $branchlabel branch to top for $file.
-    # Expects cwd to be tuned to $file.
-
-    my $branchlabel = shift;
-    my $file        = shift;
-
-    my $archive = Cvs->new();
-    $archive->name($file);
-
-    # Check if branchlabel exists.
-    if ( !$archive->is_tag($branchlabel) ) {
-        print STDERR "$script_name: '$file': no such branchlabel '$branchlabel'!\n";
-        return $0;
-    }
-    # Is $branchlabel really a branchlabel?
-    my $branch_rev = $archive->get_branch_rev($branchlabel);
-    if ( !$branch_rev ) {
-        print STDERR "$script_name: '$file': '$branchlabel' is not a branchlabel!\n";
-        return $0;
-    }
-
-    # Ok we got the branch root.
-    # Now collect all the logging information of the revisions on the branch
-    my @merge_comment = ();
-    push(@merge_comment, "$script_name: merge branch $branchlabel ($branch_rev)\n");
-    my $revs_ref = $archive->get_sorted_revs();
-    foreach my $rev (@{$revs_ref}) {
-        if ( $rev =~ /^$branch_rev\.\d+/ ) {
-            my $log_ref = $archive->get_data_by_rev()->{$rev};
-            my $comment = "$$log_ref{'DATE'} $$log_ref{'AUTHOR'} $rev: $$log_ref{'COMMENT'}";
-            push(@merge_comment, $comment);
-        }
-    }
-
-    # update to top level revision
-    if ( $archive->update('-A -kk') ne 'success' ) {
-        print STDERR "$script_name: failed to update '$file', cancel merge!\n";
-        return 0;
-    }
-    # write out merge comment
-    my $mergecommentfile = $file . '.mergecomment';
-    if ( !open(COMMENTFILE, ">$mergecommentfile") ) {
-        print STDERR "$script_name: can't open $mergecommentfile $!\n";
-        return 0;
-    }
-    print COMMENTFILE @merge_comment;
-    close(COMMENTFILE);
-
-    # merge
-    my $rc = $archive->update("-j $branchlabel -kk");
-    if ( $rc eq 'conflict' ) {
-        print STDERR "$script_name: '$file': merge conflicts!\n";
-        print STDERR "Resolve conflict manually and commit again with:\n";
-        print STDERR "cvs commit -F $mergecommentfile $file\n";
-        return 0;
-    }
-    elsif ( $rc ne 'success' ) {
-        print STDERR "$script_name: '$file': merge failed for unknown reasons!\n";
-        print STDERR "Resolve problem manually\n";
-        unlink($mergecommentfile);
-        return 0;
-    }
-
-    if ( $archive->commit("-F $mergecommentfile") ne 'success' ) {
-        print STDERR "$script_name: '$file': PANIC: commit failed for unknown reasons\n";
-        return 0;
-    }
-
-    # ok, everything went well, remove comment file
-    unlink($mergecommentfile);
-    # do top level update with -A switch to remove -kk sticky flag
-    my $rc = $archive->update('-A');
-    if ( $rc ne 'success' ) {
-        print STDERR "$script_name: '$file': PANIC: cleanup update failed for unknown reasons\n";
-    }
-    return 1;
-}
-
-sub usage
-{
-    print STDERR "usage:\n";
-    print STDERR "       $script_name -b <branch_label> <files> ...\n";
-}
diff --git a/solenv/bin/modules/Cvs.pm b/solenv/bin/modules/Cvs.pm
deleted file mode 100644
index 6eb445be2031..000000000000
--- a/solenv/bin/modules/Cvs.pm
+++ /dev/null
@@ -1,576 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Cvs.pm,v $
-#
-# $Revision: 1.26 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# Cvs.pm - package for manipulating CVS archives
-#
-
-package Cvs;
-use strict;
-
-use Carp;
-use CwsConfig;
-
-##### constructor ####
-
-sub new
-{
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $self = {};
-    $self->{NAME} = undef;
-    $self->{HEAD} = undef;
-    $self->{FLAGS} = undef;
-    my $conf = CwsConfig::get_config();
-    if ( $conf->cvs_binary() ) {
-        $self->{CVS_BINARY} = $conf->cvs_binary();
-    }
-    else {
-        if ($^O eq "MSWin32" ) {
-            $self->{CVS_BINARY} = "cvsclt2.exe";
-        }
-        else {
-            $self->{CVS_BINARY} = "cvs.clt2";
-        }
-    }
-    $self->{ARCHIVE_PATH} = undef;
-    $self->{REPOSITORY_REV} = undef;
-    $self->{REV_DATA} = {};
-    $self->{REV_SORTED} = [];
-    $self->{REV_TAGS} = {};
-    $self->{TAGS} = {};
-    $self->{"_PARSED"} = undef;
-    $self->{"_SORTED"} = undef;
-    $self->{"_TAGGED"} = undef;
-    bless ($self, $class);
-    return $self;
-}
-
-#### methods to access per object data ####
-
-sub name
-{
-    my $self = shift;
-    if ( @_ ) {
-        $self->{NAME} = shift;
-    }
-    return $self->{NAME};
-}
-
-sub cvs_binary
-{
-    my $self = shift;
-    if ( @_ ) {
-        $self->{CVS_BINARY} = shift;
-    }
-    return $self->{CVS_BINARY};
-}
-
-sub get_data_by_rev
-{
-    my $self = shift;
-    $self->parse_log();
-
-    return $self->{REV_DATA};
-}
-
-sub get_sorted_revs
-{
-    my $self = shift;
-
-    if ( $self->{"_SORTED"} ) {
-        return $self->{REV_SORTED};
-    }
-
-    $self->parse_log();
-
-    sub by_rev {
-        # comparison function for sorting
-        my (@field_a, @field_b, $min_field, $i);
-
-        @field_a = split /\./, $a;
-        @field_b = split /\./, $b;
-        $min_field = ($#field_a > $#field_b) ? $#field_b : $#field_a;
-
-        for ($i = 0; $i <= $min_field; $i++) {
-            if ( ($field_a[$i] < $field_b[$i]) ) {
-                return -1;
-            }
-            if ( ($field_a[$i] > $field_b[$i]) ) {
-                return 1;
-            }
-        }
-
-        if ( $#field_a == $#field_b ) {
-            return 0;
-        }
-        # eg. 1.70 sorts before 1.70.1.0
-        ($#field_a < $#field_b) ? return -1 : return 1;
-    }
-
-    @{$self->{REV_SORTED}} = sort by_rev (keys %{$self->{REV_DATA}});
-    $self->{"_SORTED"} = 1;
-    return $self->{REV_SORTED};
-}
-
-sub get_tags_by_rev
-{
-    my $self = shift;
-    my ($tag, $rev);
-
-    if ( $self->{"_TAGGED"} ) {
-        return $self->{REV_TAGS};
-    }
-
-    $self->parse_log();
-    foreach $tag (keys %{$self->{TAGS}}) {
-        $rev = $self->{TAGS}->{$tag};
-        push (@{$self->{REV_TAGS}->{$rev}}, $tag);
-    }
-
-    $self->{"_TAGGED"} = 1;
-    return $self->{REV_TAGS};
-}
-
-sub get_flags
-{
-    my $self = shift;
-    $self->parse_log();
-
-    return $self->{FLAGS};
-}
-
-sub get_tags
-{
-    my $self = shift;
-
-    $self->parse_log();
-    return $self->{TAGS};
-}
-
-sub get_head
-{
-    my $self = shift;
-
-    $self->parse_log();
-    return $self->{HEAD};
-}
-
-sub get_repository_rev
-{
-    my $self = shift;
-
-    if( !$self->{REPOSITORY_REV} ) {
-        # ignore return values
-        $self->status();
-    }
-    return $self->{REPOSITORY_REV};
-}
-
-sub get_archive_path
-{
-    my $self = shift;
-
-    if( !$self->{ARCHIVE_PATH} ) {
-        # ignore return values
-        $self->status();
-    }
-    return $self->{ARCHIVE_PATH};
-}
-
-sub is_tag
-{
-    my $self = shift;
-    my $tag  = shift;
-
-    my $tags_ref = $self->get_tags();
-    return (defined $$tags_ref{$tag}) ? 1 : 0;
-}
-
-# Check if $label is branch label and returns revision.
-sub get_branch_rev
-{
-    my $self  = shift;
-    my $label = shift;
-
-    return 0 if $label eq '';
-    my $tags_ref = $self->get_tags();
-    my $rev = $$tags_ref{$label};
-    return 0 if !defined($rev);
-    my @field = split('\.', $rev);
-    # $label is a branch label if rev is of form (...)x.y.0.z
-    return 0 if $field[-2] != 0;
-    $field[-2] = $field[-1];
-    # remove last
-    pop @field;
-    return join('.', @field);
-}
-
-sub get_latest_rev_on_branch
-{
-    my $self  = shift;
-    my $label = shift;
-
-    my $branch_rev = $self->get_branch_rev($label);
-    return 0 if !$branch_rev;
-
-    my $latest_rev_on_branch = 0;
-
-    foreach ( @{$self->get_sorted_revs()} ) {
-        if ( $_ =~ /^$branch_rev\.(\d+)$/ ) {
-            $latest_rev_on_branch = $_;
-        }
-    }
-
-    # No revision has ever been commited on this branch,
-    # return branch root.
-    if ( !$latest_rev_on_branch ) {
-        $branch_rev =~ /^(.*)\.(\d+)$/;
-        $latest_rev_on_branch = $1;
-    }
-    return $latest_rev_on_branch;
-}
-
-
-#### methods to manipulate archive ####
-
-# Delete a revision. Use with care.
-sub delete_rev
-{
-    my $self = shift;
-    my $rev = shift;
-    my $file = $self->name();
-
-    my $response_ref = $self->execute("admin -o$rev $file");
-    foreach ( @{$response_ref} ) {
-        /deleting revision $rev/ && return 1;
-    }
-    return 0;
-}
-
-# Update archive with options $options. Returns 'success' and new revision
-# on success or reason of failure. If no update happens because file was
-# up-to-date consider operation a success.
-sub update
-{
-    my $self = shift;
-    my $options = shift;
-
-    my $file = $self->name();
-    my $response_ref = $self->execute("update $options $file");
-    my $conflict          = 0;
-    my $notknown          = 0;
-    my $connectionfailure = 0;
-    foreach ( @{$response_ref} ) {
-        /conflicts during merge/ && ++$conflict;
-        /nothing known about/ && ++$notknown;
-        /\[update aborted\]: connect to/ && ++$connectionfailure;
-    }
-    if ( $conflict || $notknown || $connectionfailure) {
-        my $failure = 'unknownfailure';
-        $failure = 'conflict' if $conflict;
-        $failure = 'notknown' if $notknown;
-        $failure = 'connectionfailure' if $connectionfailure;
-        return $failure;
-    }
-    return 'success';
-}
-
-# Commit $file with option $option; return 'success' or reason for failure.
-# If 'success' return the new revision as second element.
-sub commit
-{
-    my $self = shift;
-    my $options = shift;
-
-    my $file = $self->name();
-    my $response_ref = $self->execute("commit $options $file");
-
-    # already commited ?
-    return 'nothingcommitted' if !@{$response_ref};
-
-    my $conflict           = 0;
-    my $uptodate           = 0;
-    my $notknown           = 0;
-    my $success            = 0;
-    my $connectionfailure = 0;
-    my $new_revision = undef;
-    foreach ( @{$response_ref} ) {
-        /Up-to-date check failed/ && ++$uptodate;
-        /nothing known about/ && ++$notknown;
-        /had a conflict and has not been modified/ && ++$conflict;
-        /new revision: (delete);/ && (++$success, $new_revision = $1);
-        /new revision: ([\d\.]+);/ && (++$success, $new_revision = $1);
-        /\[commit aborted\]: connect to/ && ++$connectionfailure;
-    }
-    if ( !$success ) {
-        my $failure = 'unknownfailure';
-        $failure = 'conflict'          if $conflict;
-        $failure = 'notuptodate'       if $uptodate;
-        $failure = 'notknown'          if $notknown;
-        $failure = 'connectionfailure' if $connectionfailure;
-        return $failure;
-    }
-    return wantarray ? ('success', $new_revision) : 'success';
-}
-
-# Tag file with specified tag. Options may be specified,
-# '-b' for a branch tag and -F for forced tag are valid options.
-# '-B' to force moving existing tag also is valid.
-# Retagging without moving the tag is considered a succesful
-# operation.
-sub tag
-{
-    my $self    = shift;
-    my $tag     = shift;
-    my $options = shift;
-
-    return 'invalidtag' if !$tag;
-    # check for valid options
-    if ( $options ) {
-        my @elem = split(' ', $options);
-        foreach (@elem) {
-            unless ( /-B/ || /^-F/ || /-b/ ) {
-                return 'invalidoption';
-            }
-            $options = join(' ', @elem);
-        }
-    }
-    else {
-        $options = '';
-    }
-
-    my $file = $self->name();
-    my $response_ref = $self->execute("tag $options $tag $file");
-
-    unless ( $options =~ /-F/ && $options =~ /-b/ ) {
-        # No message from CVS means that tag already exists
-        # and has not been moved.
-        # If both -F and -b is given, CVS will always return
-        # message.
-        return 'success' if !@{$response_ref};
-    }
-
-    my $tagged             = 0;
-    my $cant_move          = 0;
-    my $connectionfailure  = 0;
-    my $invalidfile        = 0;
-    foreach ( @{$response_ref} ) {
-        /^T \Q$file\E/ && ++$tagged;
-        /NOT MOVING tag/ && ++$cant_move;
-        /nothing known about/ && ++$invalidfile;
-        /\[tag aborted\]: connect to/ && ++$connectionfailure;
-    }
-    return 'success'           if $tagged;
-    return 'cantmove'          if $cant_move;
-    return 'connectionfailure' if $connectionfailure;
-    return 'invalidfile'       if $invalidfile;
-    # should never happen
-    return 'unknownfailure';
-}
-
-#### misc operations ####
-
-# Return status information. Note that this is somewhat redundant with
-# the information which can be retrieved from the log, but in some cases
-# we can avoid the more expansive parsing of the log by calling this method.
-# We don't save the status information between calls.
-sub status
-{
-    my $self       = shift;
-
-    my $file = $self->name();
-    my ($nofile, $unknownfailure, $connectionfailure);
-    my ($status, $working_rev);
-    my ($sticky_tag, $branch, $sticky_date, $sticky_options);
-
-    my $response_ref = $self->execute("status $file");
-    foreach ( @{$response_ref} ) {
-        chomp();
-        /File: no file/ && ++$nofile;
-        /Status:\s+([\w\-\s]+)$/ && ($status = $1);
-        /Working revision:\s+((\d|\.)+)/ && ($working_rev = $1);
-        /Repository revision:\s+((\d|\.)+)\s+(\S+)/ && ($self->{REPOSITORY_REV} = $1) && ($self->{ARCHIVE_PATH} = $3);
-        /Sticky Tag:\s+(.+)/ && ($sticky_tag = $1);
-        /Sticky Date:\s+(.+)/ && ($sticky_date = $1);
-        /Sticky Options:\s+(.+)/ && ($sticky_options = $1);
-        /\[status aborted\]: connect to/ && ++$connectionfailure;
-    }
-
-    return 'connectionfailure' if $connectionfailure;
-    # all variables except $status will contain garbage if 'Locally Added'
-    # or 'Unknown'
-    return $status if ($status eq 'Locally Added' || $status eq 'Unknown');
-    # same if $nofile is set
-    return $status if $nofile;
-
-    if ( $sticky_tag =~ /([\w\-]+) \(branch: ([\d\.]+)\)$/ ) {
-        $sticky_tag = $1;
-        $branch = $2;
-    }
-
-    $sticky_date = '' if $sticky_date eq '(none)';
-    $sticky_options = '' if $sticky_options eq '(none)';
-
-    if ( $sticky_options =~ /\-(\w+)/ ) {
-        $sticky_options = $1;
-    }
-
-    $unknownfailure++ if !$status;
-
-    return 'unknownerror' if $unknownfailure;
-    return ($status, $working_rev, $self->{REPOSITORY_REV}, $sticky_tag, $branch,
-            $sticky_date, $sticky_options);
-}
-
-# Return a diff between two revision of an archive.
-sub diff
-{
-    my $self       = shift;
-    my $rev1       = shift;
-    my $rev2       = shift;
-    my $options    = shift || '';
-
-    my $file = $self->name();
-    my ($nofile, $unknowntagfailure, $unknownrevfailure, $connectionfailure);
-
-    my $response_ref = $self->execute("diff $options -r$rev1 -r$rev2 $file");
-
-    foreach ( @{$response_ref} ){
-        /\[diff aborted\]: connect to/ && ++$connectionfailure;
-        /cvs \[server aborted\]: no such tag \w+/ && ++$unknowntagfailure;
-        /cvs server: tag [\d\.]+ is not in file $file/ && ++$unknownrevfailure;
-    }
-
-    return 'connectionfailure' if $connectionfailure;
-    return 'unknowntagfailure' if $unknowntagfailure;
-    return 'unknownrevfailure' if $unknownrevfailure;
-    return wantarray ? @{$response_ref} : $response_ref;
-}
-#### private methods ####
-
-sub execute
-{
-    my $self    = shift;
-    my $command = shift;
-    my $authtimeout = 0;
-    my @response;
-    while () {
-        if ( $authtimeout >= 5 ) {
-            # fail after 5 tries
-            die("FATAL: OOo CVS server authorization time out, can't continue!\nPlease notify Release Engineering.")
-        }
-        if ( $authtimeout > 0 ) {
-            # sleep 5 seconds after a authorization timeout
-            carp("WARNING: OOo CVS server authorization time out, count: $authtimeout, sleeping for 5 seconds ...");
-            sleep(5);
-        }
-        # cvs option "-f" for disabling the reading of $HOME/.cvsrc, if any
-        open(CVS, "$self->{CVS_BINARY} -f $command 2>&1 |");
-        @response = <CVS>;
-        close(CVS);
-
-        foreach ( @response ) {
-            if ( /unrecognized auth response/ ) {
-                # don't get fooled by comment of rev. 1.14
-                /#i25646#: catch 'unrecognized auth response' from OOo CVS server/ && next;
-                # ok, seems to be a real timeout
-                ++$authtimeout;
-            }
-        }
-        last if !$authtimeout;
-    }
-    return wantarray ? @response : \@response;
-}
-
-sub parse_log
-{
-    my $self = shift;
-    if ( $self->{"_PARSED"} ) {
-        return;
-    }
-    my $file = $self->name();
-    my $in_revisions = 0;
-    my $in_tags = 0;
-    my $rev_data = {};
-    my ($rev, $date, $author, $state, $comment, @branches);
-
-    my $response_ref = $self->execute("log $file");
-
-    foreach ( @{$response_ref} ) {
-        chomp;
-
-        if ( $in_revisions ) {
-            /revision\s((\d|\.)+)$/o && do { $rev = $1; next; };
-            /^date:\s(\S+\s\S+);\s+author:\s(\S+);\s+state:\s(\S+);/
-                && do { $date = $1; $author = $2; $state = $3; next; };
-            /^branches:((\s+(\d|\.)+;)+)$/o && do {
-                my $line;
-                $line = $1;
-                $line =~ s/\s//go;
-                @branches = split(/;/, $line);
-                next;
-            };
-
-            (/^----------------------------$/o || /^=============================================================================$/o) && do
-            {
-                $rev_data = {DATE => $date,
-                             AUTHOR => $author,
-                             STATE => $state,
-                             COMMENT => $comment,
-                             BRANCHES => [ @branches ]};
-                $self->{REV_DATA}->{$rev} = $rev_data;
-                $comment = undef;
-                @branches = ();
-                next;
-            };
-
-            $comment .= $_ . "\n" ;
-        }
-        elsif ( $in_tags ) {
-            /^keyword\ssubstitution:\s/o && do { $self->{FLAGS} = $'; $in_tags--; next; };
-            # tags may contain a hyphen
-            /^\t([\w|\-]+):\s((\d|\.)+)$/o && do { $self->{TAGS}->{$1} = $2; next; };
-        }
-        else {
-            /^----------------------------$/o && do { $in_revisions++; next; };
-            /^symbolic\snames:$/o && do { $in_tags++; next; };
-            /^head:\s((\d|\.)+)$/o && do { $self->{HEAD} = $1; next; };
-            /^RCS file:\s((\d|\.)+)$/o && do { $self->{ARCHIVE_PATH} = $1; next; };
-        }
-    }
-
-    $self->{"_PARSED"} = 1;
-}
-
-####
-
-1; # needed by "use" or "require"
diff --git a/solenv/bin/modules/CvsModule.pm b/solenv/bin/modules/CvsModule.pm
deleted file mode 100755
index 5ad40be3b55d..000000000000
--- a/solenv/bin/modules/CvsModule.pm
+++ /dev/null
@@ -1,1040 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: CvsModule.pm,v $
-#
-# $Revision: 1.20 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# CvsModule.pm - package for manipulating CVS modules
-#
-
-package CvsModule;
-use strict;
-
-use Benchmark;
-use Carp;
-use Cwd;
-use FileHandle;
-use File::Find;
-use File::Basename;
-use CwsConfig;
-
-my $config = CwsConfig::get_config();
-
-my %CvsModuleClassData = (
-    CVS_BINARY              => $config->cvs_binary() . " -f",        # name of cvs binary
-                                                                     # "-f" for overriding .cvsrc
-    CVS_REMOTE              => $config->get_cvs_server(),            # name of remote server
-    CVS_REMOTE_REPOSITORY   => $config->get_cvs_server_repository(), # remote repository
-    CVS_MIRROR              => $config->get_cvs_mirror(),            # local cvsup mirror
-    CVS_MIRROR_REPOSITORY   => $config->get_cvs_server_repository(), # mirror repository
-    VCSID                   => $config->get_cvs_server_id()          # VCSID of CVS user
-);
-
-##### constructor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{MODULE}         = undef;    # module name
-    $self->{VERBOSE}        = 0;        # verbose diagnostics
-    $self->{CVS_SERVER}     = undef;    # name of CVS server
-    $self->{CVS_METHOD}     = undef;    # checkout method
-    $self->{CVS_REPOSITORY} = undef;    # CVS repository
-    $self->{DEFS_CACHE}     = undef;    # cache for module definitions
-    $self->{LOG_BUFFER}     = ();       # ring buffer for logging CVS messages
-    bless ($self, $class);
-    return $self;
-}
-
-#### instance data accessor methods ####
-
-# generate remaining instance data accessor methods
-# if this looks strange see 'perldoc perltootc'
-for my $datum (qw(module verbose)) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{uc($datum)} = shift if @_;
-        return $self->{uc($datum)};
-    }
-}
-
-# if this looks strange see 'perldoc perltootc'
-for my $datum (qw(cvs_server cvs_method cvs_repository)) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        my $ucdatum = uc($datum);
-        if ( @_ ) {
-            $self->{$ucdatum} = shift if @_;
-        }
-        else {
-            $self->get_root() unless $self->{$ucdatum};
-        }
-        return $self->{$ucdatum};
-    }
-}
-
-#### class data accessor methods
-
-# generate class data accessor methods
-for my $ucdatum (keys %CvsModuleClassData) {
-    my $datum = lc($ucdatum);
-    no strict "refs";
-    *$datum = sub {
-        shift; # ignore calling class/object
-        return $CvsModuleClassData{$ucdatum};
-    }
-}
-
-#
-# this procedure provides common output
-# the result of update method
-#
-sub handle_update_information {
-    my ($self, $updated_files_ref) = @_;
-    my ($updated, $merged, $conflicts);
-
-    foreach ( @$updated_files_ref ) {
-        print "\t$_->[1]\t$_->[0]\n";
-        if ( $_->[1] eq 'P' || $_->[1] eq 'U' ) {
-            $updated++;
-        }
-        elsif ( $_->[1] eq 'M' ) {
-            $merged++;
-        }
-        elsif ( $_->[1] eq 'C' ) {
-            $conflicts++;
-        }
-        else {
-            # can't happen
-            croak("ERROR: handle_update_information(): internal error");
-        }
-    }
-    print("\t\tUpdated: $updated\n") if $updated;
-    print("\t\tMerged: $merged\n") if $merged;
-    print("\t\tConflict(s): $conflicts\n") if $conflicts;
-    return ($updated, $merged, $conflicts);
-};
-
-#
-# this procedure patches CVS/Root file in module current path
-# actions available: 'user' 'server'. Default - both
-#
-sub patch_cvs_root_file {
-    my ($self, $path, $action) = @_;
-    my @files;
-    find sub { push @files, $File::Find::name if -d _ && /CVS$/},
-    $path . '/' . $self->module();
-    foreach my $cvs_dir (@files) {
-        my $root_file = "$cvs_dir/Root";
-        next if (!-f $root_file);
-        if (!open(ROOT, "<$cvs_dir/Root")) {
-            croak("ERROR: patch_cvs_root_file(): can't open file '$root_file'");
-        }
-        my $line = <ROOT>;
-        close(ROOT);
-
-        # patch root
-        $action = '' if (!defined $action);
-        if ($action ne 'server') {
-            # in this case patching user won't be the wrong thing
-            croak ("ERROR: patch_cvs_root_file(): file '$root_file' has wrong format") if ($line !~ /:(\w+)@/o);
-            $line = "$`:" . $self->vcsid(). "\@$'";
-        }
-        if ($action ne 'user') {
-            # in this case patching server won't be the wrong thing either
-            croak ("ERROR: patch_cvs_root_file(): file '$root_file' has wrong format") if ($line !~ /@/o);
-            $line = "$`\@" . $self->cvs_server() . ":" . $self->cvs_repository() . "\n";
-        }
-        open(ROOT, ">$root_file") or croak ("ERROR: patch_cvs_root_file(): can't write file '$root_file'");
-        print ROOT $line;
-        close(ROOT);
-    };
-};
-
-#### additional public methods ####
-
-#### instance methods #####
-
-# Checkout module to specified scratch area
-# If CVS_SERVER matches CVS_REMOTE do a checkout
-# from CVS_MIRROR first and than update/checkout
-# via CVS_SERVER.
-# Otherwise do direct checkout.
-# Returns a list of entries corresponding to the files which have been
-# checked out or 'nofilesupdated'
-# The entries of the returned list have the form [$file, 'U']
-sub checkout
-{
-    my $self    = shift;
-    my $path    = shift;
-    my $tag     = shift;
-    my $options = shift;
-
-
-    my $module  = $self->module();
-
-    if ( !$module ) {
-        croak("ERROR: CvsModule::checkout(): no module for checkout specified");
-    }
-    if ( ! -d $path ) {
-        croak("ERROR: CvsModule::checkout(): invalid local path for checkout specified");
-    }
-
-    # chdir to checkout area
-    my $saved_cwd = cwd();
-    if ( !chdir($path) ) {
-        croak("ERROR: CvsModule:: can't chdir() to '$path'");
-    }
-
-    my $from_mirror = 0;
-    my $update_only = 0;
-    if ( $self->cvs_server() eq $self->cvs_remote() && defined($self->cvs_mirror()) ) {
-        # check if module has already been checked out
-        $from_mirror = 1;
-        if ( -r "$module/CVS/Root" ) {
-            open(ROOT, "<$module/CVS/Root");
-            my @lines = <ROOT>;
-            close(ROOT);
-            if ( $lines[0] =~ $self->cvs_server() ) {
-                $update_only = 1;
-                $from_mirror = 0;
-            }
-        }
-    }
-
-    my $dirs_ref;
-    my $files_ref;
-    if ( $from_mirror ) {
-        ($dirs_ref, $files_ref) = $self->do_checkout($self->cvs_mirror(), '', $options);
-        if ( @{$dirs_ref} ) {
-            my $mirror = $self->cvs_mirror();
-            my $remote = $self->cvs_remote();
-            my $mirror_rep = $self->cvs_mirror_repository();
-            my $remote_rep = $self->cvs_remote_repository();
-            $self->patch_root($mirror, $remote, $mirror_rep, $remote_rep, $dirs_ref);
-        }
-        my $module_dir = $module;
-        $module_dir = dirname($module) if ($module =~ /\\|\//);
-        chdir($module_dir);
-        # FIXME We should add an option '-d' here to add directories which
-        # have been added to the server but not yet synced to the mirror,
-        # Unfortunately a bug in CVS prevents us from doing so.
-        my $updated_files_ref;
-        my $updated_dirs_ref;
-        my %files_hash;
-        ($updated_dirs_ref, $updated_files_ref) = $self->do_update($tag, $options);
-        if ( @{$updated_files_ref} ) {
-            # Ok, something changed in the mean time
-            # create hash for faster searching
-            foreach (@{$files_ref}) {
-                $files_hash{$_->[0]}++;
-            }
-            # iterate over updated files from remote and add them if they
-            # are not yet in $files_ref
-            foreach (@{$updated_files_ref}) {
-                push(@{$files_ref}, $_) if !exists $files_hash{$_->[0]};
-            }
-        }
-    }
-    else {
-        if ( $update_only ) {
-            chdir($module);
-            ($dirs_ref, $files_ref) = $self->do_update($tag, $options);
-        }
-        else {
-            ($dirs_ref, $files_ref) = $self->do_checkout($self->cvs_server(), $tag, $options);
-        }
-    }
-
-    # chdir() back
-    chdir($saved_cwd);
-    return defined($files_ref) ? $files_ref : 'nofilesupdated';
-}
-
-# Update module.
-# Returns a list of entries corresponding to the files which have been
-# updated or 'nofilesupdated'.
-# The entries of the returned list have the form [$file, 'U|P|M|C'].
-# Parameters:
-#   1) path with top level diretory to be updated
-#   2) possible CVS tag
-#   3) update options, ie '-dP'
-#   4) if true, then update() will return a second reference with all
-#      unknown files - those which are marked by '?' by CVS.
-sub update
-{
-    my $self                   = shift;
-    my $path                   = shift;
-    my $tag                    = shift;
-    my $options                = shift;
-    my $return_unknown_entries = shift || '';
-
-
-    my $module  = $self->module();
-
-    if ( !$module ) {
-        croak("ERROR: CvsModule::update(): no module for checkout specified");
-    }
-    if ( !-d "$path/$module" ) {
-        croak("ERROR: CvsModule::update(): can't find '$path/$module'");
-    }
-
-    # chdir to update area
-    my $saved_cwd = cwd();
-    if ( !chdir("$path/$module") ) {
-        croak("ERROR: CvsModule::update(): can't chdir() to '$path/$module'");
-    }
-
-    my ($dirs_ref, $files_ref, $unknown_ref) = $self->do_update($tag, $options);
-
-    # chdir() back
-    chdir($saved_cwd);
-    if ( $return_unknown_entries ) {
-        return ($files_ref, $unknown_ref);
-    }
-    else {
-        return defined($files_ref) ? $files_ref : 'nofilesupdated';
-    }
-}
-
-# Find all changed files in a module vs. a specfic tag
-# return a LoL: [name of file, rev_old, rev_new].
-sub changed_files
-{
-    my $self     = shift;
-    my $tag_old  = shift;
-    my $tag_new  = shift;
-
-    my $module     = $self->module();
-    my $cvs_binary = $self->cvs_binary();
-
-    my $root = $self->get_rcmd_root();
-
-    my $option_tag_old = '-r' . $tag_old;
-    my $option_tag_new = '-r' . $tag_new;
-    my $verbose = $self->verbose();
-    my ($t1, $t0);
-    if ( $verbose > 1 ) {
-        $t0 = Benchmark->new();
-        autoflush STDOUT 1;
-        print "checking for changed files in module '$module'; $option_tag_old $option_tag_new\n";
-    }
-
-    my $server_died_silently = 1;
-    my @changed_files = ();
-    open(RDIFF, "$cvs_binary -d $root rdiff -s $option_tag_old $option_tag_new $module 2>&1 |");
-    while(<RDIFF>) {
-        $self->append_to_log($_);
-        if ( /^cvs (server|rdiff): Diffing (.*)$/ ) {
-            print "." if $verbose;
-            $server_died_silently = 0;
-        }
-        if ( /\[rdiff aborted\]: connect to/ ) {
-            croak("ERROR: CvsModule::changed_files(): connection to server failed");
-        }
-        if ( /^File (.+?) / ) {
-            my $file_name = $1;
-            my ($rev_old, $rev_new);
-            if ( /changed from revision ([\d\.]+) to ([\d\.]+)/ ) {
-                $rev_old = $1;
-                $rev_new = $2;
-            }
-            elsif ( /is new; (current|$tag_new) revision ([\d\.]+)/ ) {
-                $rev_new = $2;
-                $rev_old = undef;
-            }
-            elsif ( /is removed; not included in release tag/ ||
-                    /is removed; $tag_old revision ([\d\.]+)/ ) {
-                $rev_new = undef;
-                $rev_old = undef;
-            }
-            else {
-                croak("ERROR: CvsModule::changed_files(): unexpected output from rdiff");
-            }
-
-            $file_name = $self->strip_module_from_path($file_name);
-            push(@changed_files, [$file_name, $rev_old, $rev_new]);
-        }
-    }
-    close(RDIFF);
-    print "\n" if $verbose;
-    $self->die_on_error_code('CvsModule::changed_files()');
-    $self->clear_log();
-    if ( $verbose > 1) {
-        $t1 = Benchmark->new();
-        print "rdiff time: " . timestr(timediff($t1, $t0),'nop') . "\n";
-        autoflush STDOUT 0
-    }
-    if ( $server_died_silently ) {
-        croak("ERROR: CvsModule::changed_files(): server died silently");
-    }
-    return wantarray ? @changed_files : \@changed_files;
-}
-
-#  Tag all files in module with given tag,
-#  returns number of newly tagged files and number,
-#  of warnings/errors due to already existing tags.
-sub tag
-{
-    my $self    = shift;
-    my $path    = shift;
-    my $tag     = shift;
-    my $options = shift;
-
-    my $module     = $self->module();
-    my $cvs_binary = $self->cvs_binary();
-
-    my $branch = ($options && $options =~ /-b/) ? '-b' : '';
-    my $force  = ($options && $options =~ /-F/) ? '-F' : '';
-
-    my $verbose = $self->verbose();
-    my ($t1, $t0);
-    if ( $verbose > 1) {
-        $t0 = Benchmark->new();
-        autoflush STDOUT 1;
-        print "tag module '$module' with " ;
-        print $branch ? "branch " : "";
-        print "tag '$tag'\n";
-    }
-    my $tagged_files = 0;
-    my $tag_errors   = 0;
-    my $saved_cwd = cwd();
-    if ( !chdir("$path/$module") ) {
-        croak("ERROR: CvsModule::tag(): can't chdir() to directory '$path/$module'");
-    }
-    open(TAG, "$cvs_binary tag $force $branch $tag 2>&1 |");
-    while(<TAG>) {
-        $self->append_to_log($_);
-        if ( /\[.* aborted\]: connect to/ ) {
-            croak("ERROR: CvsModule::tag(): connection to server failed");
-        }
-        if ( /^cvs (server|tag): Tagging (.*)$/ ) {
-            print "." if $verbose;
-        }
-        elsif ( /^T / ) {
-            $tagged_files++;
-        }
-        elsif ( /^W / ) {
-            # can't move tag because tag already exists and
-            # force option -F not specified
-            my $line = $_;
-            $line =~ s/^W //;
-            chomp($line);
-            carp("ERROR: CvsModule::tag():" . "$line");
-            $tag_errors++;
-        }
-    }
-    close(TAG);
-    print "\n" if $verbose;
-    $self->die_on_error_code('CvsModule::tag()');
-    $self->clear_log();
-    if ( $verbose > 1) {
-        $t1 = Benchmark->new();
-        print "tagging time: " . timestr(timediff($t1, $t0),'nop') . "\n";
-        autoflush STDOUT 0
-    }
-    chdir($saved_cwd);
-    return ($tagged_files, $tag_errors);
-}
-
-sub get_aliases_hash {
-    my $self    = shift;
-    my $cvs_binary = $self->cvs_binary();
-    my $method     = $self->cvs_method();
-    my $server     = $self->cvs_server();
-    my $repository = $self->cvs_repository();
-    my $vcsid      = $self->vcsid();
-
-    if ( !$vcsid ) {
-        croak("ERROR: CvsModule::get_aliases_hash(): VCSID not set");
-    }
-
-    my $root = ":$method:$vcsid\@$server:$repository";
-    my $commando = "$cvs_binary -d $root checkout -c";
-    if(!open(CHECKOUT, "$commando 2>&1 |")) {
-        croak("ERROR: get_aliases_hash(): Cannot run commando '$commando'");
-    };
-    my %aliases_hash = ();
-    my $last_alias = '';
-    my $string = '';
-    while(<CHECKOUT>) {
-        $self->append_to_log($_);
-        if ( /\[.* aborted\]: connect to/ ) {
-            croak("ERROR: CvsModule::get_aliases_hash(): connection to server failed");
-        }
-        if (/^(\S+)\s+(.+)$/o) {
-            $last_alias = $1;
-            $string = $2;
-        } elsif (/^(\s+)(.+)$/o && $last_alias) {
-            $string = $aliases_hash{$last_alias} . " $2";
-        } else {
-            $last_alias = '';
-            next;
-        };
-        $aliases_hash{$last_alias} = $string;
-    };
-    close CHECKOUT;
-    $self->die_on_error_code('CvsModule::get_aliases_hash()');
-    $self->clear_log();
-    return %aliases_hash;
-};
-
-#### private helper methods #####
-
-sub do_checkout
-{
-    my $self    = shift;
-    my $server  = shift;
-    my $tag     = shift || '';
-    my $options = shift || '';
-
-    my $vcsid = $self->vcsid();
-
-    if ( !$vcsid ) {
-        croak("ERROR: CvsModule::do_checkout: VCSID not set");
-    }
-
-    my $module     = $self->module();
-    my $cvs_binary = $self->cvs_binary();
-    my $method     = $self->cvs_method();
-    my $repository = $self->cvs_repository();
-    my $root = ":$method:$vcsid\@$server:$repository";
-
-    $tag = '-r' . $tag if $tag ne '';
-
-    # do the checkout
-    my @updated_dirs;
-    my @updated_files;
-    my $verbose = $self->verbose();
-    my ($t1, $t0);
-    if ( $verbose > 1) {
-        $t0 = Benchmark->new();
-        autoflush STDOUT 1;
-        print "checkout module '$module' from $server'\n";
-    }
-    open(CHECKOUT, "$cvs_binary -d $root checkout $tag $options $module 2>&1 |");
-    while(<CHECKOUT>) {
-        $self->append_to_log($_);
-        if ( /\[.* aborted\]: connect to/ ) {
-            croak("ERROR: CvsModule::do_checkout(): connection to server failed");
-        }
-        if ( /^(cvs|repository) (server|checkout): Updating (.*)$/ ) {
-            print "." if $verbose;
-            push(@updated_dirs, $3);
-        }
-        if ( /^([U|M|P|C]) (.*)$/ ) {
-            push(@updated_files, [$2, $1]);
-        }
-    }
-    close(CHECKOUT);
-    print "\n" if $verbose;
-    $self->die_on_error_code('CvsModule::do_checkout()');
-    $self->clear_log();
-    if ( $verbose > 1 ) {
-        $t1 = Benchmark->new();
-        print "checkout time: " . timestr(timediff($t1, $t0),'nop') . "\n";
-        autoflush STDOUT 0;
-    }
-    return (\@updated_dirs, \@updated_files);
-}
-
-sub do_update
-{
-    my $self    = shift;
-    my $tag     = shift;
-    my $options = shift;
-
-    my $module     = $self->module();
-    my $cvs_binary = $self->cvs_binary();
-
-    $options = $options ? $options : '';
-    $tag     = '-r' . $tag if $tag ne '';
-
-    # sever for update is never a mirror, always the 'real' server
-    my $server = $self->cvs_server();
-
-    # do the update
-    my @updated_dirs;
-    my @updated_files;
-    my @unknown_entries;
-    my $verbose = $self->verbose();
-    my ($t1, $t0);
-    if ( $verbose > 1) {
-        $t0 = Benchmark->new();
-        autoflush STDOUT 1;
-        print "update module '$module' from '$server'\n";
-    }
-    open(UPDATE, "$cvs_binary update $tag $options 2>&1 |");
-    while(<UPDATE>) {
-        $self->append_to_log($_);
-        if ( /\[.* aborted\]: connect to/ ) {
-            croak("ERROR: CvsModule::do_update(): connection to server failed");
-        }
-        if ( /^cvs (server|update): Updating (.*)$/ ) {
-            print "." if $verbose;
-            push(@updated_dirs, $2);
-        }
-        if ( /^([U|M|P|C]) (.*)$/ ) {
-            push(@updated_files, [$2, $1]);
-        }
-        if ( /^\? (.*)$/ ) {
-            push(@unknown_entries, $1);
-        }
-    }
-    close(UPDATE);
-    print "\n" if $verbose;
-    $self->die_on_error_code('CvsModule::do_update()');
-    $self->clear_log();
-    if ( $verbose > 1) {
-        $t1 = Benchmark->new();
-        print "update time: " . timestr(timediff($t1, $t0),'nop') . "\n";
-        autoflush STDOUT 0
-    }
-    return (\@updated_dirs, \@updated_files, \@unknown_entries);
-}
-
-sub get_root
-{
-    # Try two methods to determine CVS root.
-    my $self = shift;
-    my $module = $self->module();
-
-    my $cvs_root;
-    if ( $module && -r "$module/CVS/Root" ) {
-        # Test if there is a checked out module.
-        open(ROOT, "<$module/CVS/Root");
-        my @root = <ROOT>;
-        close(ROOT);
-        $cvs_root = $root[0];
-    }
-    else {
-        # alternatively check CVSROOT environment variable
-        $cvs_root = $ENV{CVSROOT};
-    }
-
-    if ( $cvs_root ) {
-        my ($dummy, $method, $vcsid_server, $repository) = split(/:/, $cvs_root);
-        # Remove port number from repository path;
-        $repository =~ s/^\d*//;
-        my ($vcsid, $server)  = split('@', $vcsid_server);
-        if ( !($method && $vcsid && $server && $repository) ) {
-            croak("ERROR: CvsModule::get_root(): can't determine CVS Server");
-        }
-        # sanity check
-        if ( $vcsid ne $self->vcsid() ) {
-            croak("ERROR: CvsModule::get_root(): environment VCSID and CVS server root differ");
-        }
-        $self->cvs_method($method);
-        $self->cvs_server($server);
-        $self->cvs_repository($repository);
-        return;
-    }
-    return;
-}
-
-sub patch_root
-{
-    # Patch the server part of the root from old to new.
-    shift; # ignore invocant
-    my $old_server = shift;
-    my $new_server = shift;
-    my $old_rep    = shift;
-    my $new_rep    = shift;
-    my $dirs_ref   = shift;
-
-    foreach (@{$dirs_ref}) {
-        # pruned directories may not exist
-        if ( -d $_ ) {
-            my $root = "$_/CVS/Root";
-            open(ROOT, "<$root") or croak("ERROR: CvsModule::patch_root(): can't open file '$root'");
-            my $line = <ROOT>;
-            close(ROOT);
-
-            # patch root
-            $line =~ s/$old_server/$new_server/o;  # note: evaluate reg exp. only once
-            open(ROOT, ">$root") or croak("ERROR: CvsModule::patch_root(): can't write '$root'");
-            print ROOT $line;
-            close(ROOT);
-            # repository will usually not change
-            if ( $old_rep ne $new_rep ) {
-                my $rep = "$_/CVS/Repository";
-                open(REPOSITORY, "<$rep") or croak("ERROR: CvsModule::patch_root(): can't open '$rep'");
-                my $line = <REPOSITORY>;
-                close(REPOSITORY);
-
-                # patch rep
-                $line =~ s/$old_rep/$new_rep/o;  # note: evaluate reg exp. only once
-                open(REPOSITORY, ">$rep") or croak("ERROR: CvsModule::patch_root(): can't write '$rep'");
-                print REPOSITORY $line;
-                close(REPOSITORY);
-            }
-        }
-    }
-}
-
-# get the root for r-type commands
-sub get_rcmd_root
-{
-    my $self = shift;
-
-    my $vcsid = $self->vcsid();
-
-    if ( !$vcsid ) {
-        croak("ERROR: CvsModule::get_rcmd_root(): VCSID not set");
-    }
-
-    my $method     = $self->cvs_method();
-    my $repository = $self->cvs_repository();
-    my $server     = $self->cvs_server();
-    my $remote     = $self->cvs_remote();
-    my $root       = ":$method:$vcsid\@$server:$repository";
-
-
-    # FIXME OOo's CVS server is pretty much broken. It's impossible
-    # to use the r-type CVS commands (rtag, rdiff) with the regular cvs root.
-    # We have to patch the cvs root. This horrendous hack should be removed as
-    # soon as the server is fixed
-    if ( $server =~ /$remote/o ) {
-        $repository = '/shared/data/helm/cvs/repository';
-        $root = ":$method:$vcsid\@$server:$repository";
-        if ( !is_valid_login(":$method:$vcsid\@$server:", $repository ) ) {
-            print STDERR "\nThe cvs rdiff command is broken for the OOo CVS server.\n";
-            print STDERR "To fix this problem you have to issue the following cvs login command:\n\n";
-            print STDERR "    cvs -d $root login\n\n";
-            print STDERR "The password is your usual OOo password.\n\n";
-            exit(1);
-        }
-    }
-
-    return $root;
-}
-
-# Check if a valid login command has been
-# issued for the root which is passed
-# as argument.
-# Needed for r-type command hack. sigh.
-sub is_valid_login
-{
-    my $url = shift;
-    my $repo = shift;
-
-    my $home = $ENV{HOME};
-    open(CVSPASSWD, "<$home/.cvspass") or return 0;
-    my @lines = <CVSPASSWD>;
-    close(CVSPASSWD);
-
-    my $is_valid = 0;
-    foreach (@lines) {
-        if ( $_ =~ /${url}\d*${repo}/o ) {
-            $is_valid = 1;
-            last;
-        }
-    }
-
-    return $is_valid;
-}
-
-# Returns a hash_ref with alias for all modules
-sub get_module_definitions
-{
-    my $self = shift;
-
-    my $cvs_binary = $self->cvs_binary();
-    my $root       = $self->get_rcmd_root();
-
-    my @entries;
-    open(MODULESLIST, "$cvs_binary -d $root checkout -c 2>&1 |");
-    while(<MODULESLIST>) {
-        chomp();
-        # TODO more error checking
-        if ( /\[checkout aborted\]: connect to/ ) {
-            croak("ERROR: CvsModule::get_module_definitions(): connection to server failed");
-        }
-        # Module list format:
-        # A entry starts on the first column, otherwise
-        # we have a continuation line
-        if ( /^\S/ ) {
-            push(@entries, $_);
-        }
-        else {
-            $entries[-1] .= $_;
-        }
-    }
-    close(MODULESLIST);
-
-    my %mod_defs;
-    foreach ( @entries ) {
-        my ($name, $definition, $extra) = split(' ', $_);
-        if ( $extra || $definition =~ /&/ ) {
-            # if the entries splits in more than
-            # two entries or the definition
-            # contains an ampersand than this can't
-            # be a regular module definition
-            next;
-        }
-        $mod_defs{$name} = $definition;
-    }
-    return \%mod_defs;
-}
-
-# Strip elements from the front of a path to yield
-# a filename relative to module. If this fails retrieve
-# the module list from the server and determine the number
-# of path elements to be stripped from the the module
-# definition.
-sub strip_module_from_path
-{
-    my $self = shift;
-    my $file = shift;
-
-    my $module = $self->module;
-
-    # Test if the file name is of the form
-    # project/module/pathelem/..../filename <= OOo server
-    # module/pathelem/.../filename          <= local server
-    # where project and module can be identical
-    # If the test fails try as last resort to
-    # retrieve the module list from the server and
-    # determine the number of path elements to be stripped
-    # from the the module definition.
-    #
-    my @elems = split(/\//, $file);
-
-    my $elem = shift @elems;
-    if ( $elem eq $module ) {
-        $elem = shift @elems;
-        if ( $elem ne $module ) {
-            unshift(@elems, $elem);
-        }
-        return join('/', @elems);
-    }
-    else {
-        $elem = shift @elems;
-        if ( $elem eq $module ) {
-            return join('/', @elems);
-        }
-        else {
-            # try the module definitions from the module list
-            if ( !defined($self->{DEFS_CACHE}) ) {
-                $self->{DEFS_CACHE} = $self->get_module_definitions();
-            }
-            if ( exists $self->{DEFS_CACHE}->{$module} ) {
-                my $definition = $self->{DEFS_CACHE}->{$module};
-                $file =~ /^$definition\/(.*)$/;
-                return $1;
-            }
-            else {
-                croak("ERROR: CvsModule::strip_module_from_path(): internal error");
-            }
-        }
-    }
-}
-
-#
-# Procedure does the same as "cvs view",
-# extracted to the module in order to provide
-# consistency for future implementations
-#
-sub view {
-    my $self    = shift;
-    my $path    = shift;
-    my $saved_cwd = cwd();
-    if ( !chdir($path) ) {
-        croak("ERROR: CvsModule::view(): can't chdir() to '$path'");
-    }
-    cwd();
-    my $module     = $self->module();
-    my $cvs_binary = $self->cvs_binary();
-
-    my $verbose = $self->verbose();
-    my ($info, $seen,  @field);
-    my $line = "$cvs_binary status -R";
-    # provide info in hash
-    my @view_info = ();
-    open(REPOSITORY, 'CVS/Repository');
-    my $repository = <REPOSITORY>;
-    close REPOSITORY;
-    $repository =~ s/[\s\r\n]//g;
-    $repository =~ s/$module$//g;
-
-    open (CVSVIEW , "$line 2>&1 |") or croak("ERROR: CvsModule::view(): can't run command '$line'");
-
-    $seen = 0;
-
-    # check error
-    if ( $? >> 8  ) {
-        close(CVSVIEW);
-        croak("ERROR: CvsModule::view(): view failed!\n");
-    }
-
-    while(<CVSVIEW>) {
-        $line = $_;
-        chomp $line;
-
-        if ( $line =~ /^\?/ ) {
-            print ("$line\n");
-            next;
-        }
-
-        if ( $line =~ /Needs\sCheckout/o ) {
-            $info = "needs checkout";
-            next;
-        }
-
-        if ( $line =~ /Needs\sPatch/o ) {
-            $info = "needs patch";
-            next;
-        }
-
-        if ( $line =~ /Needs\sMerge/o ) {
-            $info = "needs merge";
-            next;
-        }
-
-        if ( $line =~ /Locally\sAdded/o ) {
-            @field = split /\s+/, $line;
-            my $info_string = "$field[1]: locally added\n";
-            print $info_string;
-            push (@view_info, $info_string);
-            next;
-        }
-
-        if ( $line =~ /Locally\sModified/o ) {
-            $info = "locally modified";
-            next;
-        }
-
-        if ( $line =~ /Locally\sRemoved/o ) {
-            $info = "locally removed";
-            next;
-        }
-
-        if ($line =~ /conflicts/o ) {
-            $info = "conflicts on merge";
-            next;
-        }
-
-        if ($info && $line =~ /Repository/o ) {
-            @field = split /\s+/, $line;
-            my $info_line = "$field[4]: $info\n";
-            print $info_line;
-            $info_line =~ s/,\S+:/:/;
-            $info_line =~ s/^$repository//;
-            push (@view_info, $info_line);
-            $info = 0;
-            next;
-        }
-
-        if ( $line =~/==============/ ) {
-            $info = 0;
-            $seen = 1;
-        }
-    }
-    close (CVSVIEW);
-    chdir($saved_cwd);
-    cwd();
-
-    if ( !$seen ) {
-        print STDERR "potential \"cvs view\" failure, please use \"cvs status\"\n";
-        print STDERR "to examine error condition\n";
-    }
-    return \@view_info;
-}
-
-# Simple minded ring buffer for keeping the last lines of the CVS output
-{
-    my $nlog_size  = 5;
-    my $nindex     = 0;
-    sub append_to_log
-    {
-        my $self = shift;
-        my $line = shift;
-
-        $nindex++;
-        if ( $nindex >= $nlog_size ) {
-            $nindex = 0;
-        }
-        $self->{LOG_BUFFER}->[$nindex] = $line;
-    }
-
-    sub get_log
-    {
-        my $self = shift;
-
-        my $first = $nindex+1;
-        if ( $first >= $nlog_size ) {
-            $first = $first - $nlog_size;
-        }
-
-        my $log = "";
-        for (my $i = 0; $i < $nlog_size; $i++) {
-            my $n = $first + $i;
-            if ( $n >= $nlog_size ) {
-                $n = $n - $nlog_size;
-            }
-            if ( $self->{LOG_BUFFER}->[$n] ) {
-                $log .= $self->{LOG_BUFFER}->[$n];
-            }
-        }
-        return $log;
-    }
-
-    sub clear_log
-    {
-        my $self = shift;
-
-        $self->{LOG_BUFFER} = ();
-    }
-}
-
-sub die_on_error_code
-{
-    my $self = shift;
-
-    my $method = shift;
-    my $errcode = $? >> 8;
-
-    if ( $errcode ) {
-        my $error_message = "ERROR: $method: CVS client returned error code '$errcode'!\n";
-        $error_message .= "The last 5 CVS messages leading up to the problem were:\n";
-        $error_message .= $self->get_log();
-
-        croak($error_message);
-    }
-}
-
-
-####
-
-1; # needed by "use" or "require"
diff --git a/solenv/bin/modules/CwsCvsOps.pm b/solenv/bin/modules/CwsCvsOps.pm
deleted file mode 100644
index 8dfbfb246373..000000000000
--- a/solenv/bin/modules/CwsCvsOps.pm
+++ /dev/null
@@ -1,1226 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: CwsCvsOps.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# CwsCvsOps.pm - CVS operations on CWSs implemented in terms of PCVSLib
-#
-
-package CwsCvsOps;
-use strict;
-
-use Carp;
-use File::Find;
-use File::Path;
-use Cwd;
-use IO::File;
-use PCVSLib;
-use CwsConfig;
-
-##### ctor ####
-
-sub new
-{
-    my $invocant      = shift;
-    my $config        = shift;
-    my $server_type   = shift; # 'remote' (OOo), 'local', 'directory'
-    my $module_or_dir = shift;
-    my $log_handle    = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    # private
-    $self->{mclient_}       = undef; # Mirror client if available
-    $self->{client_}        = undef;
-    $self->{is_old_client_} = undef;
-    $self->{server_type_}   = undef;
-    $self->{module_or_dir_} = undef;
-    $self->{config_}        = undef;
-    $self->{event_handler_} = PCVSLib::EventHandler->new();
-    $self->{log_handle_}    = undef;
-    bless ($self, $class);
-
-    if ( defined($server_type) ) {
-        $self->{server_type_} = $server_type
-    }
-    else {
-        croak("CwsCvsOps::new(): internal error: server type not set");
-    }
-    if ( defined($config) ) {
-        $self->{config_} = $config;
-    }
-    else {
-        croak("CwsCvsOps::new(): internal error: config not set");
-    }
-    if ( defined($module_or_dir) ) {
-        $self->{module_or_dir_} = $module_or_dir;
-    }
-    if ( defined($log_handle) ) {
-        $self->{log_handle_} = $log_handle;
-    }
-    return $self;
-}
-
-# Find all changed files in a module vs. a specfic tag
-# return a LoL: [name of file, rev_old, rev_new].
-# It's also possible to specify a single file
-sub get_changed_files
-{
-    my $self           = shift;
-    my $module_or_file = shift;
-    my $rev1           = shift;
-    my $rev2           = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-
-    my $is_file = 0;
-    if ( $module_or_file =~ /\// ) {
-        $is_file = 1;
-    }
-
-    my $listener = CwsCvsRdiffListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $rdiff_command = PCVSLib::RDiffCommand->new($event_handler);
-    $rdiff_command->options(['-s']);
-    $rdiff_command->rev1($rev1);
-    $rdiff_command->rev2($rev2);
-    $rdiff_command->file_list([$module_or_file]);
-    STDOUT->autoflush(1);
-    $self->{client_}->execute_command($rdiff_command);
-    STDOUT->autoflush(0);
-    print "\n";
-
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        if ( $is_file ) {
-            croak("CwsCvsOps::get_changed_files(): file '$module_or_file': rdiff -r$rev1 -r$rev2 operation failed");
-        }
-        else {
-            croak("CwsCvsOps::get_changed_files(): module '$module_or_file': rdiff -r$rev1 -r$rev2 operation failed");
-        }
-
-    }
-    my @changed_files;
-    my $diff_ref = $listener->get_diff();
-    my $module_prefix = $listener->get_module_prefix();
-    if ( !$is_file && !$module_prefix ) {
-        croak("CwsCvsOps::get_changed_files(): internal error, undefined module prefix");
-    }
-    foreach (@{$diff_ref}) {
-        if ( /^File (.+?) / ) {
-            my $file_name = $1;
-            my ($rev_old, $rev_new);
-            if ( /changed from revision ([\d\.]+) to ([\d\.]+)/ ) {
-                $rev_old = $1;
-                $rev_new = $2;
-            }
-            elsif ( /is new; current revision ([\d\.]+)/ ) {
-                $rev_new = $1;
-                $rev_old = undef;
-            }
-            # since cvs-1.12
-            elsif ( /is new; \w+ revision ([\d\.]+)/ ) {
-                $rev_new = $1;
-                $rev_old = undef;
-            }
-            elsif ( /is removed; not included in release tag/ ) {
-                $rev_new = undef;
-                $rev_old = undef;
-            }
-            # since cvs-1.12
-            elsif ( /is removed; \w+ revision ([\d\.]+)/ ) {
-                $rev_new = undef;
-                $rev_old = undef;
-            }
-            else {
-                croak("ERROR: CwsCvsOps::get_changed_files(): unexpected output from rdiff command");
-            }
-            if ( !$is_file ) {
-                $file_name =~ s/^$module_prefix\///;
-            }
-            push(@changed_files, [$file_name, $rev_old, $rev_new]);
-        }
-    }
-    $event_handler->remove_listener($listener);
-
-    return wantarray ? @changed_files : \@changed_files;
-}
-
-sub checkout
-{
-    my $self         = shift;
-    my $dir          = shift;
-    my $module       = shift;
-    my $filelist_ref = shift;
-    my $tag          = shift;
-
-    my $from_mirror = 0;
-
-    # set working directory to checkout directory
-    my $savedir = cwd();
-    if ( !chdir($dir) ) {
-        croak("ERROR: CwsCvsOps::checkout(): can't chdir() into directory '$dir'");
-    }
-    if ( !defined($module) ) {
-        croak("ERROR: CwsCvsOps::checkout(): module not set");
-    }
-    if ( defined($filelist_ref) && !@{$filelist_ref} ) {
-        croak("ERROR: CwsCvsOps::checkout(): empty file list");
-    }
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    if ( $self->{server_type_} eq 'remote' && $self->{config_}->cvs_mirror_root() ) {
-        $from_mirror = 1;
-        if ( !defined($self->{mclient_}) ) {
-            $self->{mclient_} = $self->create_client_('mclient');
-        }
-    }
-    if ( $from_mirror ) {
-        my $count = $self->do_checkout($self->{mclient_}, $module, $filelist_ref, $tag);
-        if ( !$count ) {
-            # If no file is returned from the mirror it might be due to
-            # the fact that the tag has not yet propagated to the mirror.
-            # Retry from remote server
-
-            # Clean up first
-            if ( !rmtree($module) ) {
-                # now this shouldn't really ever happen ...
-                croak("ERROR: CwsCvsOps::checkout(): can't remove directory '$module': $!");
-            }
-            $count = $self->do_checkout($self->{client_}, $module, $filelist_ref, $tag);
-        }
-        else {
-            my $mirror = $self->{config_}->cvs_mirror_root();
-            $mirror =~ /^.*\@(.*):/;
-            $mirror = $1;
-            my $server = $self->{config_}->cvs_server_root();
-            $server =~ /^.*\@(.*):/;
-            $server = $1;
-            $self->patch_admin_files($module, $mirror, $server);
-            my $codir = cwd();
-            if ( !chdir($module) ) {
-                croak("ERROR: CwsCvsOps::checkout(): can't chdir() into directory '$savedir/$module'");
-            }
-            $self->do_update($self->{client_}, '.', $tag);
-            if ( !chdir($codir) ) {
-                croak("ERROR: CwsCvsOps::checkout(): can't chdir() into directory '$savedir'");
-            }
-
-        }
-    }
-    else {
-        my $count = $self->do_checkout($self->{client_}, $module, $filelist_ref, $tag);
-    }
-    # reset working directory
-    if ( !chdir($savedir) ) {
-        croak("ERROR: CwsCvsOps::checkout(): can't chdir() into directory '$savedir'");
-    }
-}
-
-sub remove_files
-{
-    my $self         = shift;
-    my $filelist_ref = shift;
-
-    if ( ! @{$filelist_ref} ) {
-        croak("CwsCvsOps::remove_files(): empty file list");
-    }
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    my $listener = CwsCvsSimpleListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $remove_command = PCVSLib::RemoveCommand->new($event_handler);
-    $remove_command->file_list($filelist_ref);
-    $self->{client_}->execute_command($remove_command);
-
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $file_str = join(",", @{$filelist_ref});
-        croak("CwsCvsOps::remove_files(): removing file(s) '$file_str' failed");
-    }
-    $event_handler->remove_listener($listener);
-}
-
-sub stati
-{
-    my $self         = shift;
-    my $filelist_ref = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    my $listener = CwsCvsStatusListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $status_command = PCVSLib::StatusCommand->new($event_handler);
-    $status_command->file_list($filelist_ref);
-    $self->{client_}->execute_command($status_command);
-
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $file_str = join(",", @{$filelist_ref});
-        croak("CwsCvsOps::stati(): fetching status for file(s) '$file_str' failed");
-    }
-    $event_handler->remove_listener($listener);
-    return $listener->get_stati();
-}
-
-sub tag_files
-{
-    my $self         = shift;
-    my $filelist_ref = shift;
-    my $tag          = shift;
-    my $is_branch    = shift;
-    my $revision     = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    my $listener = CwsCvsTagListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $tag_command = PCVSLib::TagCommand->new($event_handler);
-    $tag_command->tag($tag);
-    my @options;
-    push(@options, '-F');
-    if ( $is_branch ) {
-        if ( !$self->{is_old_client_} ) {
-            push(@options, '-B');
-        }
-        push(@options, '-b');
-    }
-    if ( defined($revision) ) {
-        push(@options, "-r$revision");
-    }
-    $tag_command->options(\@options);
-    $tag_command->file_list($filelist_ref);
-    STDOUT->autoflush(1);
-    $self->{client_}->execute_command($tag_command);
-    STDOUT->autoflush(0);
-    print "\n";
-
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $file_str = join(",", @{$filelist_ref});
-        croak("CwsCvsOps::tag_files(): tag file(s) '$file_str' with tag '$tag' failed");
-    }
-    $event_handler->remove_listener($listener);
-    return $listener->get_tagged_files();
-}
-
-sub commit_files
-{
-    my $self         = shift;
-    my $filelist_ref = shift;
-    my $comment_ref  = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    my $listener = CwsCvsSimpleListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $commit_command = PCVSLib::CommitCommand->new($event_handler);
-    $commit_command->comment($comment_ref);
-    $commit_command->file_list($filelist_ref);
-    STDOUT->autoflush(1);
-    $self->{client_}->execute_command($commit_command);
-    STDOUT->autoflush(0);
-
-    # The nice thing about commits is they either succeed or fail completely.
-    # We can't check counts here, because a 'null' commit does not generate
-    # a response, but it's no error either.
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $file_str = join(",", @{$filelist_ref});
-        croak("CwsCvsOps::commit_files(): commit file(s) '$file_str' failed");
-    }
-    $event_handler->remove_listener($listener);
-    return;
-}
-
-sub get_collected_logs
-{
-    my $self         = shift;
-    my $filelist_ref = shift;
-    my $branch       = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    my $listener = CwsCvsLogListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $log_command = PCVSLib::LogCommand->new($event_handler);
-    $log_command->file_list($filelist_ref);
-    my @options;
-    $log_command->options(['-N',"-r$branch"]);
-    $self->{client_}->execute_command($log_command);
-
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $file_str = join(",", @{$filelist_ref});
-        croak("CwsCvsOps::logs(): fetching logs for file(s) '$file_str' failed");
-    }
-    $event_handler->remove_listener($listener);
-    return $listener->get_collected_logs();
-}
-
-sub do_checkout
-{
-    my $self         = shift;
-    my $client       = shift;
-    my $module       = shift;
-    my $filelist_ref = shift;
-    my $tag          = shift;
-
-    my $listener = CwsCvsUpdateListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $checkout_command = PCVSLib::CheckoutCommand->new($event_handler);
-    $checkout_command->tag($tag);
-    my @files;
-    if ( defined($filelist_ref) ) {
-        foreach (@{$filelist_ref}) {
-            push(@files, "$module/$_");
-        }
-    }
-    else {
-        @files = ($module);
-    }
-    $checkout_command->file_list([@files]);
-    STDOUT->autoflush(1);
-    $client->execute_command($checkout_command);
-    STDOUT->autoflush(0);
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $root = $client->connection()->root();
-        croak("CwsCvsOps::do_checkout(): checkout (module '$module, tag $tag) from CVS '$root' failed");
-    }
-    my $count = $listener->get_count();
-    if ( $count ) {
-        print "\n";
-    }
-    $event_handler->remove_listener($listener);
-    return $count;
-}
-
-sub do_update
-{
-    my $self         = shift;
-    my $client       = shift;
-    my $module       = shift;
-    my $tag          = shift;
-
-    my $listener = CwsCvsUpdateListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $update_command = PCVSLib::UpdateCommand->new($event_handler);
-    $update_command->tag($tag);
-    $update_command->file_list([$module]);
-    STDOUT->autoflush(1);
-    $client->execute_command($update_command);
-    STDOUT->autoflush(0);
-    print "\n";
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $root = $client->connection()->root();
-        croak("CwsCvsOps::do_update(): update (module '$module, tag $tag) from CVS '$root' failed");
-    }
-    $event_handler->remove_listener($listener);
-}
-
-sub merge_files
-{
-    my $self         = shift;
-    my $filelist_ref = shift;
-    my $merge1       = shift;
-    my $merge2       = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-    my $listener = CwsCvsMergeListener->new();
-    my $event_handler = $self->{event_handler_};
-    $event_handler->add_listener($listener);
-    my $merge_command = PCVSLib::UpdateCommand->new($event_handler);
-    $merge_command->merge1($merge1);
-    $merge_command->merge2($merge2);
-    $merge_command->options(['-kk']);
-    $merge_command->file_list($filelist_ref);
-    STDOUT->autoflush(1);
-    $self->{client_}->execute_command($merge_command);
-    STDOUT->autoflush(0);
-    print "\n";
-    if ( !$listener->is_success() ) {
-        $listener->print_log();
-        my $file_str = join(",", @{$filelist_ref});
-        croak("CwsCvsOps::merge_files(): merge for file(s) '$file_str' failed");
-    }
-    $event_handler->remove_listener($listener);
-    # sanity check
-    my $n_files = @{$filelist_ref};
-    if ( $listener->get_count() != $n_files ) {
-        croak("CwsCvsOps::merge_files(): INTERNAL ERROR: merge count differing");
-    }
-
-    return ($listener->get_conflicts(), $listener->get_already_merged());
-}
-
-sub get_relative_path
-{
-    my $self      = shift;
-    my $directory = shift;
-
-    if ( !defined($self->{client_}) ) {
-        $self->{client_} = $self->create_client_('client');
-    }
-
-    if ( $self->{server_type_} ne 'directory' ) {
-        croak("CwsCvsOps::merge_files(): INTERNAL ERROR: method can only be used with server_type 'directory'");
-    }
-
-    my $dir = PCVSLib::Directory->new($directory);
-
-    my $root = $dir->root()->root_dir();
-    my $repository = $dir->repository();
-
-    $repository =~ s/$root\///;
-
-    return $repository;
-}
-
-
-sub patch_admin_files
-{
-    my $self   = shift;
-    my $module = shift;
-    my $old    = shift;
-    my $new    = shift;
-
-    my @cvs_dirs;
-    find sub { push @cvs_dirs, $File::Find::name if -d _ && /CVS$/}, $module;
-    foreach my $cvs_dir (@cvs_dirs) {
-        my $root_file = "$cvs_dir/Root";
-        next if (!-f $root_file);
-        my $ih = IO::File->new( "<$cvs_dir/Root");
-        if ( !defined($ih) ) {
-            croak("ERROR: CwsCvsOps::patch_admin_files: can't read file '$root_file'");
-        }
-        my $line = <$ih>;
-        $ih->close();
-
-        # patch root
-        if ( !($line =~ s/$old/$new/) ) {
-            croak ("ERROR: CwsCvsOps::patch_admin_files(): file '$root_file' has wrong format");
-        }
-        my $oh = IO::File->new( ">$cvs_dir/Root");
-        if ( !defined($oh)  ) {
-            croak("ERROR: CwsCvsOps::patch_admin_files: can't write file '$root_file'");
-        }
-        $oh->print($line);
-        $oh->close();
-    }
-}
-
-sub shutdown
-{
-    my $self = shift;
-
-    if ( defined($self->{mclient_}) ) {
-        $self->{mclient_}->connection()->close();
-    }
-    if ( defined($self->{client_}) ) {
-        $self->{client_}->connection()->close();
-    }
-}
-
-# private methods
-
-sub create_client_
-{
-    my $self        = shift;
-    my $client_type = shift;
-
-    my $config = $self->{config_};
-    my $server_type = $self->{server_type_};
-    my $server;
-    # This is of course highly specific to the OOo setup.
-    if ( $server_type eq 'remote' && $client_type eq 'mclient') {
-        $server = $config->cvs_mirror_root();
-    }
-    elsif ( $server_type eq 'remote' && $client_type eq 'client') {
-        $server = $config->cvs_server_root();
-    }
-    elsif ( $server_type eq 'local' ) {
-        $server = $config->cvs_local_root();
-    }
-    elsif ( $server_type eq 'directory' ) {
-        my $root_file = "CVS/Root";
-        my $ih = IO::File->new("<$root_file");
-        if ( !defined($ih) ) {
-            croak("ERROR: CwsCvsOps::create_client: can't read file '$root_file'");
-        }
-        my $line = <$ih>;
-        $ih->close();
-        chomp($line);
-        $server = $line;
-    }
-    else {
-        croak("CwsCvsOps::create_client_(): internal error: invalid server/client combination");
-    }
-
-    # Sometimes several developers work one physical CWS representation. This is difficult
-    # with CVS because the "user id" is part of the Root and is saved in the administration
-    # files. If the root comes from the config file it can happen that it is just
-    # a placeholder for a number of developers. We override this part of the root.
-    my $vcsid = $config->vcsid();
-    $server =~ s/^:pserver:\w+([\@\%])/:pserver:$vcsid$1/; # allow % for cvs proxy configurations
-
-    my $root = PCVSLib::Root->new($server);
-    my $credentials = PCVSLib::Credentials->new();
-    my $scrambled_password = $credentials->get_password($root);
-
-    my $connection = PCVSLib::Connection->new($root, $scrambled_password);
-
-    my $io_handle = $connection->open();
-
-    if ( defined($self->{log_handle_}) ) {
-        $connection->io_handle(PCVSLib::LogHandle->new($io_handle, $self->{log_handle_}));
-    }
-
-    my $client = PCVSLib::Client->new($connection);
-    # Find out the abilities of the server, this is important for moving tag branches
-    # Since old server may not understand a 'version' request, we ask vor the ValidRequests
-    # list. If 'version' is a valid request we know that this server is old and can't cope
-    # with the -B switch for maoving branch tags
-    if ( $server_type eq 'directory') {
-        my $listener = CwsValidRequestsListener->new();
-        my $event_handler = $self->{event_handler_};
-        $event_handler->add_listener($listener);
-        my $valid_requests_command = PCVSLib::ValidRequestsCommand->new($event_handler);
-        $client->execute_command($valid_requests_command);
-
-        if ( !$listener->is_success() ) {
-            $listener->print_log();
-            croak("CwsCvsOps::create_client_(): fetching VaildRequestsLists for server '$server' failed");
-        }
-        $event_handler->remove_listener($listener);
-        $self->{is_old_client_} = 1;
-        foreach (@{$listener->get_valid_requests()}) {
-            if ( /version/ ) {
-                $self->{is_old_client_} = 0;
-            }
-        }
-    }
-
-    return $client;
-}
-
-sub DESTROY
-{
-    my $self = shift;
-    $self->shutdown();
-}
-
-package CwsCvsListener;
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{error_buffer_}  = ();
-    $self->{is_success_}    = 0;
-    bless ($self, $class);
-    return $self;
-}
-
-sub is_success
-{
-    my $self = shift;
-    return $self->{is_success_};
-}
-
-# Simple minded ring buffer for keeping the last lines of error messages
-{
-
-    my $nlog_size  = 5;
-    my $nindex     = 0;
-    sub append_to_log
-    {
-        my $self = shift;
-        my $line = shift;
-
-        $nindex++;
-        if ( $nindex >= $nlog_size ) {
-            $nindex = 0;
-        }
-        $self->{error_buffer}->[$nindex] = $line;
-    }
-
-    sub print_log
-    {
-        my $self = shift;
-
-        my $first = $nindex+1;
-        if ( $first >= $nlog_size ) {
-            $first = $first - $nlog_size;
-        }
-        print STDERR "===== CVS Error: last error messages from CVS server: begin =====\n";
-        my $log = "";
-        for (my $i = 0; $i < $nlog_size; $i++) {
-            my $n = $first + $i;
-            if ( $n >= $nlog_size ) {
-                $n = $n - $nlog_size;
-            }
-            if ( $self->{error_buffer}->[$n] ) {
-                print STDERR $self->{error_buffer}->[$n] ."\n";
-            }
-        }
-        print STDERR "===== CVS Error: last error messages from CVS server: end =====\n";
-    }
-
-    sub clear_log
-    {
-        my $self = shift;
-
-        $self->{error_buffer} = ();
-    }
-}
-
-package CwsCvsSimpleListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        $self->append_to_log($message);
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsValidRequestsListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{valid_requests_} = undef;
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_valid_requests {
-    my $self = shift;
-    return $self->{valid_requests_};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ValidRequestsEvent') ) {
-        my $valid_requests_ref = $event->get_valid_requests();
-
-        $self->append_to_log(join(" ", @{$valid_requests_ref}));
-        $self->{valid_requests_} = $valid_requests_ref;
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsCvsRdiffListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{diff} = ();
-    $self->{module_prefix} = undef;
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_diff
-{
-    my $self = shift;
-    return $self->{diff};
-}
-
-sub get_module_prefix
-{
-    my $self = shift;
-    return $self->{module_prefix};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        $self->append_to_log($message);
-        if ( !defined $self->{module_prefix} ) {
-            # Needed are file names relative to the module.
-            # The very first "Diffing ... " message contains the much needed path segment
-            # which needs to be stripped from the front of the file names in the rdiff
-            # message events. It's not possible to just strip the module name, because the
-            # file name may be prefixed with the meta project name ie ('solenv' -> 'tools/solenv').
-            if ( $message =~ /cvs (?:rdiff|server): Diffing (.*)/ ) {
-                $self->{module_prefix} = $1;
-            }
-        }
-        print '.';
-    }
-    if ( $event->isa('PCVSLib::MessageEvent') ) {
-        push(@{$self->{diff}}, $event->get_message());
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsCvsUpdateListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{count} = 0;
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_count
-{
-    my $self = shift;
-    return $self->{count};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        $self->append_to_log($message);
-    }
-    if ( $event->isa('PCVSLib::MessageEvent') ) {
-        print '.';
-        $self->{count}++;
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsCvsTagListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{tagged_files} = ();
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_tagged_files
-{
-    my $self = shift;
-    return $self->{tagged_files} ? $self->{tagged_files} : [];
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        $self->append_to_log($message);
-    }
-    if ( $event->isa('PCVSLib::MessageEvent') ) {
-        my $message = $event->get_message();
-        if ( $message =~ /^T (\S+)$/ ) {
-            push(@{$self->{tagged_files}}, $1);
-            print '.';
-        }
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsCvsMergeListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{count} = 0;
-    $self->{conflict_file} = 0;
-    $self->{already_merged} = ();
-    $self->{conflicts} = ();
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_count
-{
-    my $self = shift;
-    return $self->{count};
-}
-
-sub get_conflicts
-{
-    my $self = shift;
-    return $self->{conflicts};
-}
-
-sub get_already_merged
-{
-    my $self = shift;
-    return $self->{already_merged};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        # collect conflicts
-        if ( $message =~ /rcsmerge: warning: conflicts during merge/ ) {
-            $self->{conflict_file}++;
-        }
-        else {
-            $self->append_to_log($message);
-        }
-    }
-    if ( $event->isa('PCVSLib::MessageEvent') ) {
-        my $message = $event->get_message();
-        if ( $message =~ /(\S*) already contains the differences between / ) {
-            print '.';
-            push(@{$self->{already_merged}}, $1);
-            $self->{count}++;
-        }
-    }
-    if ( $event->isa('PCVSLib::MergedEvent') ) {
-            print '.';
-            if ( $self->{conflict_file} ) {
-                push(@{$self->{conflicts}}, $event->get_file()->path_name()->local_path());
-                $self->{conflict_file} = 0;
-            }
-            $self->{count}++;
-    }
-    if ( $event->isa('PCVSLib::CreatedEvent') ) {
-            print '.';
-            $self->{count}++;
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsCvsStatusListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{stati} = ();
-    $self->{cur_file} = undef;
-    $self->{cur_status} = undef;
-    $self->{cur_working_rev} = undef;
-    $self->{cur_sticky_tag} = undef;
-    $self->{cur_branch_rev} = undef;
-    $self->{cur_sticky_opt} = undef;
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_stati
-{
-    my $self = shift;
-    return $self->{stati};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        $self->append_to_log($message);
-    }
-    if ( $event->isa('PCVSLib::MessageEvent') ) {
-        my $message = $event->get_message();
-        if ( $message =~ /File: no file\s(\S+)\s+Status:\s(\S.*)$/ ) {
-            my $file   = $1;
-            my $status = $2;
-            if ( $self->{cur_file} ) {
-                push(@{$self->{stati}}, [
-                                          $self->{cur_file},
-                                          $self->{cur_status},
-                                          $self->{cur_working_rev},
-                                          $self->{cur_sticky_tag},
-                                          $self->{cur_branch_rev},
-                                          $self->{cur_sticky_opt}
-                                        ]);
-            }
-            $self->{cur_file}   = $file;
-            $self->{cur_status} = $status;
-            $self->{cur_working_rev} = undef;
-            $self->{cur_sticky_tag}  = undef;
-            $self->{cur_branch_rev}  = undef;
-            $self->{cur_sticky_opt}  = undef;
-        }
-        if ( $message =~ /File:\s(\S+)\s+Status:\s(\S+)/ ) {
-            my $file   = $1;
-            my $status = $2;
-            if ( $self->{cur_file} ) {
-                push(@{$self->{stati}}, [
-                                          $self->{cur_file},
-                                          $self->{cur_status},
-                                          $self->{cur_working_rev},
-                                          $self->{cur_sticky_tag},
-                                          $self->{cur_branch_rev},
-                                          $self->{cur_sticky_opt}
-                                        ]);
-            }
-            $self->{cur_file}   = $file;
-            $self->{cur_status} = $status;
-        }
-        if ( $message =~ /Working revision:\s+((\d|\.)+)/ ) {
-            $self->{cur_working_rev} = $1;
-        }
-        if ( $message =~ /Sticky Tag:\s+(.+)/ ) {
-            my $sticky_tag = $1;
-            if ( $sticky_tag =~ /([\w\-]+) \(branch: ([\d\.]+)\)$/ ) {
-                $self->{cur_sticky_tag} = $1;
-                $self->{cur_branch_rev} = $2;
-            }
-            else {
-                $self->{cur_sticky_tag} = $sticky_tag;
-                $self->{cur_branch_rev} = '';
-            }
-        }
-        if ( $message =~ /Sticky Options:\s+(.+)/ ) {
-            $self->{cur_sticky_opt} = $1;
-        }
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        if ( $self->{cur_file} ) {
-            push(@{$self->{stati}}, [
-                                      $self->{cur_file},
-                                      $self->{cur_status},
-                                      $self->{cur_working_rev},
-                                      $self->{cur_sticky_tag},
-                                      $self->{cur_branch_rev},
-                                      $self->{cur_sticky_opt}
-                                    ]);
-        }
-        $self->{cur_file}        = undef;
-        $self->{cur_status}      = undef;
-        $self->{cur_working_rev} = undef;
-        $self->{cur_sticky_tag}  = undef;
-        $self->{cur_branch_rev}  = undef;
-        $self->{cur_sticky_opt}  = undef;
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-
-package CwsCvsLogListener;
-use vars('@ISA');
-@ISA=('CwsCvsListener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{logs} = ();
-    $self->{in_comment} = 0;
-    $self->{cur_file} = undef;
-    $self->{cur_revision} = undef;
-    $self->{cur_date} = undef;
-    $self->{cur_author} = undef;
-    $self->{cur_logs} = ();
-    bless ($self, $class);
-    return $self;
-}
-
-sub get_collected_logs
-{
-    my $self = shift;
-    return $self->{logs};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        my $message = $event->get_message();
-        $self->append_to_log($message);
-    }
-    if ( $event->isa('PCVSLib::MessageEvent') ) {
-        my $message = $event->get_message();
-        if ( $message =~ /^Working file: (\S+)$/ ) {
-            my $file   = $1;
-            if ( $self->{cur_file} ) {
-                push(@{$self->{logs}}, [
-                                          $self->{cur_file},
-                                          $self->{cur_logs}
-                                        ]);
-            }
-            $self->{cur_file}     = $file;
-            $self->{cur_revision} = undef;
-            $self->{cur_date}     = undef;
-            $self->{cur_author}   = undef;
-            $self->{cur_logs}     = ();
-        }
-        if ( $message =~ /^revision:\s+((\d|\.)+)$/ ) {
-            $self->{cur_revision} = $1;
-        }
-        if ( $message =~ /^date: (\S+\s\S+);\s+author: (\S+);/ ) {
-            $self->{cur_date}   = $1;
-            $self->{cur_author} = $2;
-            $self->{in_comment}++;
-        }
-        if ( $self->{in_comment} ) {
-            if ( $message =~ /^branches: ((\d|\.)+;)+/ || $message =~ /^RESYNC:/) {
-                # skip these
-            }
-            elsif ( $message =~ /^----------------------------$/
-                   ||  $message =~ /^=============================================================================$/)
-            {
-                my $self->{in_comment} = 0;
-            }
-            else {
-                push(@{$self->{cur_log}},
-                              $self->{cur_date} . " " .
-                              $self->{cur_author} .
-                              $self->{cur_revision} .
-                              " $message");
-            }
-        }
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        if ( $self->{cur_file} ) {
-            push(@{$self->{logs}}, [
-                                        $self->{cur_file},
-                                        $self->{cur_logs}
-                                    ]);
-        }
-        $self->{cur_file}     = undef;
-        $self->{cur_revision} = undef;
-        $self->{cur_date}     = undef;
-        $self->{cur_author}   = undef;
-        $self->{cur_logs}     = ();
-        my $is_success = $event->is_success();
-        if ( $is_success ) {
-            $self->clear_log();
-        }
-        $self->{is_success_} = $is_success;
-    }
-}
-1; # needed by "use" or "require"
-
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
-
diff --git a/solenv/bin/modules/PCVSLib/Changes b/solenv/bin/modules/PCVSLib/Changes
deleted file mode 100644
index 9bd78ae888d0..000000000000
--- a/solenv/bin/modules/PCVSLib/Changes
+++ /dev/null
@@ -1,8 +0,0 @@
-Revision history for Perl extension PCVSLib.
-
-0.01  Thu Dec 30 14:11:26 2004
-	- original version; created by h2xs 1.23 with options
-		-b 5.6.0 -X -n PCVSLib
-0.02  Thu Mar 16  18:30:00 2006
-    - first implementation committed to OOo
-
diff --git a/solenv/bin/modules/PCVSLib/MANIFEST b/solenv/bin/modules/PCVSLib/MANIFEST
deleted file mode 100644
index a30e14c999d3..000000000000
--- a/solenv/bin/modules/PCVSLib/MANIFEST
+++ /dev/null
@@ -1,26 +0,0 @@
-Changes
-lib/PCVSLib.pm
-lib/PCVSLib/Client.pm
-lib/PCVSLib/Command.pm
-lib/PCVSLib/Connection.pm
-lib/PCVSLib/Credentials.pm
-lib/PCVSLib/Directory.pm
-lib/PCVSLib/Entry.pm
-lib/PCVSLib/Event.pm
-lib/PCVSLib/EventHandler.pm
-lib/PCVSLib/File.pm
-lib/PCVSLib/Listener.pm
-lib/PCVSLib/LogHandle.pm
-lib/PCVSLib/ModeTime.pm
-lib/PCVSLib/PathName.pm
-lib/PCVSLib/Request.pm
-lib/PCVSLib/Response.pm
-lib/PCVSLib/Root.pm
-lib/PCVSLib/Time.pm
-Makefile.PL
-MANIFEST
-README
-samples/codemo
-t/daemon.pl
-t/PCVSLib.t
-TODO
diff --git a/solenv/bin/modules/PCVSLib/Makefile.PL b/solenv/bin/modules/PCVSLib/Makefile.PL
deleted file mode 100644
index b1e7f9cca4c4..000000000000
--- a/solenv/bin/modules/PCVSLib/Makefile.PL
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Makefile.PL,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use 5.006;
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    NAME              => 'PCVSLib',
-    VERSION_FROM      => 'lib/PCVSLib.pm', # finds $VERSION
-    PREREQ_PM         => {}, # e.g., Module::Name => 1.1
-    ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
-      (ABSTRACT_FROM  => 'lib/PCVSLib.pm', # retrieve abstract from module
-       AUTHOR         => 'Jens-Heiner Rechtien<hr@openoffice.org>') : ()),
-);
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/README b/solenv/bin/modules/PCVSLib/README
deleted file mode 100644
index a1c4d09349aa..000000000000
--- a/solenv/bin/modules/PCVSLib/README
+++ /dev/null
@@ -1,58 +0,0 @@
-PCVSLib version 0.02
-====================
-
-PCVSLib is a pure perl implementation of the CVS client protocol. 
-It currently supports only a subset of of the specified requests 
-and responses, just enough to support the OpenOffice.org CWS tools. 
-If it ever is complete and stable enough for general use, it might
-be worthwhile to submit it to CPAN.
-
-INSTALLATION
-
-To install this module type the following:
-
-   perl Makefile.PL
-   make
-   make test
-   make install
-
-DEPENDENCIES
-
-This module requires these other modules and libraries:
-
-  nothing which is not included in perl-5.6 or later,
-  a cvs command line client is needed for running the
-  test suite.
-
-COPYRIGHT AND LICENCE
-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: README,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
diff --git a/solenv/bin/modules/PCVSLib/TODO b/solenv/bin/modules/PCVSLib/TODO
deleted file mode 100644
index 2369f0658078..000000000000
--- a/solenv/bin/modules/PCVSLib/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-- implement the 'add' request.
-- restrict the 'rdiff' command to one module
-- more test code for 'static' directories
-- remove command: does not check for still existing files. should this be done in
-  the internal listener or is the user to provide this listener? Currently use it with
-  the force flag.
-
-check the places in the sources which are marked with TODO
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib.pm
deleted file mode 100644
index bc293127fa79..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: PCVSLib.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package PCVSLib;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-
-our @ISA = qw(Exporter);
-
-use PCVSLib::Client;
-use PCVSLib::Command;
-use PCVSLib::Connection;
-use PCVSLib::Credentials;
-use PCVSLib::Directory;
-use PCVSLib::Entry;
-use PCVSLib::Event;
-use PCVSLib::EventHandler;
-use PCVSLib::Request;
-use PCVSLib::Response;
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use PCVSLib ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = ( 'all' => [ qw(
-
-) ] );
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw(
-
-);
-
-our $VERSION = '0.02';
-
-
-# Preloaded methods go here.
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-PCVSLib - pure perl implementation of the CVS client protocol
-
-=head1 SYNOPSIS
-
-  use PCVSLib;
-
-=head1 DESCRIPTION
-
-PCVSLib is a pure perl implementation of the CVS client protocol.
-It currently supports only a subset of of the specified requests
-and responses, just enough to support the OpenOffice.org CWS tools.
-If it ever is complete and stable enough for general use, it might
-be worthwhile to submit it to CPAN.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-The cvsclient protocol documentation which comes with the CVS
-source distribution
-
-=head1 AUTHOR
-
-Jens-Heiner Rechtien E<lt>hr@openoffice.orgE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-GNU Lesser General Public License version 3
-Copyright (C) 2008 Sun Microsystems, Inc.
-
-=cut
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Client.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Client.pm
deleted file mode 100644
index c628208ed7ec..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Client.pm
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Client.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Client.pm - package Client encapsulates a CVS client
-#
-#
-# TODO implement a 'working_dir' for the client, where all operations
-#      happen
-#
-
-package PCVSLib::Client;
-
-use Carp;
-
-use strict;
-use warnings;
-
-use PCVSLib::EventHandler;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{connection} = shift;
-
-    # private members
-    $self->{first_command_} = 1;  # do send Root request before first command
-
-    bless ($self, $class);
-
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(connection) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub execute_command
-{
-    my $self    = shift;
-    my $command = shift;
-
-    $command->io_handle($self->{connection}->io_handle());
-    $command->root($self->{connection}->root());
-    if ( $self->{first_command_} ) {
-        $command->first_command(1);
-        $self->{first_command_} = 0;
-    }
-    $command->execute();
-}
-
-#### private methods ####
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Command.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Command.pm
deleted file mode 100644
index 02ad5e0ec5ab..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Command.pm
+++ /dev/null
@@ -1,793 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Command.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# Command.pm - package Command encapsulates the process of sending a command
-#              to the CVS server
-#
-
-package PCVSLib::Command;
-
-use Carp;
-use File::Basename;
-use IO::Dir;
-
-use strict;
-use warnings;
-
-use PCVSLib::Request;
-use PCVSLib::Response;
-use PCVSLib::Listener;
-use PCVSLib::PathName;
-use PCVSLib::File;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-
-    $self->{event_handler} = shift;
-    $self->{io_handle}     = undef;
-    $self->{file_list}     = undef;
-    $self->{tag}           = '';
-    $self->{branch}        = '';
-    $self->{rev1}          = '';
-    $self->{rev2}          = '';
-    $self->{merge1}        = '';
-    $self->{merge2}        = '';
-    $self->{options}       = undef;
-    $self->{comment}       = undef;
-    $self->{recursive}     = 1;
-    $self->{first_command} = 0;       # is this a first command
-    $self->{root}          = undef;
-    # private members
-
-    bless ($self, $class);
-
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(event_handler io_handle file_list tag branch rev1 rev2 merge1 merge2 options comment recursive first_command root) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub execute
-{
-    my $self = shift;
-
-    if ( $self->{first_command} ) {
-        if ( !$self->{root} ) {
-            croak("PCVSLIB::Command::execute(): root not set");
-        }
-        my $request = PCVSLib::RootRequest->new($self->{root}->root_dir());
-        my $request_string = $request->to_string();
-        $self->{io_handle}->print($request_string);
-        $request = PCVSLib::ValidResponsesRequest->new();
-        $request_string = $request->to_string();
-        $self->{io_handle}->print($request_string);
-        $request = PCVSLib::UseUnchangedRequest->new();
-        $request_string = $request->to_string();
-        $self->{io_handle}->print($request_string);
-    }
-    $self->execute_command_();
-}
-
-#### private methods ####
-
-sub process_responses_
-{
-    my $self = shift;
-    while (1) {
-        my $response
-            = PCVSLib::Response->create_response($self->{event_handler}, $self->{io_handle});
-        $response->process();
-        last if $response->is_last();
-    }
-}
-
-# default implememtation
-sub execute_command_
-{
-    return;
-}
-
-# default implememtation
-sub build_request_list_
-{
-    return \();
-}
-
-sub recurse_directories_
-{
-    my $self      = shift;
-    my $directory = shift;
-
-    my @dir_entries = ();
-
-    if ( ! -d "$directory/CVS" ) {
-        return (); # directory not managed, not interesting
-    }
-
-    my $dir = IO::Dir->new($directory);
-    if ( defined($dir) ) {
-        while ( $_ = $dir->read() ) {
-            next if /^\.$/;
-            next if /^\.\.$/;
-            next if ( /^CVS$/ && -d "$directory/CVS" );
-            push(@dir_entries, "$directory/$_");
-        }
-        $dir->close();
-    }
-    else {
-        croak("PCVSLIB::Command::recurse_directories_(): failed to open directory '$directory': $!");
-    }
-    my @subdir_entries = ();
-    my @all_entries = ();
-    foreach ( @dir_entries ) {
-        if ( -d $_ ) {
-            if ( ! -d "$_/CVS" ) {
-                push(@all_entries, $_); # unmanaged subdirs are going to get a ? mark
-                                        # for being questionable
-            }
-            else {
-                if ( $self->{recursive} ) {
-                    push(@subdir_entries, @{$self->recurse_directories_($_)});
-                }
-            }
-        }
-        else {
-            push(@all_entries, $_);
-        }
-    }
-    push(@all_entries, @subdir_entries);
-    return \@all_entries;
-}
-
-sub gather_request_files_
-{
-    # Returns a reference on LoL. The third element of each sub list item
-    # indicates that the sub list item needs to be an explicit argument.
-    # The fourth element determines if a Modified, Is-modified or UnChanged
-    # request should be send
-    my $self = shift;
-
-    my @request_files_list = ();
-    my %directories = ();
-
-    foreach ( @{$self->{file_list}} ) {
-        my ($name, $dir) = fileparse($_);
-        chop($dir); # remove trailing slash
-        if ( !-e $_ && -e "$dir/CVS" ) {
-            # File could be either locally removed, obsolete on this branch
-            # or just be non existant
-            if ( !exists $directories{$dir} ) {
-                $directories{$dir} = PCVSLib::Directory->new($dir);
-            }
-            push(@request_files_list, [$name, $directories{$dir}, 1, 0]);
-        }
-        elsif ( -f _ ) {
-            if ( !exists $directories{$dir} ) {
-                $directories{$dir} = PCVSLib::Directory->new($dir);
-            }
-            my $entry = $directories{$dir}->get_entry($name);
-            push(@request_files_list, [$name, $directories{$dir}, 1, 1]);
-        }
-        elsif ( -d _ ) {
-            foreach ( @{$self->recurse_directories_($_)} ) {
-                my ($name, $dir) = fileparse($_);
-                chop($dir); # remove trailing slash
-                if ( !exists $directories{$dir} ) {
-                    $directories{$dir} = PCVSLib::Directory->new($dir);
-                }
-                push(@request_files_list, [$name, $directories{$dir}, 0, 1]);
-            }
-            if ( !exists $directories{$dir} ) {
-                $directories{$dir} = PCVSLib::Directory->new($dir);
-            }
-            push(@request_files_list, [$name, $directories{$dir}, 1, 0]);
-        }
-        else {
-            croak("PCVSLIB::Command::gather_request_files_(): internal error");
-       }
-    }
-
-    return \@request_files_list;
-}
-
-sub build_files_request_list_
-{
-    my $self = shift;
-    my $send_modified = shift;
-
-    my @request_list = ();
-
-    my $request_files = $self->gather_request_files_();
-    my $current_dir = '';
-
-    my @arguments = ();
-
-    foreach ( @{$request_files} ) {
-        my $name               = $_->[0];
-        my $dir                = $_->[1];
-        my $is_argument        = $_->[2];
-        my $needs_change_check = $_->[3];
-        my $dir_name = $dir->directory();
-        if ( $dir_name ne $current_dir ) {
-            $dir_name =~ s/^\.\///; # if we got a leading ./ remove it
-            my $repository = $dir->repository();
-            push(@request_list, PCVSLib::DirectoryRequest->new($dir_name, $repository));
-            if ( $dir->tag() ) {
-                push(@request_list, PCVSLib::StickyRequest->new($dir->tag()));
-            }
-            if ( $dir->is_static() ) {
-                push(@request_list, PCVSLib::StaticDirectoryRequest->new());
-            }
-            $current_dir = $dir_name;
-        }
-        my $entry = $dir->get_entry($name);
-
-        if ( $entry ) {
-            $entry->to_server(1); # we intend to send the entry line to the server
-            if ( $entry->is_conflict() ) {
-                if ($dir->is_resolved($name) ) {
-                    $entry->is_resolved(1);
-                }
-            }
-            push(@request_list, PCVSLib::EntryRequest->new($entry));
-            if ( $needs_change_check ) {
-                if ( $dir->is_modified($name) ) {
-                    if ( $send_modified ) {
-                        my $path_name = PCVSLib::PathName->new();
-                        $path_name->local_directory($dir_name);
-                        $path_name->name($name);
-                        my $file = PCVSLib::File->new($path_name);
-                        $file->entry($entry);
-                        push(@request_list, PCVSLib::ModifiedRequest->new($name, undef, $file));
-                    }
-                    else {
-                        push(@request_list, PCVSLib::IsModifiedRequest->new($name));
-                    }
-                }
-                else {
-                    push(@request_list, PCVSLib::UnchangedRequest->new($name));
-                }
-            }
-        }
-        else {
-            if ( $name ne '.' ) {
-                push(@request_list, PCVSLib::QuestionableRequest->new($name));
-            }
-        }
-
-        if ( $is_argument ) {
-            push(@arguments, $dir_name eq '.' ? $name : "$dir_name/$name");
-        }
-
-    }
-    # The last DirectoryRequest must be for the working dir. If current_dir is
-    # not the working dir, push working dir on @request_list (possibly for the
-    # second time)
-    if ( $current_dir ne '.' ) {
-        my $working_dir = PCVSLib::Directory->new('.');
-        my $repository = $working_dir->repository();
-        push(@request_list, PCVSLib::DirectoryRequest->new('.', $repository));
-        if ( $working_dir->tag() ) {
-            push(@request_list, PCVSLib::StickyRequest->new($working_dir->tag()));
-        }
-    }
-    # Finally push file arguments on @request_list
-    foreach ( @arguments ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    return \@request_list;
-}
-
-
-sub send_request_
-{
-    my $self    = shift;
-    my $request = shift;
-
-    my $request_string = $request->to_string();
-    $self->{io_handle}->print($request_string);
-
-    if ( $request->additional_data_attached() ) {
-        my $additional_data_string = $request->additional_data_to_string();
-        $self->{io_handle}->print($additional_data_string);
-    }
-
-    if ( $request->file_attached() ) {
-        my $file = $request->file();
-        $file->io_handle($self->{io_handle});
-        $file->read_and_send();
-    }
-
-    if ( $request->response_expected() ) {
-        $self->process_responses_();
-    }
-}
-
-
-#### derived classes ####
-
-package PCVSLib::VersionCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $request = PCVSLib::VersionRequest->new();
-    $self->send_request_($request);
-}
-
-package PCVSLib::ValidRequestsCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $request = PCVSLib::ValidRequestsRequest->new();
-    $self->send_request_($request);
-}
-
-package PCVSLib::ValidResponsesCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $request = PCVSLib::ValidResponsesRequest->new();
-    $self->send_request_($request);
-}
-
-package PCVSLib::StatusCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $send_modified = 1; # we are going to play safe, send Modified insetad of Is-Modified
-
-    my @request_list = ();
-    foreach ( @{$self->{options}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    my $request_list = $self->build_files_request_list_($send_modified);
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    my $request = PCVSLib::StatusRequest->new();
-    $self->send_request_($request);
-}
-
-package PCVSLib::RDiffCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    my $request = PCVSLib::RDiffRequest->new();
-    $self->send_request_($request);
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    if ( !$self->{rev1} ) {
-        croak("PCVSLIB::RDiffCommand::build_request_list_(): revsion rev1 not set");
-    }
-    if ( !$self->{rev2} ) {
-        croak("PCVSLIB::RDiffCommand::build_request_list_(): revsion rev2 not set");
-    }
-    if ( !@{$self->{file_list}} ) {
-        croak("PCVSLIB::RDiffCommand::build_request_list_(): no module specfied");
-    }
-
-    my @request_list = ();
-    foreach ( @{$self->{options}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    push(@request_list, PCVSLib::ArgumentRequest->new('-r'));
-    push(@request_list, PCVSLib::ArgumentRequest->new($self->{rev1}));
-    push(@request_list, PCVSLib::ArgumentRequest->new('-r'));
-    push(@request_list, PCVSLib::ArgumentRequest->new($self->{rev2}));
-    foreach ( @{$self->{file_list}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    return \@request_list;
-}
-
-package PCVSLib::RLogCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    my $request = PCVSLib::RLogRequest->new();
-    $self->send_request_($request);
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    if ( !@{$self->{file_list}} ) {
-        croak("PCVSLIB::RLogCommand::build_request_list_(): no module specfied");
-    }
-
-    my @request_list = ();
-    foreach ( @{$self->{options}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    foreach ( @{$self->{file_list}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    return \@request_list;
-}
-
-package PCVSLib::LogCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $send_modified = 0; # go easy, use  Is-Modified
-    my $request_list = $self->build_files_request_list_($send_modified);
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    my $request = PCVSLib::LogRequest->new();
-    $self->send_request_($request);
-}
-
-package PCVSLib::CheckoutCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-use Carp;
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $update_listener = PCVSLib::InternalListener->new();
-    $update_listener->root($self->{root});
-    $self->{event_handler}->add_listener($update_listener);
-
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    $self->{event_handler}->remove_listener($update_listener);
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    if ( $self->{tag} && $self->{branch} ) {
-        croak("PCVSLIB::CheckoutCommand::build_request_list_(): either tag or branch label can be set, not both");
-    }
-
-    my @request_list = ();
-
-    if ( $self->{tag} || $self->{branch} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-P')); # prune
-        push(@request_list, PCVSLib::ArgumentRequest->new('-r'));
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{tag} ? $self->{tag} : $self->{branch} ));
-        push(@request_list, PCVSLib::ArgumentRequest->new('--'));
-    }
-    foreach ( @{$self->{file_list}} ) {
-        if ( -e $_ ) {
-            # Implement with ExpandModuleRequest etc
-            croak("PCVSLIB::CheckoutCommand::build_checkout_request_list_(): checkout of already exiting modules/directories/files not yet supported");
-        }
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-
-    push(@request_list, PCVSLib::DirectoryRequest->new('.', $self->{root}->root_dir() ));
-    push(@request_list, PCVSLib::CheckoutRequest->new());
-
-    return \@request_list;
-}
-
-package PCVSLib::TagCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-use Carp;
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    my @request_list = ();
-
-    if ( $self->{tag} && $self->{branch} ) {
-        croak("PCVSLIB::TagCommand::build_request_list_(): either tag or branch label must be set, not both");
-    }
-
-    if ( !$self->{tag} && !$self->{branch} ) {
-        croak("PCVSLIB::TagCommand::build_request_list_(): tag or branch label not set");
-    }
-
-    foreach ( @{$self->{options}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-    if ( !$self->{recursive} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-l'));
-    }
-
-    if ( $self->{branch} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-b'));
-        push(@request_list, PCVSLib::ArgumentRequest->new('--'));
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{branch}));
-    }
-    else {
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{tag}));
-    }
-    my $send_modified = 0; # Using Is-modified is good enough as long the '-c' option is not used
-    for ( @{$self->{options}} ) {
-        $send_modified++ if /-c/;
-    }
-    my $file_request_list = $self->build_files_request_list_($send_modified);
-    push(@request_list, @{$file_request_list});
-    push(@request_list,  PCVSLib::TagRequest->new());
-
-    return \@request_list;
-}
-
-package PCVSLib::CommitCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-use Carp;
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $ci_listener = PCVSLib::InternalListener->new();
-    $self->{event_handler}->add_listener($ci_listener);
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    $self->{event_handler}->remove_listener($ci_listener);
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    my $send_modified = 1;
-    my @request_list = ();
-
-    foreach ( @{$self->{options}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-
-    if ( !$self->{recursive} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-l'));
-    }
-
-    if ( !$self->{comment} ) {
-        croak("PCVSLIB::CommitCommand::build_request_list_(): commit comment missing");
-    }
-    else {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-m'));
-        my $line = shift @{$self->{comment}};
-        push(@request_list, PCVSLib::ArgumentRequest->new($line));
-        foreach (@{$self->{comment}}) {
-            push(@request_list, PCVSLib::ArgumentxRequest->new($_));
-        }
-    }
-
-    my $file_request_list = $self->build_files_request_list_($send_modified);
-    push(@request_list, @{$file_request_list});
-    # TODO: check for conflict markers
-    push(@request_list,  PCVSLib::CiRequest->new());
-
-    return \@request_list;
-}
-
-package PCVSLib::UpdateCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-use Carp;
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $update_listener = PCVSLib::InternalListener->new();
-    $self->{event_handler}->add_listener($update_listener);
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    $self->{event_handler}->remove_listener($update_listener);
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    my $send_modified = 1;
-    my @request_list = ();
-
-    foreach ( @{$self->{options}} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new($_));
-    }
-
-    if ( !$self->{recursive} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-l'));
-    }
-
-    # sanity checks
-    if ( $self->{tag} && $self->{branch} ) {
-        croak("PCVSLIB::UpdateCommand::build_request_list_(): can update to either tag or branch, but not both");
-    }
-
-    if ( $self->{tag} && ($self->{merge1} || $self->{merge2}) ) {
-        croak("PCVSLIB::UpdateCommand::build_request_list_(): can update to either tag or merge but not both");
-    }
-
-    if ( $self->{branch} && ($self->{merge1} || $self->{merge2}) ) {
-        croak("PCVSLIB::UpdateCommand::build_request_list_(): can update to either branch or merge but not both");
-    }
-
-    if ( $self->{merge2} && !$self->{merge1} ) {
-        croak("PCVSLIB::UpdateCommand::build_request_list_(): inconsistent specification of merge revisisons");
-    }
-
-    # revision arguments for update and merge
-    if ( $self->{tag} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-r'));
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{tag}));
-    }
-
-    if ( $self->{branch} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-r'));
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{branch}));
-    }
-
-    if ( $self->{merge1} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-j'));
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{merge1}));
-    }
-
-    if ( $self->{merge2} ) {
-        push(@request_list, PCVSLib::ArgumentRequest->new('-j'));
-        push(@request_list, PCVSLib::ArgumentRequest->new($self->{merge2}));
-    }
-
-    my $file_request_list = $self->build_files_request_list_($send_modified);
-    push(@request_list, @{$file_request_list});
-    push(@request_list,  PCVSLib::UpdateRequest->new());
-
-    return \@request_list;
-}
-
-package PCVSLib::RemoveCommand;
-use vars('@ISA');
-@ISA=('PCVSLib::Command');
-
-use Carp;
-
-sub execute_command_ {
-    my $self = shift;
-
-    my $remove_listener = PCVSLib::InternalListener->new();
-    $self->{event_handler}->add_listener($remove_listener);
-
-    my $request_list = $self->build_request_list_();
-    foreach ( @{$request_list} ) {
-        $self->send_request_($_);
-    }
-    $self->{event_handler}->remove_listener($remove_listener);
-}
-
-sub build_request_list_
-{
-    my $self = shift;
-
-    my $send_modified = 0;
-    my @request_list = ();
-
-    my $force_removal = 0;
-
-    foreach ( @{$self->{options}} ) {
-        if ( /-f/ ) {
-            $force_removal++;
-        }
-    }
-
-    if ( $force_removal && $self->{recursive} ) {
-        croak("PCVSLIB::RemoveCommand::build_request_list_(): for removal: option -f and recursive operation are mutually exclusive");
-    }
-
-    if ( $force_removal ) {
-        foreach ( @{$self->{file_list}} ) {
-            if ( !unlink($_) ) {
-                croak("PCVSLIB::RemoveCommand::build_request_list_(): can't unlink file '$_': $!");
-            }
-        }
-    }
-
-    my $file_request_list = $self->build_files_request_list_($send_modified);
-    push(@request_list, @{$file_request_list});
-    # TODO: check for conflict markers
-    push(@request_list,  PCVSLib::RemoveRequest->new());
-
-    return \@request_list;
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Connection.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Connection.pm
deleted file mode 100644
index 68cb48f45c02..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Connection.pm
+++ /dev/null
@@ -1,179 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Connection.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Connection.pm - package for creating/manipulating a connection to
-#                 a CVS server
-#
-
-package PCVSLib::Connection;
-
-use Class::Struct;
-use Carp;
-use IO::Socket;
-
-use PCVSLib::Root;
-use PCVSLib::LogHandle;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{root} = shift;
-    $self->{scrambled_password} = shift;
-    $self->{io_handle} = undef;
-    # private members
-    $self->{is_open_} = undef;
-    bless ($self, $class);
-    return $self;
-}
-
-for my $datum qw(root scrambled_password io_handle) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub open
-{
-    my $self = shift;
-
-    my $method = $self->{root}->method();
-    if ( !$method ) {
-        croak("PCVSLIB::Connection::open(): method not set");
-    }
-    # pserver style connection
-    if ( $method eq 'pserver' ) {
-        return $self->pserver_open();
-    }
-    else {
-        croak("PCVSLIB::Connection::open(): unsupported method '$method'");
-    }
-}
-
-sub close
-{
-    my $self = shift;
-
-    return if !$self->{is_open_};
-
-    my $method = $self->{root}->method();
-    if ( !$method ) {
-        croak("PCVSLIB::Connection::close(): method not set");
-    }
-    # pserver style connection
-    if ( $method eq 'pserver' ) {
-         $self->pserver_close();
-         return;
-    }
-    else {
-        croak("PCVSLIB::Connection::close(): unsupported method '$method'");
-    }
-    return;
-}
-
-#### private methods ####
-
-sub pserver_open
-{
-    my $self = shift;
-
-    my $user     = $self->{root}->user();
-    my $host     = $self->{root}->host();
-    my $port     = $self->{root}->port();
-    my $root_dir = $self->{root}->root_dir();
-    my $password = $self->{scrambled_password}
-                     or croak("PCVSLib::Connection::pserver_open(): scrambled_password not set");
-
-    # open connection
-    my $cvs_socket = IO::Socket::INET->new($host . ':' . $port)
-          or croak("PCVSLib::Connection::pserver_open(): couldn't connect to host '$host', port '$port': $!");
-
-    # authenticate
-    $cvs_socket->print("BEGIN AUTH REQUEST\n");
-    $cvs_socket->print("$root_dir\n");
-    $cvs_socket->print("$user\n");
-    $cvs_socket->print("$password\n");
-    $cvs_socket->print("END AUTH REQUEST\n");
-
-    my $response = $cvs_socket->getline();
-
-    if ( $response =~ /^I HATE YOU/ ) {
-        croak("PCVSLib::Connection::pserver_open(): '$host': authentication failed");
-    }
-
-    if ( $response =~ /^E / || $response =~ /^error \d+ / ) {
-        my $error = $';
-        chomp($error);
-        croak("PCVSLib::Connection::pserver_open(): '$host': $error");
-    }
-
-    if ( $response =~ /^I LOVE YOU/ ) {
-        $self->{io_handle} = $cvs_socket;
-        $self->{is_open_} = 1;
-        return $cvs_socket;
-    }
-
-    # shouldn't happen
-    croak("PCVSLib::Connection::pserver_open(): '$host': unknown authorization response: $response");
-}
-
-sub pserver_close
-{
-    my $self = shift;
-    $self->{io_handle}->shutdown(2);
-    $self->{io_handle} = undef;
-    $self->{is_open_} = 0;
-    return;
-}
-
-sub DESTROY
-{
-    my $self = shift;
-    $self->close();
-}
-
-####
-
-1; # needed by "use" or "require"
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Credentials.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Credentials.pm
deleted file mode 100644
index ff6f14bedbec..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Credentials.pm
+++ /dev/null
@@ -1,137 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Credentials.pm,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Credentials.pm - package for aquiring the CVS credentials from .cvspass
-#
-
-package PCVSLib::Credentials;
-
-use Carp;
-use IO::File;
-
-use PCVSLib::Root;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{passfile}  = shift;
-    # private members
-    $self->{parsed_} = 0;
-    $self->{passwords_} = {};
-    bless ($self, $class);
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(passfile) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub get_password
-{
-    my $self = shift;
-    my $root = shift;
-
-    if ( !$self->{parsed_} ) {
-        $self->parse_passfile();
-    }
-
-    my $root_string = $root->to_string();
-    my $password = $self->{passwords_}->{$root_string};
-
-    if ( !defined($password) ) {
-        # try again with port number
-        my $root_string_with_port = $root->to_string_with_port();
-        $password = $self->{passwords_}->{$root_string_with_port};
-    }
-
-    if ( !defined($password) ) {
-        my $passfile = $self->{passfile};
-        croak("PCVSLIB::Credentials::get_password(): missing entry in '$passfile': '$root_string'");
-    }
-
-    return $password;
-}
-
-
-#### private methods ####
-
-sub parse_passfile
-{
-    my $self = shift;
-    my $passfile = $self->{passfile};
-
-    if ( !defined($passfile) ) {
-        my $home = $ENV{HOME};
-        if ( !defined($home) ) {
-            croak("PCVSLIB::Credentials::parse_passfile(): environment variable HOME not set");
-        }
-        $self->{passfile} = $passfile = "$home/.cvspass";
-    }
-
-    my $fh = IO::File->new("<$passfile");
-    if ( !defined($fh) ) {
-        croak("PCVSLIB::Credentials::parse_passfile(): can't open CVS password file: '$passfile': $!");
-    }
-    while(<$fh>) {
-        tr/\r\n//d;
-        if ( /^\/1 (:pserver:\S+) (\S.*)$/ ) {
-            # new style .cvspass entries
-            $self->{passwords_}->{$1} = $2;
-        }
-        elsif ( /(:pserver:\S+) (\S+.*)$/ ) {
-            # old style .cvspass entries
-            $self->{passwords_}->{$1} = $2;
-        }
-    }
-    $fh->close();
-    $self->{parsed_}++;
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Directory.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Directory.pm
deleted file mode 100644
index 9ab93fbc4063..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Directory.pm
+++ /dev/null
@@ -1,460 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Directory.pm,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Directory.pm - package representing the concept of a CVS directory
-#
-
-package PCVSLib::Directory;
-
-use Carp;
-
-use PCVSLib::Entry;
-use PCVSLib::Root;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{directory}  = shift;
-
-    $self->{entries}    = ();
-    $self->{repository} = undef;
-    $self->{root}       = undef;
-    $self->{tag}        = '';
-    $self->{is_static}  = 0;
-    $self->{is_leaf}    = undef;
-
-    # private members
-    $self->{entries_changed_}    = 0;
-    $self->{repository_changed_} = 0;
-    $self->{root_changed_}       = 0;
-    $self->{tag_changed_}        = 0;
-    $self->{is_static_changed_}  = 0;
-
-    $self->{parsed_from_dir_}    = 0;
-    bless ($self, $class);
-
-    if ( !defined($self->{directory}) ) {
-        croak("PCVSLIB::Directory::new(): directory not set")
-    }
-
-    if ( -d "$self->{directory}/CVS" ) {
-        $self->parse_admin_files_();
-    }
-
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(directory is_leaf) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-for my $datum qw(entries repository root tag is_static) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        if ( @_ ) {
-            $self->{$datum} = shift;
-            $self->{$datum . '_changed_'} = 1;
-        }
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub get_entry
-{
-    my $self = shift;
-    my $name = shift;
-
-    return $self->{entries}->{$name};
-}
-
-sub set_entry
-{
-    my $self  = shift;
-    my $name  = shift;
-    my $entry = shift;
-
-    $self->{entries}->{$name} = $entry;
-    $self->{entries_changed_} = 1;
-}
-
-sub remove_entry
-{
-    my $self  = shift;
-    my $name  = shift;
-
-    if ( delete($self->{entries}->{$name}) ) {
-        $self->{entries_changed_} = 1;
-    }
-}
-
-sub is_questionable
-{
-    my $self = shift;
-    my $file = shift;
-
-    if ( exists $self->{entries}->{$file} ) {
-        return 0;
-    }
-
-    my $path = $self->{directory} . "/$file";
-    if ( ! -e $path ) {
-        croak("PCVSLIB::Directory::is_questionable_(): nothing known about '$path'");
-    }
-    return 1;
-}
-
-sub is_resolved
-{
-    my $self = shift;
-    my $file = shift;
-
-    my $entry = $self->{entries}->{$file};
-
-    if ( !defined($entry) ) {
-        croak("PCVSLIB::Directory::is_resolved(): '$file' is not a managed file");
-    }
-
-    my $path = $self->{directory} . "/$file";
-    if ( ! -e $path ) {
-        croak("PCVSLIB::Directory::is_resolved(): '$path' has been lost");
-    }
-    my @stat = stat(_);
-
-    # Only files that have been merged with conflicts can be "resolved"
-    if ( $entry->is_conflict() ) {
-        if ( $entry->timestamp() < $stat[9] ) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-
-sub is_modified
-{
-    my $self = shift;
-    my $file = shift;
-
-    my $entry = $self->{entries}->{$file};
-
-    if ( !defined($entry) ) {
-        croak("PCVSLIB::Directory::is_modified_(): '$file' is not a managed file");
-    }
-
-    my $path = $self->{directory} . "/$file";
-    if ( ! -e $path ) {
-        croak("PCVSLIB::Directory::is_modified_(): '$path' has been lost");
-    }
-    my @stat = stat(_);
-
-    if ( $entry->is_merge() ) {
-        # Note: this includes the conflict case
-        return 1;
-    }
-
-    if ( $entry->timestamp() == $stat[9] ) {
-        return 0;
-    }
-
-    return 1;
-}
-
-sub update
-{
-    my $self = shift;
-
-
-    if ( !defined($self->{directory}) ) {
-        croak("PCVSLIB::Directory::update(): directory not set");
-    }
-
-    my $cvs_dir = $self->{directory} . "/CVS";
-    my $new = 0;
-    if ( !-d $cvs_dir ) {
-        if ( !mkdir($cvs_dir) ) {
-            croak("PCVSLIB::Directory::update(): can't create directory '$cvs_dir': $!");
-        }
-        $new++;
-    }
-
-    if ( $new || $self->{entries_changed_} ) {
-        $self->write_entries_file();
-        $self->{entries_changed_} = 0;
-    }
-
-    if ( $new || $self->{root_changed_} ) {
-        $self->write_root_file();
-        $self->{root_changed_} = 0;
-    }
-
-    if ( $new || $self->{repository_changed_} ) {
-        $self->write_repository_file();
-        $self->{repository_changed_} = 0;
-    }
-
-    if ( $new || $self->{tag_changed_} ) {
-        $self->write_tag_file();
-        $self->{tag_changed_} = 0;
-    }
-
-    if ( $new || $self->{is_static_changed_} ) {
-        if ( $self->{is_static} ) {
-            $self->touch_file_('Entries.Static');
-        }
-        else {
-            $self->unlink_file_('Entries.Static');
-        }
-        $self->{is_static_changed_} = 0;
-    }
-}
-
-
-#### private methods ####
-
-sub read_entries_file_ {
-    my $self = shift;
-
-    my $entries_fh = $self->open_admin_file_("Entries", 0);
-    $self->{is_leaf} = 0;
-    while (my $line = <$entries_fh>) {
-        $line=~tr/\r\n//d;
-        if ( $line =~ /^D$/ ) {
-            $self->{is_leaf} = 1;
-            next;
-        }
-        my $entry = PCVSLib::Entry->new($line);
-        my $name = $entry->name();
-        $self->{entries}->{$name} = $entry;
-    }
-    $entries_fh->close();
-}
-
-sub read_root_file_ {
-    my $self = shift;
-
-    my $root_fh = $self->open_admin_file_("Root", 0);
-    my $root = <$root_fh>;
-    $root=~tr/\r\n//d;
-    $self->{root} = PCVSLib::Root->new($root);
-    $root_fh->close();
-
-}
-
-sub read_repository_file_ {
-    my $self = shift;
-
-    my $repository_fh = $self->open_admin_file_("Repository", 0);
-    my $line = <$repository_fh>;
-    $line=~tr/\r\n//d;
-    $self->{repository} = $line;
-    $repository_fh->close();
-}
-
-sub read_tag_file_ {
-    my $self = shift;
-
-    my $tag_path = $self->{directory} . "/CVS/Tag";
-    if ( -e $tag_path ) {
-        my $tag_fh = $self->open_admin_file_("Tag", 0);
-        $self->{tag} = <$tag_fh>;
-        $self->{tag}=~tr/\r\n//d;
-        $tag_fh->close();
-    }
-    else {
-        $self->{tag} = 0;
-    }
-}
-
-sub write_entries_file {
-    my $self = shift;
-
-    my @dirs;
-    my @files;
-    $self->{is_leaf} = 1;
-    foreach ( keys %{$self->{entries}} ) {
-        if ( $self->{entries}->{$_}->is_directory() ) {
-            push(@dirs, $self->{entries}->{$_}->to_string());
-            $self->{is_leaf} = 0;
-        }
-        else {
-            push(@files, $self->{entries}->{$_}->to_string());
-        }
-    }
-
-    my $entries_fh = $self->open_admin_file_("Entries.tmp", 1);
-    foreach ( sort(@dirs), sort(@files) ) {
-        $entries_fh->print("$_\n");
-    }
-    if ( $self->{is_leaf} ) {
-        $entries_fh->print("D\n");
-    }
-    $entries_fh->close();
-    $self->rename_tmp("Entries.tmp", "Entries");
-}
-
-sub write_root_file {
-    my $self = shift;
-
-    my $root_fh = $self->open_admin_file_("Root.tmp", 1);
-    if ( $self->{root}->port() != 2401 ) {
-        $root_fh->print($self->{root}->to_string_with_port() . "\n");
-    }
-    else {
-        $root_fh->print($self->{root}->to_string() . "\n");
-    }
-    $root_fh->close();
-    $self->rename_tmp("Root.tmp", "Root");
-}
-
-sub write_repository_file {
-    my $self = shift;
-
-    my $repository_fh = $self->open_admin_file_("Repository.tmp", 1);
-    $repository_fh->print($self->{repository} . "\n");
-    $repository_fh->close();
-    $self->rename_tmp("Repository.tmp", "Repository");
-}
-
-sub write_tag_file {
-    my $self = shift;
-
-    if ( $self->{tag} ) {
-        my $tag_fh = $self->open_admin_file_("Tag.tmp", 1);
-        $tag_fh->print($self->{tag} . "\n");
-        $tag_fh->close();
-        $self->rename_tmp("Tag.tmp", "Tag");
-    }
-    else {
-        $self->unlink_file_("Tag");
-    }
-}
-
-
-sub parse_admin_files_
-{
-    my $self = shift;
-
-    if ( !defined($self->directory) ) {
-        croak("PCVSLIB::Directory::parse_admin_files_(): directory not set");
-    }
-
-    $self->read_entries_file_();
-    $self->read_root_file_();
-    $self->read_repository_file_();
-    $self->read_tag_file_();
-
-    if ( -e $self->{directory} . '/CVS/Entries.Static' ) {
-        $self->{is_static} = 1;
-    }
-
-    $self->{parsed_from_dir_}++;
-}
-
-sub open_admin_file_
-{
-    my $self  = shift;
-    my $file  = shift;
-    my $write = shift;
-
-    my $path = $self->{directory} . "/CVS/" . $file;
-    # read Entries file
-    my $fh = IO::File->new( $write ? ">$path" : "<$path");
-    if ( !defined($fh) ) {
-        my $mode = $write ? 'writing' : 'reading';
-        croak("PCVSLIB::Directory::open_admin_file_(): can't open file for $mode: '$path': $!");
-    }
-    return $fh;
-}
-
-sub rename_tmp
-{
-    my $self = shift;
-    my $old  = $self->{directory} . "/CVS/" . shift;
-    my $new  = $self->{directory} . "/CVS/" . shift;
-
-    if ( -e $new ) {
-        if ( !unlink($new) ) {
-            croak("PCVSLIB::Directory::rename_tmp(): can't unlink file: '$new': $!");
-        }
-    }
-
-    if ( !rename($old, $new) ) {
-        croak("PCVSLIB::Directory::rename_tmp(): can't rename file: '$old' -> '$new': $!");
-    }
-}
-
-sub unlink_file_
-{
-    my $self = shift;
-
-    my $path  = $self->{directory} . "/CVS/" . shift;
-
-    if ( -e $path ) {
-        if ( !unlink($path) ) {
-            croak("PCVSLIB::Directory::unlink_file_(): can't unlink '$path': $!");
-        }
-    }
-}
-
-sub touch_file_
-{
-    my $self = shift;
-
-    my $path  = $self->{directory} . "/CVS/" . shift;
-
-    my $fh = IO::File->new( ">$path");
-    if ( !defined($fh) ) {
-        croak("PCVSLIB::Directory::touch_file_(): can't write to file '$path': $!");
-    }
-    $fh->close();
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Entry.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Entry.pm
deleted file mode 100644
index a9ce5d23cd57..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Entry.pm
+++ /dev/null
@@ -1,218 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Entry.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Entry.pm - package for manipulating Entry objects
-#
-
-package PCVSLib::Entry;
-
-use Carp;
-use Time::Local;
-
-use PCVSLib::Time;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $entry_string = shift;
-    my $self = {};
-    $self->{is_directory} = 0;
-    $self->{name}         = undef;
-    $self->{version}      = undef;
-    $self->{is_merge}     = 0;
-    $self->{is_conflict}  = 0;
-    $self->{options}      = undef;
-    $self->{tag}          = undef;
-    $self->{timestamp}    = undef;
-    $self->{to_server}    = 0;      # is entry intended to be send to server?
-    $self->{is_resolved}  = 0;
-
-    # private members
-    $self->{cached_string_} = undef;
-    bless ($self, $class);
-
-    if ( defined($entry_string) ) {
-        $self->parse_entry_string($entry_string);
-        $self->{cached_string_} = $entry_string;
-    }
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(is_directory name version is_merge is_conflict options tag timestamp to_server is_resolved) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        if ( @_ ) {
-            $self->{$datum} = shift;
-            # invalidate cached string
-            $self->{cached_string_} = undef;
-        }
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub to_string
-{
-    my $self                 = shift;
-
-    if ( defined($self->{cached_string_}) ) {
-        return $self->{cached_string_};
-    }
-    else {
-        my $name = $self->{name};
-        croak("PCVSLib::to_string(): internal error: missing name") if !defined($name);
-        if ( $self->{is_directory} ) {
-            return "D/$name////";
-        }
-        else {
-            my $version = $self->{version};
-            if ( !$version ) {
-                croak("PCVSLib::to_string(): internal error: missing implementation");
-            }
-            my $conflict;
-            if ( $self->{to_server} ) {
-                # The conflict field of the entry string has a slightly different format
-                # if send to the server or is written to an admin file.
-                if ( $self->is_conflict() ) {
-                    if ( $self->{is_resolved} ) {
-                        $conflict = '+';
-                    }
-                    else {
-                        $conflict = '+=';
-                    }
-                }
-                else {
-                    $conflict = '';
-                }
-            }
-            else {
-                if ( $version eq '0' || $version =~ /^\-/) {
-                    $conflict = 'dummy timestamp';
-                }
-                elsif ( $self->{is_merge} && $self->{is_conflict}) {
-                    $conflict = 'Result of merge+' . PCVSLib::Time::seconds_to_timestr($self->timestamp);
-                }
-                elsif ( $self->{is_merge} ) {
-                        $conflict = 'Result of merge';
-                }
-                else {
-                    $conflict = PCVSLib::Time::seconds_to_timestr($self->timestamp);
-                }
-            }
-            my $options = $self->{options} ? $self->{options} : '';
-            my $tag = $self->{tag} ? "T" . $self->{tag} : '';
-
-            return "/$name/$version/$conflict/$options/$tag";
-        }
-    }
-}
-
-sub is_binary
-{
-    my $self = shift;
-    if ( $self->{options} && $self->{options} =~ /-kb/ ) {
-        return 1;
-    }
-    return 0;
-}
-
-#### private methods ####
-
-sub parse_entry_string
-{
-    my $self         = shift;
-    my $entry_string = shift;
-
-    my @items = split('/', $entry_string);
-    if ( $items[0] eq 'D' ) {
-        $self->{is_directory} = 1;
-        $self->{name} = $items[1];
-    }
-    else {
-        $self->{name}     = $items[1];
-        $self->{version}  = $items[2];
-        $self->{options}  = $items[4];
-    }
-
-    # check the 'conflict' field
-    if ( $items[3] ) {
-        if ( $items[3] eq "+=" ) {
-            $self->{is_merge} = 1;
-            $self->{is_conflict} = 1;
-        }
-        elsif ( $items[3] =~ /^Result of merge$/ ) {
-            $self->{is_merge} = 1;
-        }
-        elsif ( $items[3] =~ /^Result of merge\+(.*)$/ ) {
-            $self->{is_merge} = 1;
-            $self->{is_conflict} = 1;
-            $self->{timestamp} = PCVSLib::Time::timestr_to_seconds($1);
-        }
-        elsif ( $items[3] =~ /^dummy timestamp$/ ) {
-        }
-        else {
-            $self->{timestamp} = PCVSLib::Time::timestr_to_seconds($items[3]);
-            if ( !$self->{timestamp} ) {
-                croak("PCVSLIB::Entry::parse_entry_string(): invalid entry string: '$entry_string'");
-            }
-        }
-    }
-
-    if ( $items[4] ) {
-        $self->{options} = $items[4];
-    }
-    if ( $items[5] ) {
-        if ( $items[5] =~ /^T(.*)/ ) {
-            $self->{tag} = $1;
-        }
-        elsif ( $items[5] =~ /^D(.*)/ ) {
-            $self->{timestamp} = $self->timestr_to_seconds($1);
-        }
-        else {
-            croak("PCVSLIB::Entry::parse_entry_string(): invalid entry string: '$entry_string'");
-        }
-    }
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Event.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Event.pm
deleted file mode 100644
index 15747107d689..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Event.pm
+++ /dev/null
@@ -1,337 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Event.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Event.pm - encapuslates events triggered by Responses
-#
-
-package PCVSLib::Event;
-
-use Carp;
-
-use PCVSLib::Time;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{event_data} = shift;
-    # private members
-
-    bless ($self, $class);
-
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(event_data) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-#### private methods ####
-
-package PCVSLib::MessageEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_message
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::MTEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_message
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::ErrorMessageEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_message
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::TerminatedEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub is_success
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::ValidRequestsEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_valid_requests
-{
-    my $self          = shift;
-
-    my @valid_requests = split(" ", $self->{event_data});
-
-    return \@valid_requests;
-}
-
-package PCVSLib::ClearStickyEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_directory
-{
-    my $self          = shift;
-
-    return $self->{event_data}->local_directory();
-}
-
-sub get_repository
-{
-    my $self          = shift;
-
-    return $self->{event_data}->repository();
-}
-
-package PCVSLib::SetStickyEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_directory
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[0]->local_directory();
-}
-
-sub get_repository
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[0]->repository();
-}
-
-sub get_tag
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[1];
-}
-
-package PCVSLib::SetStaticDirectoryEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_directory
-{
-    my $self          = shift;
-
-    return $self->{event_data}->local_directory();
-}
-
-sub get_repository
-{
-    my $self          = shift;
-
-    return $self->{event_data}->repository();
-}
-
-package PCVSLib::ClearStaticDirectoryEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_directory
-{
-    my $self          = shift;
-
-    return $self->{event_data}->local_directory();
-}
-
-sub get_repository
-{
-    my $self          = shift;
-
-    return $self->{event_data}->repository();
-}
-
-package PCVSLib::ModuleExpansionEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_module_expansion
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::UpdatedEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_file
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::MergedEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_file
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::CreatedEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_file
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::UpdateExistingEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_file
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::ModTimeEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_modification_time
-{
-    my $self          = shift;
-
-    return PCVSLib::Time::rfc822_1123_to_seconds($self->{event_data});
-}
-
-package PCVSLib::ModeEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_mode
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::CheckedInEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_path_name
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[0];
-}
-
-sub get_entry
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[1];
-}
-
-package PCVSLib::RemoveEntryEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_path_name
-{
-    my $self          = shift;
-
-    return $self->{event_data};
-}
-
-package PCVSLib::CopyFileEvent;
-use vars('@ISA');
-@ISA=('PCVSLib::Event');
-
-sub get_path_name
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[0];
-}
-
-sub get_new_name
-{
-    my $self          = shift;
-
-    return $self->{event_data}->[1];
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/EventHandler.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/EventHandler.pm
deleted file mode 100644
index a717014332ce..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/EventHandler.pm
+++ /dev/null
@@ -1,108 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: EventHandler.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# EventHandler.pm - notifies listeners about incoming events
-#
-
-package PCVSLib::EventHandler;
-
-use Carp;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    # private members
-    $self->{listeners_}  = ();
-    bless ($self, $class);
-    return $self;
-}
-
-#### public methods ####
-
-sub add_listener
-{
-    my $self     = shift;
-    my $listener = shift;
-
-    if ( $listener->can('notify') ) {
-        push(@{$self->{listeners_}}, $listener);
-    }
-    else {
-        croak("PCVSLIB::EventHandler::add_listener(): added object is not a listener");
-    }
-}
-
-sub remove_listener
-{
-    my $self     = shift;
-    my $listener = shift;
-
-    my $num_listeners = scalar(@{$self->{listeners_}});
-
-    my $index = -1;
-    for (my $i = 0; $i < $num_listeners; $i++) {
-         if ( $self->{listeners_}->[$i] == $listener ) {
-             $index = $i;
-             last;
-         }
-    }
-
-    if ( $index == -1 ) {
-        croak("PCVSLIB::EventHandler::remove_listener(): to be removed object not in listener list");
-    }
-    else {
-        splice(@{$self->{listeners_}}, $index, 1);
-    }
-}
-
-sub send_event
-{
-    my $self  = shift;
-    my $event = shift;
-
-    foreach ( @{$self->{listeners_}} ) {
-        $_->notify($event);
-    }
-}
-
-#### private methods ####
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/File.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/File.pm
deleted file mode 100644
index 2f3afb693b7e..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/File.pm
+++ /dev/null
@@ -1,278 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: File.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# File.pm - package for encapsulating file data
-#
-
-package PCVSLib::File;
-
-use Carp;
-
-use PCVSLib::ModeTime;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $path_name_string = shift;
-    my $self = {};
-
-    $self->{path_name}       = undef;
-    $self->{entry}           = undef;
-    $self->{mode}            = undef;
-    $self->{size}            = undef;
-    $self->{io_handle}       = undef;
-
-    bless ($self, $class);
-
-    if ( defined($path_name_string) ) {
-        $self->{path_name} = $path_name_string;
-    }
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(path_name entry mode size io_handle) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub read_and_send
-{
-    my $self = shift;
-
-    my $path = $self->{path_name}->local_path();
-    my @sb = stat($path);
-    if ( !@sb ) {
-        croak("PCVSLib::File::read(): can't stat file '$path': $!");
-    }
-
-    my $mode = PCVSLib::ModeTime->new($path);
-    $self->{mode} = $mode->get_mode();
-
-    # transfer mode
-    $self->{io_handle}->print($self->{mode} ."\n");
-
-    # Textfiles: copy to temporary file and apply any needed conversion. We
-    # do this for Unix, too, to catch and remove any spurios CR characters. After
-    # that send the temporary file to CVS server
-
-    # The tempfile is created in the tmp file standard directory, which is supposed
-    # to be fast. Additional advantage: no need for writing rights in
-    # $self->{path_name}->local_dir()
-
-    my $inh;
-    if ( $self->is_binary() ) {
-        $self->{size} = $sb[7];
-        my $inh = IO::File->new("<$path");
-        if ( !defined($inh) ) {
-            croak("PCVSLib::File::read(): can't open file '$path' for reading: $!");
-        }
-        binmode($inh);
-    }
-    else {
-        $inh = IO::File->new_tmpfile();
-        if ( !defined($inh) ) {
-            croak("PCVSLib::File::read(): can't create temporary file: $!");
-        }
-        binmode($inh);
-        my $fh = IO::File->new("<$path");
-        if ( !defined($fh) ) {
-            croak("PCVSLib::File::read(): can't open file '$path' for reading: $!");
-        }
-
-        my $line;
-        while($line = $fh->getline()) {
-            $line =~ s/\r//;
-            $inh->print($line);
-        }
-
-        $fh->close();
-        $inh->flush();
-        if ( !$inh->seek(0, 0) ) { # rewind
-            croak("PCVSLib::File::read(): can't rewind temporary file: $!");
-        }
-
-        my @sb = $inh->stat();
-        if ( !@sb ) {
-            croak("PCVSLib::File::read(): can't stat temporary file: $!");
-        }
-        $self->{size} = $sb[7];
-    }
-
-    # transfer size
-    $self->{io_handle}->print($self->{size} ."\n");
-
-    my $nbytes = $self->{size};
-    my $buffer;
-    my $nwant;
-    my $nread;
-    while ( $nbytes > 0 ) {
-        $nwant = ($nbytes < 32768) ? $nbytes : 32768;
-        $nread = $inh->read($buffer, $nwant);
-        if ( !defined ($nread) ) {
-            $inh->close();
-            croak("PCVSLib::File::read(): reading temporary file failed: $!");
-        }
-        if ( $nread < $nwant ) {
-            $inh->close();
-            croak("PCVSLib::File::read(): short read from temporary file");
-        }
-        if ( !$self->{io_handle}->write($buffer, $nread) ) {
-            $inh->close();
-            croak("PCVSLib::File::save(): can't write to CVS server: $!");
-        }
-        $nbytes -= $nread;
-    }
-    $inh->close();
-}
-
-sub receive_and_save
-{
-    my $self = shift;
-
-    # get the mode of the transferred file
-    $self->{mode} = $self->io_handle->getline();
-    chomp($self->{mode});
-
-
-    # get the size of the transferred file
-    $self->{size} = $self->io_handle->getline();
-    chomp($self->{size});
-
-    my $localdir = $self->{path_name}->local_directory();
-    my $name = $self->{path_name}->name();
-
-    my $path = $localdir . '/' . $name;
-
-    if ( -e $path ) {
-        if ( !unlink($path) ) {
-            croak("PCVSLib::File::save(): can't unlink '$path': $!");
-        }
-    }
-
-    # Textfiles: save first in a temporary file, apply any conversion if needed and
-    # rename/copy the file to $path.
-
-    # The temporary file is created in the destination directory,
-    # this is for the most cases (Unix, binary files) the most efficent way - only
-    # an additional rename needed - and writing rights in directory are required anyway.
-
-    my $tmp_file = $localdir . '/' . ".#$name.tmp";
-
-    my $tmph = IO::File->new(">$tmp_file");
-    if ( !defined($tmph) ) {
-        croak("PCVSLib::File::save(): can't open file '$tmp_file' for writing: $!");
-    }
-    binmode($tmph);
-
-    my $buffer;
-    my $nbytes = $self->{size};
-    my $nwant;
-    my $nread;
-    while ( $nbytes > 0 ) {
-        $nwant = ($nbytes < 32768) ? $nbytes : 32768;
-        $nread = $self->{io_handle}->read($buffer, $nwant);
-        if ( !defined ($nread) ) {
-            croak("PCVSLib::File::save(): reading from CVS server socket failed: $!");
-        }
-        if ( $nread < $nwant ) {
-            croak("PCVSLib::File::save(): short read from CVS server socket");
-        }
-        if ( !$tmph->write($buffer, $nread) ) {
-            $tmph->close();
-            unlink($tmp_file);
-            croak("PCVSLib::File::save(): can't write to file '$tmp_file': $!");
-        }
-        $nbytes -= $nread;
-    }
-    $tmph->close();
-
-    # copy with conversion for text files on Windows
-    if ($^O eq 'MSWin32' && !$self->is_binary()) {
-        carp("WARNING: Windows file handling is (still) completly untested, check carefully");
-        my $inh = IO::File->new("<$tmp_file");
-        if ( !defined($inh) ) {
-            croak("PCVSLib::File::save(): can't open file '$tmp_file' for reading: $!");
-        }
-        my $outh = IO::File->new(">$path");
-        if ( !defined($inh) ) {
-            croak("PCVSLib::File::save(): can't open file '$tmp_file' for reading: $!");
-        }
-        while($inh->getline()){
-            $outh->print($_);
-        }
-        $inh->close();
-        $outh->close();
-        if ( !unlink($tmp_file) ) {
-            croak("PCVSLib::File::save(): can't unlink '$tmp_file': $!");
-        }
-    }
-    else {
-        if ( !rename($tmp_file, $path) ) {
-            croak("PCVSLib::File::save(): can't rename '$tmp_file' to '$path': $!");
-        }
-    }
-
-    # finally set the right permissions
-    my $mode = PCVSLib::ModeTime->new($path);
-    $mode->set_mode($self->{mode});
-}
-
-#### private methods ####
-
-sub is_binary
-{
-    my $self = shift;
-
-    if ( !defined $self->{entry} ) {
-        croak("PCVSLib::File::is:binary(): internal error: entry line not set");
-    }
-
-    return $self->{entry}->is_binary();
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Listener.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Listener.pm
deleted file mode 100644
index 329ec7e25c38..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Listener.pm
+++ /dev/null
@@ -1,343 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Listener.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Listener.pm - package Listener provides the internal listeners for PCVSLib Responses
-#
-
-
-package PCVSLib::Listener;
-
-use Carp;
-
-use PCVSLib::Directory;
-use PCVSLib::Event;
-use PCVSLib::ModeTime;
-
-use strict;
-use warnings;
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{message}    = undef;
-    $self->{is_success} = 0;
-    bless ($self, $class);
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(is_success message) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa('PCVSLib::ErrorMessageEvent') ) {
-        $self->{message} = $event->get_message();
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        $self->{is_success} = $event->is_success();
-    }
-}
-
-
-# Used for all internal commands
-package PCVSLib::InternalListener;
-use vars('@ISA');
-
-use Carp;
-use File::Basename;
-
-@ISA=('PCVSLib::Listener');
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{module_expansion}  = undef;
-    $self->{root} = undef
-    # private members
-    $self->{last_mode_} = undef;
-    $self->{touched_dirs_} = ();
-    $self->{needs_directories_update_} = 0;
-    $self->{last_modification_time_}   = 0;
-    bless ($self, $class);
-    return $self;
-}
-
-for my $datum qw(module_expansion) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        return $self->{$datum};
-    }
-}
-
-for my $datum qw(root) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    $self->SUPER::notify($event);
-
-    if ( $event->isa('PCVSLib::ModuleExpansionEvent') ) {
-        $self->{module_expansion}  = $event->get_module_expansion();
-    }
-    if ( $event->isa('PCVSLib::ModTimeEvent') ) {
-        $self->{last_modification_time_}  = $event->get_modification_time();
-    }
-    if ( $event->isa('PCVSLib::SetStickyEvent') ) {
-        my $dir = $event->get_directory();
-        my $repository = $event->get_repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        my $tag = $event->get_tag();
-        $directory->tag($tag);
-    }
-    if ( $event->isa('PCVSLib::ClearStickyEvent') ) {
-        my $dir = $event->get_directory();
-        my $repository = $event->get_repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $directory->tag('');
-    }
-    if ( $event->isa('PCVSLib::CreatedEvent') ) {
-        my $file  = $event->get_file();
-        my $dir = $file->path_name()->local_directory();
-        my $repository = $file->path_name()->repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $file->receive_and_save();
-
-        my $entry = $file->entry();
-        if ( $self->{last_modification_time_} ) {
-            my $mode_time = PCVSLib::ModeTime->new($file->path_name()->local_path());
-            $mode_time->touch($self->{last_modification_time_});
-            $entry->timestamp($self->{last_modification_time_});
-            $self->{last_modification_time_} = 0;
-        }
-        else {
-            croak("PCVSLIB::Listener::notify(): 'Created' response was not preceded by 'Mod-time' response");
-        }
-        $directory->set_entry($entry->name(), $entry);
-        $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::UpdateExistingEvent') ) {
-        my $file  = $event->get_file();
-        $file->receive_and_save();
-        my $entry = $file->entry();
-
-        # File time stamp and time_stamp() in entry line
-        # need to refer to exact the same time
-        my $mode_time = PCVSLib::ModeTime->new($file->path_name()->local_path());
-
-        my $time = time();
-        $mode_time->touch($time);
-        $entry->timestamp($time);
-
-        # update administrative files
-        my $dir = $file->path_name()->local_directory();
-        my $repository = $file->path_name()->repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $directory->set_entry($entry->name(), $entry);
-        $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::ModeEvent') ) {
-        $self->{last_mode_}  = $event->get_mode();
-    }
-    if ( $event->isa('PCVSLib::CheckedInEvent') ) {
-        my $path_name = $event->get_path_name();
-        my $dir = $path_name->local_directory();
-        my $path = $path_name->local_path();
-        my $repository = $path_name->repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        my $entry     = PCVSLib::Entry->new($event->get_entry());
-
-        # TODO: keyword expansion -> needs to be done here
-        my $mode_time = PCVSLib::ModeTime->new($path);
-        if ( $self->{last_mode_} ) {
-            $mode_time->set_mode($self->{last_mode_});
-            $self->{last_mode_} = undef;
-        }
-
-        if ( $entry->version() =~ /^-/ ) {
-            $entry->timestamp(0);
-        }
-        else {
-            # File time stamp and time_stamp() in entry line
-            # need to refer to exact the same time
-            my $time = time();
-            $mode_time->touch($time);
-            $entry->timestamp($time);
-        }
-
-        $directory->set_entry($entry->name(), $entry);
-           $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::CopyFileEvent') ) {
-        my $path_name = $event->get_path_name();
-        my $path      = $path_name->local_path();
-        my $dir       = $path_name->local_directory();
-        my $new_name  = "$dir/" . $event->get_new_name();
-        # CVS protocoll document: this can optionally be implemented as a 'rename'
-        if ( -e $new_name ) {
-            if ( !unlink($new_name) ) {
-                croak("PCVSLIB::UpdateListener::notify(): can't unlink '$new_name': $!");
-            }
-        }
-        if ( !rename($path, $new_name) ) {
-            croak("PCVSLIB::UpdateListener::notify(): can't unlink '$new_name': $!");
-        }
-    }
-    if ( $event->isa('PCVSLib::MergedEvent') ) {
-        my $file  = $event->get_file();
-        $file->receive_and_save();
-        my $entry = $file->entry();
-
-        # File time stamp and time_stamp() in entry line
-        # need to refer to exact the same time in case of a conflict
-        my $mode_time = PCVSLib::ModeTime->new($file->path_name()->local_path());
-
-        my $time = time();
-        $mode_time->touch($time);
-        $entry->timestamp($time);
-        $entry->is_merge(1); # can't be guessed from the entry line for clean merges
-
-        # update administrative files
-        my $dir = $file->path_name()->local_directory();
-        my $repository = $file->path_name()->repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $directory->set_entry($entry->name(), $entry);
-        $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::ClearStaticDirectoryEvent') ) {
-        my $dir = $event->get_directory();
-        my $repository = $event->get_repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $directory->is_static(0);
-        $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::SetStaticDirectoryEvent') ) {
-        my $dir = $event->get_directory();
-        my $repository = $event->get_repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $directory->is_static(1);
-        $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::RemoveEntryEvent') ) {
-        my $path_name = $event->get_path_name();
-        my $name = $path_name->name();
-        my $dir = $path_name->local_directory();
-        my $repository = $path_name->repository();
-        my $directory = $self->maybe_create_directory($dir, $repository);
-        $directory->remove_entry($name);
-        $self->{needs_directories_update_} = 1;
-    }
-    if ( $event->isa('PCVSLib::TerminatedEvent') ) {
-        if ( $self->{needs_directories_update_} ) {
-            foreach ( keys %{$self->{touched_dirs_}} ) {
-                $self->{touched_dirs_}->{$_}->update();
-            }
-            $self->{needs_directories_update_} = 0;
-        }
-    }
-}
-
-sub maybe_create_directory
-{
-    my $self       = shift;
-    my $dir        = shift;
-    my $repository = shift;
-
-    my $directory;
-    if ( !exists($self->{touched_dirs_}->{$dir}) ) {
-        if ( -d $dir ) {
-            $directory = PCVSLib::Directory->new($dir);
-        }
-        else {
-            $directory = $self->create_directory($dir, $repository);
-        }
-        $self->{touched_dirs_}->{$dir} = $directory;
-    }
-    else {
-        $directory = $self->{touched_dirs_}->{$dir};
-    }
-}
-
-sub create_directory
-{
-    my $self            = shift;
-    my $dir             = shift;
-    my $repository      = shift;
-
-    if ( !mkdir($dir) ) {
-        croak("PCVSLIB::Listener::notify(): can't create directory '$dir': $!");
-    }
-    # add directory entry to parent
-    my ($name, $parent) = fileparse($dir);
-    chop($parent); # remove trailing /
-    if ( exists($self->{touched_dirs_}->{$parent}) ) {
-        my $entry = PCVSLib::Entry->new();
-        $entry->name($name);
-        $entry->is_directory(1);
-        $self->{touched_dirs_}->{$parent}->set_entry($entry->name(), $entry);
-    }
-
-    my $root_dir = $self->{root}->root_dir();
-    my $directory = PCVSLib::Directory->new($dir);
-    $directory->root($self->{root});
-    $directory->repository($repository);
-    return $directory;
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/LogHandle.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/LogHandle.pm
deleted file mode 100644
index 5f3391fa4263..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/LogHandle.pm
+++ /dev/null
@@ -1,134 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: LogHandle.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# LogHandle.pm - package for logging CVS protocol traffic
-#
-
-package PCVSLib::LogHandle;
-use base(IO::Handle);
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $class = shift;
-    my $self = { };
-    $self->{handle}         = shift;    # file handle to be wrapped
-    $self->{logfile}        = shift;    # logfile
-    bless ($self, $class);
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(handle logfile) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub print
-{
-    my $self = shift;
-    if ( $self->logfile() ) {
-        $self->logfile()->print("C: ");
-        $self->logfile()->print(@_);
-    }
-    $self->handle()->print(@_);
-}
-
-sub getline
-{
-    my $self = shift;
-
-    my $line = $self->handle()->getline();
-    if ( $self->logfile() ) {
-        $self->logfile()->print("S: ");
-        $self->logfile()->print($line);
-    }
-    return $line;
-}
-
-sub read
-{
-    my $self   = shift;
-
-    my $nbytes = $self->handle()->read(@_);
-    if ( $self->logfile() ) {
-        $self->logfile()->print("S: send file:\n");
-        if ( $nbytes > 512 ) {
-            $self->logfile()->print("... $nbytes of data ...\n");
-        }
-        else {
-            $self->logfile()->print($_[0]);
-        }
-    }
-    return $nbytes;
-}
-
-sub write
-{
-    my $self = shift;
-
-    if ( $self->logfile() ) {
-        $self->logfile()->print("C: send file\n");
-        if ($_[1] > 512) {
-            $self->logfile()->print("... $_[1] of data ...\n");
-        }
-        else {
-            $self->logfile()->print($_[0]);
-        }
-    }
-    return $self->handle()->write(@_);
-}
-
-sub shutdown
-{
-    my $self = shift;
-    if ( $self->logfile() ) {
-        $self->logfile()->print("C: shutdown server socket\n");
-    }
-
-    return $self->handle()->shutdown(@_);
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/ModeTime.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/ModeTime.pm
deleted file mode 100644
index 504025bf5144..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/ModeTime.pm
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: ModeTime.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# ModeTime.pm - helper class for getting and setting file mode and
-#               modification time
-#
-
-package PCVSLib::ModeTime;
-
-use Carp;
-use Fcntl ':mode';
-
-use strict;
-use warnings;
-
-use PCVSLib::Time;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $path_string = shift;
-    my $self = {};
-
-    $self->{path} = undef;
-
-    bless ($self, $class);
-
-    if ( defined($path_string) ) {
-        $self->{path} = $path_string;
-    }
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(path) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub get_mode
-{
-    my $self = shift;
-
-    my $path = $self->{path};
-    my @sb = stat($path);
-    if ( !@sb ) {
-        croak("PCVSLib::Mode::get_mode(): can't stat file '$path': $!");
-    }
-
-    return $self->numeric_to_mode($sb[2]);
-}
-
-sub set_mode
-{
-    my $self = shift;
-    my $mode = shift;
-
-    my $numeric_mode = $self->mode_to_numeric($mode);
-    my $path = $self->{path};
-    if ( !chmod($numeric_mode, $path) ) {
-        croak("PCVSLib::File::set_mode(): can't change permission on file '$path': $!");
-    }
-}
-
-sub touch
-{
-    my $self = shift;
-    my $time = shift;
-
-    my $path = $self->{path};
-
-    if ( !utime($time, $time, $path) ) {
-        croak("PCVSLib::ModeTime::touch(): can't set modification time of '$path': $!");
-    }
-}
-
-#### private methods ####
-
-sub numeric_to_mode
-{
-    my $self         = shift;
-    my $numeric_mode = shift;
-
-    my $mode = 'u=';
-    $mode .= 'r' if $numeric_mode & S_IRUSR;
-    $mode .= 'w' if $numeric_mode & S_IWUSR;
-    $mode .= 'x' if $numeric_mode & S_IXUSR;
-    $mode .= ',g=';
-    $mode .= 'r' if $numeric_mode & S_IRGRP;
-    $mode .= 'w' if $numeric_mode & S_IWGRP;
-    $mode .= 'x' if $numeric_mode & S_IXGRP;
-    $mode .= ',o=';
-    $mode .= 'r' if $numeric_mode & S_IROTH;
-    $mode .= 'w' if $numeric_mode & S_IWOTH;
-    $mode .= 'x' if $numeric_mode & S_IXOTH;
-
-    return $mode;
-}
-
-sub mode_to_numeric
-{
-    my $self         = shift;
-    my $mode         = shift;
-
-    my ($user, $group, $other) = split(/,/, $mode);
-    my $numeric_mode = 0;
-
-    $numeric_mode |= S_IRUSR if $user  =~ /r/;
-    $numeric_mode |= S_IWUSR if $user  =~ /w/;
-    $numeric_mode |= S_IXUSR if $user  =~ /x/;
-    $numeric_mode |= S_IRGRP if $group =~ /r/;
-    $numeric_mode |= S_IWGRP if $group =~ /w/;
-    $numeric_mode |= S_IXGRP if $group =~ /x/;
-    $numeric_mode |= S_IROTH if $other =~ /r/;
-    $numeric_mode |= S_IWOTH if $other =~ /w/;
-    $numeric_mode |= S_IXOTH if $other =~ /x/;
-
-    return $numeric_mode;
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/PathName.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/PathName.pm
deleted file mode 100644
index 8e4ecb9b091c..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/PathName.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: PathName.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# PathName.pm - package for encapsulating 'pathnames'. Many Responses return
-#               a pathname, see the cvs client documentation for details
-#
-
-package PCVSLib::PathName;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-
-    $self->{local_directory} = undef;
-    $self->{repository}      = undef;
-    $self->{name}            = undef;
-
-    bless ($self, $class);
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(local_directory repository name) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-# conveniance method
-sub local_path
-{
-    my $self = shift;
-    my $dir  = $self->{local_directory};
-    my $name = $self->{name};
-
-    if ( !defined($dir) || !defined($name) ) {
-        croak("PCVSLib::PathName::local_path(): path_name not set");
-    }
-    else {
-        return "$dir/$name";
-    }
-}
-
-#### public methods ####
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Request.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Request.pm
deleted file mode 100644
index 661995550ed4..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Request.pm
+++ /dev/null
@@ -1,433 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Request.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Request.pm - packages for creating and sending Requests
-#
-
-package PCVSLib::Request;
-
-use Carp;
-
-use strict;
-use warnings;
-
-use PCVSLib::Response;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{request_data}    = shift;
-    $self->{additional_data} = shift;
-    $self->{file}            = shift;
-    # private members
-
-    bless ($self, $class);
-
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(request_data additional_data file) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub response_expected {
-    return 0;
-}
-
-sub additional_data_attached {
-    return 0;
-}
-
-sub file_attached {
-    return 0;
-}
-
-#### private methods ####
-
-package PCVSLib::VersionRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    return "version\n"
-}
-
-package PCVSLib::ValidRequestsRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    return "valid-requests\n"
-}
-
-package PCVSLib::ValidResponsesRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $valid_responses_str = join(" ", @{PCVSLib::Response::valid_responses()});
-    return "Valid-responses $valid_responses_str\n"
-}
-
-package PCVSLib::RootRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Root " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::UseUnchangedRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    return "UseUnchanged\n"
-}
-
-package PCVSLib::DirectoryRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-use Carp;
-
-sub additional_data_attached
-{
-    my $self = shift;
-    if ( !$self->{additional_data} ) {
-        croak("PCVSLIB::ModifiedRequest(): additional request data missing");
-    }
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "Directory " . $self->{request_data} . "\n";
-}
-
-sub additional_data_to_string
-{
-    my $self = shift;
-
-    return $self->{additional_data} . "\n";
-}
-
-package PCVSLib::ArgumentRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Argument " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::ArgumentxRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Argumentx " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::EntryRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Entry " . $self->{request_data}->to_string() . "\n";
-}
-
-package PCVSLib::LogRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    return "log\n";
-}
-
-package PCVSLib::StatusRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "status\n";
-}
-
-package PCVSLib::RLogRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "rlog\n";
-}
-
-package PCVSLib::RDiffRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "rdiff\n";
-}
-
-package PCVSLib::TagRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "tag\n";
-}
-
-package PCVSLib::CheckoutRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    return "co\n"
-}
-
-package PCVSLib::ExpandModulesRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    return "expand-modules\n"
-}
-
-package PCVSLib::UnchangedRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Unchanged " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::ModifiedRequest;
-use vars('@ISA');
-use Carp;
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Modified " . $self->{request_data} . "\n";
-}
-
-sub file_attached
-{
-    return 1;
-}
-
-package PCVSLib::IsModifiedRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Is-modified " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::QuestionableRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Questionable " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::StaticDirectoryRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Static-directory\n";
-}
-
-package PCVSLib::StickyRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub to_string
-{
-    my $self = shift;
-    return "Sticky " . $self->{request_data} . "\n";
-}
-
-package PCVSLib::NoOpRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    return "noop\n"
-}
-
-package PCVSLib::CiRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "ci\n";
-}
-
-package PCVSLib::UpdateRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "update\n";
-}
-
-package PCVSLib::RemoveRequest;
-use vars('@ISA');
-@ISA=('PCVSLib::Request');
-
-sub response_expected
-{
-    return 1;
-}
-
-sub to_string
-{
-    my $self = shift;
-    return "remove\n";
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Response.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Response.pm
deleted file mode 100644
index e8c1f54e3bc8..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Response.pm
+++ /dev/null
@@ -1,688 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Response.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Response.pm - packages for receiving and processing Responses
-#
-
-package PCVSLib::Response;
-
-use Carp;
-use File::Basename;
-
-use strict;
-use warnings;
-
-use PCVSLib::Event;
-use PCVSLib::File;
-use PCVSLib::PathName;
-
-# Response factory (class method)
-sub create_response
-{
-    my $self = shift; # ignore
-    my $event_handler = shift;
-    my $io_handle     = shift;
-
-    my $response_string = $io_handle->getline();
-
-    if ( $response_string =~ /^M (.*)$/ ) {
-        my $message = $1;
-        my $response = PCVSLib::MessageResponse->new($event_handler, $message);
-        return $response;
-    }
-    if ( $response_string =~ /^MT (.*)$/ ) {
-        my $message = $1;
-        my $response = PCVSLib::MTResponse->new($event_handler, $message);
-        return $response;
-    }
-    elsif ( $response_string =~ /^E (.*)$/ ) {
-        my $error_message = $1;
-        my $response = PCVSLib::ErrorMessageResponse->new($event_handler, $error_message);
-        return $response;
-    }
-    elsif ( $response_string =~ /^F$/ ) {
-        my $response = PCVSLib::FlushResponse->new($event_handler);
-        return $response;
-    }
-    elsif ( $response_string =~ /^error (.*)$/ ) {
-        my $error_message = $1;
-        my $response = PCVSLib::ErrorResponse->new($event_handler, $error_message);
-        return $response;
-    }
-    elsif ( $response_string =~ /^ok/ ) {
-        my $response = PCVSLib::SuccessResponse->new($event_handler);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Valid-requests (.*)$/ ) {
-        my $request_list_str = $1;
-        my $response = PCVSLib::ValidRequestsResponse->new($event_handler, $request_list_str);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Clear-sticky (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $response = PCVSLib::ClearStickyResponse->new($event_handler, $pathname);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Set-sticky (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $tag = $io_handle->getline();
-        chomp($tag);
-        my $response = PCVSLib::SetStickyResponse->new($event_handler, [$pathname, $tag]);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Clear-static-directory (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $response = PCVSLib::ClearStaticDirectoryResponse->new($event_handler, $pathname);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Set-static-directory (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $response = PCVSLib::SetStaticDirectoryResponse->new($event_handler, $pathname);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Module-expansion (.*)$/ ) {
-        my $module_expansion = $1;
-        my $response = PCVSLib::ModuleExpansionResponse->new($event_handler, $module_expansion);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Updated (.*)$/ ) {
-        # We support 'Created' and 'Update-existing' rseponses, no server should ever
-        # send am 'Updated' response.
-        carp("PCVSLIB::Response::create_response(): unexpected response 'Updated'");
-        my $path_name = $self->get_path_name($1, $io_handle);
-        my $file = $self->get_transmitted_file_($path_name, $io_handle);
-        my $response = PCVSLib::UpdatedResponse->new($event_handler, $file);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Merged (.*)$/ ) {
-        my $path_name = $self->get_path_name($1, $io_handle);
-        my $file = $self->get_transmitted_file_($path_name, $io_handle);
-        my $response = PCVSLib::MergedResponse->new($event_handler, $file);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Update-existing (.*)$/ ) {
-        my $path_name = $self->get_path_name($1, $io_handle);
-        my $file = $self->get_transmitted_file_($path_name, $io_handle);
-        my $response = PCVSLib::UpdateExistingResponse->new($event_handler, $file);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Created (.*)$/ ) {
-        my $path_name = $self->get_path_name($1, $io_handle);
-        my $file = $self->get_transmitted_file_($path_name, $io_handle);
-        my $response = PCVSLib::CreatedResponse->new($event_handler, $file);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Mod-time (.*)$/ ) {
-        my $mod_time = $1;
-        my $response = PCVSLib::ModTimeResponse->new($event_handler, $mod_time);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Mode (.*)$/ ) {
-        my $mode = $1;
-        my $response = PCVSLib::ModeResponse->new($event_handler, $mode);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Checked-in (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $entry = $io_handle->getline();
-        chomp($entry);
-        my $response = PCVSLib::CheckedInResponse->new($event_handler, [$pathname, $entry]);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Remove-entry (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $response = PCVSLib::RemoveEntryResponse->new($event_handler, $pathname);
-        return $response;
-    }
-    elsif ( $response_string =~ /^Copy-file (.*)$/ ) {
-        my $pathname = $self->get_path_name($1, $io_handle);
-        my $new_name = $io_handle->getline();
-        chomp($new_name);
-        my $response = PCVSLib::CopyFileResponse->new($event_handler, [$pathname, $new_name]);
-        return $response;
-    }
-    else {
-        croak("PCVSLIB::Response::create_response(): internal error: unexpected response '$response_string'");
-    }
-}
-
-my %ResponseClassData = (
-    valid_responses => []
-);
-
-# class data accessor methods
-for my $datum (qw(valid_responses)) {
-    no strict "refs";
-    *$datum = sub {
-        shift; # ignore calling class/object
-        return $ResponseClassData{$datum};
-    }
-}
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{event_handler}   = shift;
-    $self->{response_data}   = shift;
-    $self->{io_handle}       = shift;
-    # private members
-
-    bless ($self, $class);
-
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(event_handler response_data io_handle) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub is_last
-{
-    return 0;
-}
-
-# process Response, the default is to do nothing
-sub process
-{
-    return;
-}
-
-#### private methods ####
-
-sub get_transmitted_file_
-{
-    my $self = shift; # ignore
-    my $path_name = shift;
-    my $io_handle = shift;
-
-    # get entry line
-    my $entry_str = $io_handle->getline();
-    chomp($entry_str);
-    my $entry = PCVSLib::Entry->new($entry_str);
-
-    my $file = PCVSLib::File->new($path_name);
-    $file->entry($entry);
-    # transfer the file handle to the PCVSLib file handle,
-    # the content of the file is saved to disk in a checkout or
-    # update Listener
-    $file->io_handle($io_handle);
-
-    return $file;
-}
-
-sub get_path_name
-{
-    my $self      = shift; #ignore
-    my $local_dir = shift;
-    my $io_handle = shift;
-
-    my $pathname = PCVSLib::PathName->new();
-    chop($local_dir); # remove trailing /
-    $pathname->local_directory($local_dir);
-    my $path = $io_handle->getline();
-    chop($path); # remove trailing new line
-    my ($name, $repository) = fileparse($path);
-    chop($repository); # remove trailing /
-
-    $pathname->repository($repository);
-    $pathname->name($name);
-
-    return $pathname;
-}
-
-
-#### derived classes ####
-
-package PCVSLib::SuccessResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "ok");
-
-sub is_last
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::TerminatedEvent->new(1);
-    $self->{event_handler}->send_event($event);
-    return 1;
-}
-
-package PCVSLib::ErrorResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "error");
-
-sub is_last
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::TerminatedEvent->new(0);
-    $self->{event_handler}->send_event($event);
-    return 1;
-}
-
-sub process
-{
-    my $self          = shift;
-
-    if ( $self->response_data =~ /\S/ ) {
-        my $event = PCVSLib::ErrorMessageEvent->new($self->response_data);
-        $self->{event_handler}->send_event($event);
-    }
-}
-
-package PCVSLib::ValidRequestsResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Valid-requests");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ValidRequestsEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::CheckedInResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Checked-in");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::CheckedInEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::NewEntryResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "New-entry");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-}
-
-package PCVSLib::CheckSumResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Checksum");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-package PCVSLib::CopyFileResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Copy-file");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::CopyFileEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::UpdatedResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Updated");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::UpdatedEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::CreatedResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Created");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::CreatedEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::UpdateExistingResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Update-existing");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::UpdateExistingEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::MergedResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Merged");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::MergedEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-use Carp;
-
-package PCVSLib::PatchedResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Patched");
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-use Carp;
-
-package PCVSLib::RcsDiffResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Rcs-diff");
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-package PCVSLib::ModeResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Mode");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ModeEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-
-}
-
-package PCVSLib::ModTimeResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Mod-time");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ModTimeEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::RemovedResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Removed");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-package PCVSLib::RemoveEntryResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Remove-entry");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::RemoveEntryEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::SetStaticDirectoryResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Set-static-directory");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::SetStaticDirectoryEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::ClearStaticDirectoryResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Clear-static-directory");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ClearStaticDirectoryEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::SetStickyResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Set-sticky");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::SetStickyEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::ClearStickyResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Clear-sticky");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ClearStickyEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-#package PCVSLib::TemplateResponse;
-#use vars('@ISA');
-#@ISA=('PCVSLib::Response');
-#push(@{$ResponseClassData{valid_responses}}, "Template");
-
-#use Carp;
-
-#sub process
-#{
-#    my $self          = shift;
-#
-#    carp("Not yet implemented");
-#
-#}
-
-package PCVSLib::NotifiedResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Notified");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-package PCVSLib::ModuleExpansionResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Module-expansion");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ModuleExpansionEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::WrapperRcsOptionsResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Wrapper-rcsOption");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-package PCVSLib::MessageResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "M");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::MessageEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::MbinaryResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "Mbinary");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    carp("Not yet implemented");
-
-}
-
-package PCVSLib::ErrorMessageResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "E");
-
-sub process
-{
-    my $self          = shift;
-
-    my $event = PCVSLib::ErrorMessageEvent->new($self->response_data);
-    $self->{event_handler}->send_event($event);
-}
-
-package PCVSLib::FlushResponse;
-use vars('@ISA');
-@ISA=('PCVSLib::Response');
-push(@{$ResponseClassData{valid_responses}}, "F");
-
-use Carp;
-
-sub process
-{
-    my $self          = shift;
-
-    # Ignore flush responses.
-
-}
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Root.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Root.pm
deleted file mode 100644
index a289bf62f229..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Root.pm
+++ /dev/null
@@ -1,132 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Root.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Root.pm - package for maninpulating Root objects
-#
-
-package PCVSLib::Root;
-
-use Carp;
-
-use strict;
-use warnings;
-
-#### ctor ####
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $root_string = shift;
-    my $self = {};
-    $self->{method}   = shift;
-    $self->{user}     = shift;
-    $self->{host}     = shift;
-    $self->{port}     = shift;
-    $self->{root_dir} = shift;
-    # private members
-    bless ($self, $class);
-
-    if ( defined($root_string) ) {
-        $self->parse_root_string($root_string);
-    }
-    return $self;
-}
-
-#### instance accessors #####
-
-for my $datum qw(method user host port root_dir) {
-    no strict "refs";
-    *$datum = sub {
-        my $self = shift;
-        $self->{$datum} = shift if @_;
-        return $self->{$datum};
-    }
-}
-
-#### public methods ####
-
-sub to_string
-{
-    my $self = shift;
-
-    return ':' . join(':', $self->{method},
-                           $self->{user} . '@' . $self->{host},
-                           $self->{root_dir});
-}
-
-sub to_string_with_port
-{
-    my $self = shift;
-
-    return ':' . join(':', $self->{method},
-                           $self->{user} . '@' . $self->{host},
-                           $self->port . $self->{root_dir});
-}
-
-#### private methods ####
-
-sub parse_root_string
-{
-    my $self = shift;
-    my $root_string = shift;
-
-    my @parts = split(':', $root_string);
-    if ( $parts[1] eq 'pserver' ) {
-        $self->{method} = 'pserver';
-        my ($user, $host) = split('@', $parts[2]);
-        $self->{user} = $user;
-        $self->{host} = $host;
-        if ( $parts[3] =~ /^(\d+)(\/\S+)/ ) {
-            $self->{port} = $1;
-            $self->{root_dir} = $2;
-        }
-        else {
-            $self->{port} = 2401;
-            $self->{root_dir} = $parts[3];
-        }
-        # sanity check
-        if ( !defined($self->{user}) || !defined($self->{host})
-             || !defined($self->{port}) || !defined($self->{root_dir}) )
-        {
-            croak("PCVSLIB::Root::parse_root_string(): can't parse root: '$root_string'");
-        }
-    }
-    else {
-        my $unsupported = $parts[1];
-        croak("PCVSLIB::Root::parse_root_string(): sorry, CVS method '$unsupported' is not implemented yet");
-    }
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Time.pm b/solenv/bin/modules/PCVSLib/lib/PCVSLib/Time.pm
deleted file mode 100644
index f3f3e32b0b1e..000000000000
--- a/solenv/bin/modules/PCVSLib/lib/PCVSLib/Time.pm
+++ /dev/null
@@ -1,124 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: Time.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Time.pm - package for converting time strings to seconds since epoch and back
-#
-
-package PCVSLib::Time;
-
-use Carp;
-use Time::Local;
-
-use strict;
-use warnings;
-
-my %months = (Jan => 0, Feb => 1, Mar => 2, Apr => 3, May => 4, Jun => 5, Jul => 6,
-              Aug => 7, Sep => 8, Oct => 9, Nov => 10, Dec => 11);
-
-sub rfc822_1123_to_seconds
-{
-    my $str = shift;
-
-    # CVS claims to use RFC 822 as modified by RFC 1123 time strings. This
-    # seems not to be entirely true. One tested (older) CVS server sent
-    # the following Mod-Time response:
-    #
-    # Mod-time 2 Aug 2005 14:4:56 -0000
-    #
-    # The minutes in this string are certainly not specified due to RFC 822/1123
-    # way. Use a somewhat relaxed parsing of the time part of the string.
-    if ( $str !~ /^(\d{1,2})\s+(\w\w\w)\s+(\d\d\d\d)\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s+([\+\-])(\d\d)(\d\d)/ )
-    {
-        return undef;
-    }
-
-    my $mday = $1;
-    my $mon  = $months{$2};
-    if ( !defined($mon) ) {
-        croak("PCVSLIB::Time::rfc822_1123_to_seconds(): invalid time: $str");
-    }
-    my $year      = $3;
-    my $hour      = $4;
-    my $min       = $5;
-    my $sec       = $6;
-    my $tz_sign   = $7;
-    my $tz_hours  = $8;
-    my $tz_mins   = $9;
-
-    my $offset_sign = ($tz_sign eq '+') ? +1 : -1;
-    my $offset_secs = $offset_sign * ($tz_hours*3600 + $tz_mins*60);
-
-    return (timegm($sec, $min, $hour, $mday, $mon, $year) - $offset_secs);
-}
-
-sub timestr_to_seconds
-{
-    my $str  = shift;
-
-    if ( $str !~ /^(\w\w\w)\s+(\w\w\w)\s+(\d{1,2})\s+(\d\d):(\d\d):(\d\d)\s+(\d\d\d\d)$/ ) {
-        return undef;
-    }
-    my $mon  = $months{$2};
-    if ( !defined($mon) ) {
-        croak("PCVSLIB::Entry::timestr_to_seconds(): invalid time: $str");
-    }
-    my $mday = $3;
-    my $hour = $4;
-    my $min  = $5;
-    my $sec  = $6;
-    my $year = $7;
-
-    return timegm($sec, $min, $hour, $mday, $mon, $year);
-}
-
-sub seconds_to_timestr
-{
-   my $seconds = shift;
-
-   my $str = gmtime($seconds);
-   return $str;
-}
-
-sub seconds_to_rfc822_1123
-{
-   my $seconds = shift;
-
-   my $str = gmtime($seconds);
-
-   $str =~ /^(\w\w\w)\s+(\w\w\w)\s+(\d{1,2})\s+(\d\d):(\d\d):(\d\d)\s+(\d\d\d\d)$/;
-
-   return "$3 $2 $7 $4:$5:$6 +0000";
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/samples/codemo b/solenv/bin/modules/PCVSLib/samples/codemo
deleted file mode 100755
index cf59f5ebcd5f..000000000000
--- a/solenv/bin/modules/PCVSLib/samples/codemo
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/perl -w
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: codemo,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ('../lib');
-
-use PCVSLib;
-use Getopt::Std;
-
-getopt('-d');
-
-if ( !$opt_d || $#ARGV < 0) {
-    print STDERR "usage: codemo < -d cvsroot > < module >\n";
-    exit(1);
-}
-
-# Create root object
-my $root = PCVSLib::Root->new($opt_d);
-
-# Read scrambled CVS password from $HOME/.cvspass.
-my $credentials = PCVSLib::Credentials->new();
-my $password = $credentials->get_password($root);
-
-# Create a connection to CVS server.
-my $connection = PCVSLib::Connection->new($root, $password);
-
-# Open the connection and insert loging handle
-my $log_handle = IO::File->new(">log");
-my $io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-
-# Create client which takes the connection
-my $client = PCVSLib::Client->new($connection);
-
-# Create event handler.
-my $event_handler = PCVSLib::EventHandler->new();
-
-# Create a listener and register it with the event handler
-my $listener = CVSListener->new();
-$event_handler->add_listener($listener);
-
-# Create a command, fill in options and transfer it to client for
-# execution.
-my $command = PCVSLib::CheckoutCommand->new($event_handler);
-$command->file_list([@ARGV]);
-$client->execute_command($command);
-
-#  Remove listener form event handler and close connection
-$event_handler->remove_listener($listener);
-$connection->close();
-
-# Query the listener if the operation was succesful
-if ( $listener->is_success() ) {
-    print "checkout completed.\n";
-    exit(0);
-}
-else {
-    print "checkout failed!\n";
-    exit(1);
-}
-
-# Simple minded listener for listening on message events etc. Every client listener
-# should implement method 'notify()' and listen at least on 'PCVSLib::TerminatedEvent'.
-package CVSListener;
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{is_success_} = 0;
-    bless ($self, $class);
-    return $self;
-}
-
-sub is_success
-{
-    my $self = shift;
-    return $self->{is_success_};
-}
-
-# 
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa(PCVSLib::ErrorMessageEvent) ) {
-         print $event->get_message() . "\n";
-    }
-    if ( $event->isa(PCVSLib::MessageEvent) ) {
-         print $event->get_message() . "\n";
-    }
-    if ( $event->isa(PCVSLib::TerminatedEvent) ) {
-        $self->{is_success_} = $event->is_success();
-    }
-}
-
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/samples/rlogdemo b/solenv/bin/modules/PCVSLib/samples/rlogdemo
deleted file mode 100755
index 93c8ff866121..000000000000
--- a/solenv/bin/modules/PCVSLib/samples/rlogdemo
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/perl -w
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: rlogdemo,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ('../lib');
-
-use PCVSLib;
-use Getopt::Std;
-
-getopt('-do');
-
-if ( !$opt_d || $#ARGV < 0) {
-    print STDERR "usage: rlogdemo [-o options] < -d cvsroot > < module|file >\n";
-    exit(1);
-}
-
-# Create root object
-my $root = PCVSLib::Root->new($opt_d);
-
-# Read scrambled CVS password from $HOME/.cvspass.
-my $credentials = PCVSLib::Credentials->new();
-my $password = $credentials->get_password($root);
-
-# Create a connection to CVS server.
-my $connection = PCVSLib::Connection->new($root, $password);
-
-# Open the connection and insert loging handle
-my $log_handle = IO::File->new(">log");
-my $io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-
-# Create client which takes the connection
-my $client = PCVSLib::Client->new($connection);
-
-# Create event handler.
-my $event_handler = PCVSLib::EventHandler->new();
-
-# Create a listener and register it with the event handler
-my $listener = CVSListener->new();
-$event_handler->add_listener($listener);
-
-# Create a command, fill in options and transfer it to client for
-# execution.
-my $command = PCVSLib::RLogCommand->new($event_handler);
-$command->file_list([@ARGV]);
-if (defined ($opt_o) ) {
-    $command->options([$opt_o]);
-}
-$client->execute_command($command);
-
-#  Remove listener form event handler and close connection
-$event_handler->remove_listener($listener);
-$connection->close();
-
-# Query the listener if the operation was succesful
-if ( $listener->is_success() ) {
-    foreach ( @{$listener->get_log()} ) {
-        print "$_\n";
-    }
-    exit(0);
-}
-else {
-    print "rlog command failed!\n";
-    exit(1);
-}
-
-# Simple minded listener for listening on message events etc. Every client listener
-# should implement method 'notify()' and listen at least on 'PCVSLib::TerminatedEvent'.
-package CVSListener;
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{is_success_} = 0;
-    $self->{log_}        = ();
-    bless ($self, $class);
-    return $self;
-}
-
-sub is_success
-{
-    my $self = shift;
-    return $self->{is_success_};
-}
-
-sub get_log
-{
-    my $self = shift;
-    return $self->{log_};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa(PCVSLib::MessageEvent) ) {
-        push(@{$self->{log_}}, $event->get_message());
-    }
-    if ( $event->isa(PCVSLib::TerminatedEvent) ) {
-        $self->{is_success_} = $event->is_success();
-    }
-}
-
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/t/PCVSLib.t b/solenv/bin/modules/PCVSLib/t/PCVSLib.t
deleted file mode 100644
index dd201ca9d9c4..000000000000
--- a/solenv/bin/modules/PCVSLib/t/PCVSLib.t
+++ /dev/null
@@ -1,803 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: PCVSLib.t,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl PCVSLib.t'
-
-#########################
-
-# change 'tests => 2' to 'tests => last_test_to_print';
-
-use Test;
-BEGIN { plan tests => 70 };
-use IO::File;
-use Cwd;
-use File::Compare;
-use File::Copy;
-use File::Temp qw(tempdir);
-use PCVSLib::Root;
-use PCVSLib::Entry;
-use PCVSLib::Credentials;
-use PCVSLib::LogHandle;
-use PCVSLib::Client;
-use PCVSLib::Command;
-use PCVSLib::EventHandler;
-use PCVSLib::Directory;
-use PCVSLib::Listener;
-use PCVSLib;
-ok(1); # If we made it this far, we're ok.
-
-#########################
-
-# chdir into test directory if started via 'make test'
-if ( -d 't' ) {
-    chdir('t') or die "can't chdir into directory 't'";
-}
-
-#### setup the test repository
-my $test_repository = tempdir(CLEANUP=>1);
-system("cvs -d $test_repository init");
-unlink("$test_repository/CVSROOT/config") or die "can't unlink $test_repository/CVSROOT/config: $!" ;
-
-my $import_dir = tempdir(CLEANUP=>1);
-open(FILE_AAA, ">$import_dir/aaa")  or die "can't open $import_dir/aaa: $!";
-print FILE_AAA "aaa\n";
-close(FILE_AAA);
-open(FILE_BBB, ">$import_dir/bbb")  or die "can't open $import_dir/bbb: $!";
-print FILE_BBB "bbb\n";
-close(FILE_BBB);
-open(FILE_CCC, ">$import_dir/ccc")  or die "can't open $import_dir/ccc $!";
-print FILE_CCC "ccc\n";
-print FILE_CCC "second line\n";
-print FILE_CCC "third line\n";
-print FILE_CCC "fourth line\n";
-close(FILE_CCC);
-chmod(0775,"$import_dir/ccc");
-
-open(FILE_HUGE, ">$import_dir/huge")  or die "can't open $import_dir/huge $!";
-my @files = glob("../lib/PCVSLib/*.pm");
-foreach (@files) {
-    open(FILE, "<$_") or die "can't open $import_dir/$_ $!";
-    while(<FILE>) {
-        print FILE_HUGE $_;
-    }
-    close(FILE);
-}
-close(FILE_HUGE);
-
-open(FILE_BINARY, ">$import_dir/binary.bin")  or die "can't open $import_dir/binary.bin $!";
-for (my $i=0; $i<8192; $i++) {
-    push(@random, rand());
-}
-my $binary_string = pack("d*", @random);
-syswrite(FILE_BINARY, $binary_string, 8192*8);
-close(FILE_BINARY);
-
-mkdir("$import_dir/subdir1");
-open(FILE_AAA, ">$import_dir/subdir1/aaa")  or die "can't open $import_dir/subdir1/aaa: $!";
-print FILE_AAA "aaa\n";
-close(FILE_AAA);
-open(FILE_BBB, ">$import_dir/subdir1/bbb")  or die "can't open $import_dir/subdir1/bbb: $!";
-print FILE_BBB "bbb\n";
-close(FILE_BBB);
-open(FILE_CCC, ">$import_dir/subdir1/ccc")  or die "can't open $import_dir/subdir1/ccc $!";
-print FILE_CCC "ccc\n";
-close(FILE_CCC);
-
-mkdir("$import_dir/subdir2");
-open(FILE_XYZ, ">$import_dir/subdir2/xyz")  or die "can't open $import_dir/subdir2/xyz: $!";
-print FILE_XYZ "xyz\n";
-close(FILE_XYZ);
-mkdir("$import_dir/subdir3");
-
-
-my $save_dir = getcwd();
-chdir($import_dir);
-system("cvs -d :local:$test_repository import -W \"*.bin -k 'b'\" -m'initial import' testmodule demo_vendortag DEMO_RELEASE_TAG 2>&1 > /dev/null");
-chdir($save_dir);
-
-open(CVSCONFIG, ">$test_repository/CVSROOT/config") or die "can't open $test_repository/CVSROOT/config: $!" ;
-print CVSCONFIG "SystemAuth=no\n";
-close(CVSCONFIG);
-open(CVSPASS, ">$test_repository/CVSROOT/passwd")  or die "can't open $test_repository/CVSROOT/passwd: $!";
-my $login = getlogin || getpwuid($<);
-print CVSPASS "user:wUkrxyBVZk0V2:$login\n";
-close(CVSPASS);
-
-#### setup the test workspace
-my $test_workspace = tempdir(CLEANUP=>1);
-open(CVSPASS, ">$test_workspace/.cvspass");
-print CVSPASS ':pserver:user@localhost:' . '8888' . $test_repository . ' Ay=er=03tr3cy,i' . "\n";
-close(CVSPASS);
-
-#### tests which don't need the daemon
-print "# Testing PCVSLib::Root\n";
-my $root_string = ':pserver:some_user@cvsserver.somewhere.org:/path_to_repository';
-my $root1 = PCVSLib::Root->new($root_string);
-ok($root1->method() eq 'pserver' 
-    && $root1->user() eq 'some_user'
-    && $root1->host() eq 'cvsserver.somewhere.org'
-    && $root1->port() eq 2401
-    && $root1->root_dir() eq '/path_to_repository', 1);
-ok($root1->to_string() eq $root_string, 1);
-
-$root_string = ':pserver:some_user@cvsserver.somewhere.org:4711/path_to_repository';
-my $root2 = PCVSLib::Root->new($root_string);
-ok($root2->method() eq 'pserver' 
-    && $root2->user() eq 'some_user'
-    && $root2->host() eq 'cvsserver.somewhere.org'
-    && $root2->port() eq 4711
-    && $root2->root_dir() eq '/path_to_repository', 1);
-ok($root2->to_string_with_port() eq $root_string, 1);
-
-print "# Testing PCVSLib::Time\n";
-my $time = time();
-my $time_str = PCVSLib::Time::seconds_to_rfc822_1123($time);
-ok(PCVSLib::Time::rfc822_1123_to_seconds($time_str) == $time, 1);
-$time_str = PCVSLib::Time::seconds_to_timestr($time);
-ok(PCVSLib::Time::timestr_to_seconds($time_str) == $time, 1);
-$time_str = "13 Jun 2003 14:37:05 +0200";
-ok(PCVSLib::Time::rfc822_1123_to_seconds($time_str) == 1055507825, 1);
-
-print "# Testing PCVSLib::Entry\n";
-my $entry1 = PCVSLib::Entry->new('/test/0/dummy timestamp//');
-my $entry2 = PCVSLib::Entry->new('/test1.cpp/1.21/Fri Jun 13 12:37:05 2003//');
-my $entry3 = PCVSLib::Entry->new('/test2.cpp/1.14/Result of merge+Wed Jan 19 14:52:04 2005//');
-my $entry4 = PCVSLib::Entry->new('/test3.cpp/1.14/Result of merge//');
-ok($entry1->name() eq 'test');
-ok($entry2->timestamp() == 1055507825);
-ok($entry3->is_conflict());
-ok($entry4->is_merge() && !$entry4->is_conflict());
-
-print "# Testing PCVSLib::Credentials\n";
-my $credentials_fail = PCVSLib::Credentials->new();
-eval { my $password_fail = $credentials_fail->get_password($root1) };
-ok($@ =~ /PCVSLIB::Credentials::get_password\(\): missing entry in/);
-
-
-print "# Testing PCVSLib::LogHandle\n";
-my $fh1 = IO::File->new_tmpfile();
-my $fh2 = IO::File->new_tmpfile();
-
-my $loggedhandle = PCVSLib::LogHandle->new($fh1, $fh2);
-ok(1);
-
-$loggedhandle->print("just a small text\n");
-$fh1->flush();
-$fh2->flush();
-ok(1);
-
-$fh1->seek(0, SEEK_SET);
-$loggedhandle->getline();
-
-$fh2->seek(0, SEEK_SET);
-# logged print
-my $cont = $fh2->getline();
-ok($cont eq "C: just a small text\n", 1);
-
-# logged read
-$cont = $fh2->getline();
-ok($cont eq "S: just a small text\n", 1);
-
-$fh1->close();
-$fh2->close();
-
-print "# Testing PCVSLib::EventHandler\n";
-
-my $test_listener1 = TestListener->new();
-my $test_listener2 = TestListener->new();
-my $test_listener3 = TestListener->new();
-
-my $test_event_handler = PCVSLib::EventHandler->new();
-$test_event_handler->add_listener($test_listener1);
-$test_event_handler->add_listener($test_listener2);
-$test_event_handler->add_listener($test_listener3);
-
-eval { $test_event_handler->add_listener("This ain't no listener"); };
-ok($@ =~ /PCVSLIB::EventHandler::add_listener\(\): added object is not a listener/);
-
-my $event = PCVSLib::MessageEvent->new("TestEvent");
-$test_event_handler->send_event($event);
-ok($test_listener3->count(), 1);
-$test_event_handler->remove_listener($test_listener2);
-$test_event_handler->send_event($event);
-ok($test_listener2->count(), 1);
-ok($test_listener3->count(), 2);
-
-#### start the daemon
-my $daemon_pid;
-if ( !($daemon_pid = fork()) ) {
-    # child
-    exec('perl', 'daemon.pl', $test_repository, '8888')
-}
-
-sleep(1);
-
-print "# Testing PCVSLib::Connection\n";
-my $connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-
-my $connection_fail = PCVSLib::Connection->new($connection_root, 'Anone');
-eval { my $cvs_handle_fail = eval $connection_fail->open() };
-ok($@ =~ /PCVSLib::Connection::pserver_open\(\): '[\w\.\-]+': authentication failed/);
-
-my $credentials = PCVSLib::Credentials->new("$test_workspace/.cvspass");
-my $password = $credentials->get_password($connection_root);
-my $connection_ok = PCVSLib::Connection->new($connection_root, $password);
-
-my $cvs_handle_ok = $connection_ok->open();
-ok(1);
-$connection_ok->close();
-ok(1);
-
-print "# Testing PCVSLib::Client\n";
-
-my $log_dir = cwd();
-
-my $connection = PCVSLib::Connection->new($connection_root, $password);
-my $log_handle = IO::File->new(">$log_dir/log");
-my $io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-
-my $client = PCVSLib::Client->new($connection);
-
-my $event_handler = PCVSLib::EventHandler->new();
-my $listener = TestListener->new();
-$event_handler->add_listener($listener);
-
-my $command = PCVSLib::VersionCommand->new($event_handler);
-$client->execute_command($command);
-ok($listener->is_success(), 1);
-ok($listener->get_message() =~ /^Concurrent Versions System/, 1);
-print "# ". $listener->get_message() . "\n";
-
-$command = PCVSLib::ValidRequestsCommand->new($event_handler);
-$client->execute_command($command);
-ok($listener->is_success(), 1);
-ok(@{$listener->get_valid_requests()} > 10, 1);
-print "# ". join(" ", @{$listener->get_valid_requests()}) . "\n";
-
-print "# Testing rlog support\n";
-my $rlog_listener = LogListener->new();
-$event_handler->add_listener($rlog_listener);
-my $rlog_command = PCVSLib::RLogCommand->new($event_handler);
-$rlog_command->file_list(['testmodule']);
-$client->execute_command($rlog_command);
-ok($rlog_listener->is_success(), 1);
-foreach ( @{$rlog_listener->get_log()} ) {
-    print "# $_\n";
-}
-
-my $rlog2_listener = LogListener->new();
-$event_handler->add_listener($rlog2_listener);
-my $rlog2_command = PCVSLib::RLogCommand->new($event_handler);
-$rlog2_command->file_list(['testmodule/aaa']);
-$client->execute_command($rlog2_command);
-ok($rlog2_listener->is_success(), 1);
-foreach ( @{$rlog2_listener->get_log()} ) {
-    print "# $_\n";
-}
-$event_handler->remove_listener($rlog2_listener);
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-
-# For some reasons deep in the cvs server we need a new connection after an rlog before we try
-# a another log command
-$connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-$connection = PCVSLib::Connection->new($connection_root, $password);
-$log_handle = IO::File->new(">>$log_dir/log");
-$io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-$client = PCVSLib::Client->new($connection);
-print "# Testing checkout support\n";
-$save_dir = getcwd();
-chdir($test_workspace);
-my $checkout_command = PCVSLib::CheckoutCommand->new($event_handler);
-$checkout_command->file_list(['testmodule']);
-$client->execute_command($checkout_command);
-
-print "# Testing binary checkout support\n";
-ok(compare("$import_dir/binary.bin", "$test_workspace/testmodule/binary.bin"), 0);
-
-print "# Testing file permissions\n";
-ok (-x "$test_workspace/testmodule/ccc", 1);
-
-print "# Testing PCVSLib::Directory\n";
-
-my $directory = PCVSLib::Directory->new("$test_workspace/testmodule");
-my $directory_rep = $directory->repository();
-if ( $directory_rep =~ /^\// ) {
-    ok($directory_rep eq ($directory->root()->root_dir() . "/testmodule"), 1);
-}
-else {
-    ok($directory_rep eq 'testmodule', 1);
-}
-my $directory_root = $directory->root()->to_string_with_port();
-ok($directory_root eq ":pserver:user\@localhost:8888$test_repository", 1);
-
-my $entry = $directory->get_entry('bbb');
-print "# " . $entry->to_string() . "\n";
-ok($entry->name() eq 'bbb', 1);
-ok ($directory->is_modified('bbb') == 0, 1);
-utime undef, undef, "$test_workspace/testmodule/bbb";
-ok ($directory->is_modified('bbb') == 1, 1);
-ok ($directory->is_questionable('bbb') == 0, 1);
-system("echo ttt > $test_workspace/testmodule/ttt");
-ok ($directory->is_questionable('ttt') == 1, 1);
-ok ($directory->get_entry('binary.bin')->is_binary() == 1, 1);
-
-$event_handler->remove_listener($listener);
-
-chdir("$test_workspace/testmodule");
-
-print "# Testing PCVSLib::LogCommand\n";
-my $log_listener = LogListener->new();
-$event_handler->add_listener($log_listener);
-my $log_command = PCVSLib::LogCommand->new($event_handler);
-$log_command->file_list(['ccc', 'bbb', 'aaa', 'subdir1/bbb', 'subdir1/ccc', 'subdir2/xyz', 'subdir1/aaa']);
-$client->execute_command($log_command);
-ok($log_listener->is_success(), 1);
-foreach ( @{$log_listener->get_log()} ) {
-    print "# $_\n";
-}
-$event_handler->remove_listener($log_listener);
-
-print "# Testing PCVSLib::TagCommand\n";
-my $tag_listener = LogListener->new();
-$event_handler->add_listener($tag_listener);
-my $tag_command = PCVSLib::TagCommand->new($event_handler);
-$tag_command->tag('test_tag1');
-$tag_command->file_list(['ccc']);
-$client->execute_command($tag_command);
-ok($tag_listener->is_success(), 1);
-foreach ( @{$tag_listener->get_log()} ) {
-    print "# $_\n";
-}
-$event_handler->remove_listener($tag_listener);
-
-$tag_listener = LogListener->new();
-$event_handler->add_listener($tag_listener);
-$tag_command = PCVSLib::TagCommand->new($event_handler);
-$tag_command->branch('branch_tag1');
-$tag_command->file_list(['aaa']);
-$client->execute_command($tag_command);
-ok($tag_listener->is_success(), 1);
-foreach ( @{$tag_listener->get_log()} ) {
-    print "# $_\n";
-}
-$event_handler->remove_listener($tag_listener);
-
-$log_listener = LogListener->new();
-$event_handler->add_listener($log_listener);
-$log_command = PCVSLib::LogCommand->new($event_handler);
-$log_command->file_list(['aaa', 'ccc']);
-$client->execute_command($log_command);
-ok($log_listener->is_success(), 1);
-ok(grep(/test_tag1/, @{$log_listener->get_log()}), 1);
-ok(grep(/branch_tag1/, @{$log_listener->get_log()}), 1);
-$event_handler->remove_listener($log_listener);
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-# For some reasons deep in the cvs server we need a new connection before we try
-# a another recursive command. Bad.
-print "# Testing checkout with sticky tag.\n";
-chdir($save_dir);
-$connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-$connection = PCVSLib::Connection->new($connection_root, $password);
-$log_handle = IO::File->new(">>$log_dir/log");
-$io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-$client = PCVSLib::Client->new($connection);
-chdir("$test_workspace/testmodule");
-$tag_listener = LogListener->new();
-$event_handler->add_listener($tag_listener);
-$tag_command = PCVSLib::TagCommand->new($event_handler);
-$tag_command->branch('test_branch');
-$tag_command->file_list(['.']);
-$client->execute_command($tag_command);
-ok($tag_listener->is_success(), 1);
-foreach ( @{$tag_listener->get_log()} ) {
-    print "# $_\n";
-}
-$event_handler->remove_listener($tag_listener);
-
-$tag_listener = LogListener->new();
-$event_handler->add_listener($tag_listener);
-$tag_command = PCVSLib::TagCommand->new($event_handler);
-$tag_command->branch('branch_tag2');
-$tag_command->file_list(['aaa', 'bbb', 'ccc']);
-$client->execute_command($tag_command);
-ok($tag_listener->is_success(), 1);
-foreach ( @{$tag_listener->get_log()} ) {
-    print "# $_\n";
-}
-$event_handler->remove_listener($tag_listener);
-
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-# For some reasons deep in the cvs server we need a new connection before we try
-# a another recursive command. Bad.
-print "# Testing checkout of individual files\n";
-chdir($save_dir);
-system("rm -rf $test_workspace/testmodule");
-$connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-$connection = PCVSLib::Connection->new($connection_root, $password);
-$log_handle = IO::File->new(">>$log_dir/log");
-$io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-$client = PCVSLib::Client->new($connection);
-chdir("$test_workspace");
-$checkout_listener = LogListener->new();
-$event_handler->add_listener($checkout_listener);
-$checkout_command = PCVSLib::CheckoutCommand->new($event_handler);
-$checkout_command->file_list(['testmodule/aaa', 'testmodule/bbb']);
-$client->execute_command($checkout_command);
-ok($checkout_listener->is_success(), 1);
-ok(-e "$test_workspace/testmodule/CVS/Entries.Static", 1);
-$event_handler->remove_listener($checkout_listener);
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-
-# For some reasons deep in the cvs server we need a new connection before we try
-# a another recursive command. Bad.
-print "# Testing checkout with sticky tag\n";
-chdir($save_dir);
-system("rm -rf $test_workspace/testmodule");
-$connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-$connection = PCVSLib::Connection->new($connection_root, $password);
-$log_handle = IO::File->new(">>$log_dir/log");
-$io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-$client = PCVSLib::Client->new($connection);
-chdir("$test_workspace");
-$checkout_listener = LogListener->new();
-$event_handler->add_listener($checkout_listener);
-$checkout_command = PCVSLib::CheckoutCommand->new($event_handler);
-$checkout_command->branch('test_branch');
-$checkout_command->file_list(['testmodule']);
-$client->execute_command($checkout_command);
-ok($checkout_listener->is_success(), 1);
-$event_handler->remove_listener($checkout_listener);
-
-print "# Testing status command\n";
-chdir("$test_workspace/testmodule");
-my $status_command = PCVSLib::StatusCommand->new($event_handler);
-my $status_listener = TestListener->new();
-$event_handler->add_listener($status_listener);
-$status_command->file_list(['.']);
-$client->execute_command($status_command);
-ok($status_listener->is_success(), 1);
-$event_handler->remove_listener($status_listener);
-
-print "# Testing commit command\n";
-open(BBB, '>>bbb');
-print BBB "next line\n";
-print BBB "third line\n";
-close(BBB);
-open(CCC, '>ccc');
-print CCC "first line\n";
-print CCC "second line\n";
-print CCC "third line\n";
-print CCC "fourth line\n";
-close(CCC);
-my $commit_command = PCVSLib::CommitCommand->new($event_handler);
-my $commit_listener = TestListener->new();
-$event_handler->add_listener($commit_listener);
-$commit_command->file_list(['bbb','ccc']);
-$commit_command->comment(["First commit comment", "and already a multiline comment"]);
-$client->execute_command($commit_command);
-ok($commit_listener->is_success(), 1);
-$event_handler->remove_listener($commit_listener);
-
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-# More verification
-
-# For some reasons deep in the cvs server we need a new connection before we try
-# a another command. Bad.
-$connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-$connection = PCVSLib::Connection->new($connection_root, $password);
-$log_handle = IO::File->new(">>$log_dir/log");
-$io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-$client = PCVSLib::Client->new($connection);
-$status_command = PCVSLib::StatusCommand->new($event_handler);
-$status_listener = TestListener->new();
-$event_handler->add_listener($status_listener);
-$status_command->file_list(['bbb']);
-$client->execute_command($status_command);
-ok($status_listener->is_success(), 1);
-$event_handler->remove_listener($status_listener);
-my $ci_directory = PCVSLib::Directory->new("$test_workspace/testmodule");
-my $ci_version = $ci_directory->get_entry('bbb')->version();
-ok($ci_version eq '1.1.1.1.2.1', 1);
-my $ci_time = $ci_directory->get_entry('bbb')->timestamp();
-my @stat_buf = stat('bbb');
-ok ($ci_time == $stat_buf[9], 1);
-ok(-e "$test_workspace/testmodule/CVS/Tag", 1);
-
-print "# Testing update command\n";
-my $update_command = PCVSLib::UpdateCommand->new($event_handler);
-my $update_listener = TestListener->new();
-$event_handler->add_listener($update_listener);
-$update_command->file_list(['.']);
-$update_command->options(['-A']);
-$client->execute_command($update_command);
-ok($update_listener->is_success(), 1);
-$event_handler->remove_listener($update_listener);
-ok(!-e "$test_workspace/testmodule/CVS/Tag", 1);
-
-sleep(1); # timestamps ....
-print "# Testing merges\n";
-open(BBB, '>>bbb');
-print BBB "this will conflict\n";
-print BBB "third line\n";
-close(BBB);
-open(CCC, '>>ccc');
-print CCC "fifth line\n";
-close(CCC);
-
-my $commit_command1 = PCVSLib::CommitCommand->new($event_handler);
-my $commit_listener1 = TestListener->new();
-$event_handler->add_listener($commit_listener1);
-$commit_command1->file_list(['bbb','ccc']);
-$commit_command1->comment(["Commit on trunk"]);
-$client->execute_command($commit_command1);
-ok($commit_listener1->is_success(), 1);
-$event_handler->remove_listener($commit_listener1);
-
-$update_command = PCVSLib::UpdateCommand->new($event_handler);
-$update_listener = TestListener->new();
-$event_handler->add_listener($update_listener);
-$update_command->file_list(['.']);
-$update_command->merge1('test_branch');
-$client->execute_command($update_command);
-ok($update_listener->is_success(), 1);
-$event_handler->remove_listener($update_listener);
-
-my $merge_dir = PCVSLib::Directory->new('.');
-my $merge_entry = $merge_dir->get_entry('bbb');
-my $merge_entry_str = $merge_entry->to_string();
-ok( $merge_entry_str =~ /\/Result of merge\+/, 1);
-$merge_entry = $merge_dir->get_entry('ccc');
-$merge_entry_str = $merge_entry->to_string();
-ok( $merge_entry_str =~ /\/Result of merge\//, 1);
-
-my $commit_command2 = PCVSLib::CommitCommand->new($event_handler);
-my $commit_listener2 = TestListener->new();
-$event_handler->add_listener($commit_listener2);
-$commit_command2->file_list(['.']);
-$commit_command2->comment(["Commit of merges"]);
-$client->execute_command($commit_command2);
-# must fail because 'bbb' has not been changed after conflict
-ok($commit_listener2->is_success(), 0); 
-$event_handler->remove_listener($commit_listener2);
-
-sleep(1);
-system("touch bbb");
-my $commit_command3 = PCVSLib::CommitCommand->new($event_handler);
-my $commit_listener3 = TestListener->new();
-$event_handler->add_listener($commit_listener3);
-$commit_command3->file_list(['.']);
-$commit_command3->comment(["Commit of merges"]);
-$client->execute_command($commit_command3);
-# now ok, though it will still complain about markers in 'bbb'
-ok($commit_listener3->is_success(), 1); 
-$event_handler->remove_listener($commit_listener3);
-
-sleep(1);
-system("touch ccc");
-my $commit_command4 = PCVSLib::CommitCommand->new($event_handler);
-my $commit_listener4 = TestListener->new();
-$event_handler->add_listener($commit_listener4);
-$commit_command4->file_list(['.']);
-$commit_command4->comment(["Commit of merges"]);
-$client->execute_command($commit_command4);
-ok($commit_listener4->is_success(), 1); 
-$event_handler->remove_listener($commit_listener4);
-
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-print "# Again check out\n";
-chdir($save_dir);
-system("rm -rf $test_workspace/testmodule");
-$connection_root = PCVSLib::Root->new(':pserver:user@localhost:' . '8888' . $test_repository);
-$connection = PCVSLib::Connection->new($connection_root, $password);
-$log_handle = IO::File->new(">>$log_dir/log");
-$io_handle = $connection->open();
-$connection->io_handle(PCVSLib::LogHandle->new($io_handle, $log_handle));
-$client = PCVSLib::Client->new($connection);
-chdir("$test_workspace");
-$checkout_listener = LogListener->new();
-$event_handler->add_listener($checkout_listener);
-$checkout_command = PCVSLib::CheckoutCommand->new($event_handler);
-$checkout_command->file_list(['testmodule']);
-$client->execute_command($checkout_command);
-ok($checkout_listener->is_success(), 1);
-$event_handler->remove_listener($checkout_listener);
-
-print "# rdiff testing\n";
-my $rdiff_command = PCVSLib::RDiffCommand->new($event_handler);
-my $rdiff_listener = TestListener->new();
-$event_handler->add_listener($rdiff_listener);
-$rdiff_command->options(['-s']);
-$rdiff_command->file_list(['testmodule']);
-$rdiff_command->rev1('test_branch');
-$rdiff_command->rev2('HEAD');
-$client->execute_command($rdiff_command);
-ok($rdiff_listener->is_success(), 1);
-$event_handler->remove_listener($rdiff_listener);
-
-print "# Testing removal of file\n";
-chdir("$test_workspace/testmodule");
-my $removal_command = PCVSLib::RemoveCommand->new($event_handler);
-my $removal_listener = TestListener->new();
-$event_handler->add_listener($removal_listener);
-$removal_command->file_list(['aaa','subdir1/ccc']);
-$removal_command->options(['-f']);
-$removal_command->recursive(0);
-$client->execute_command($removal_command);
-ok($removal_listener->is_success(), 1);
-$event_handler->remove_listener($removal_listener);
-
-my $commit_command5 = PCVSLib::CommitCommand->new($event_handler);
-my $commit_listener5 = TestListener->new();
-$event_handler->add_listener($commit_listener5);
-$commit_command5->file_list(['.']);
-$commit_command5->comment(["Commit removed file"]);
-$client->execute_command($commit_command5);
-ok($commit_listener5->is_success(), 1);
-$event_handler->remove_listener($commit_listener5);
-
-$connection->io_handle($io_handle);
-$connection->close();
-$log_handle->close();
-
-chdir($save_dir);
-
-{   
-    local $SIG{CHLD}='IGNORE';
-    kill('HUP', $daemon_pid);
-}
-
-#### test implementation of a listener
-
-package TestListener;
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{count_}          = 0;
-    $self->{message_}        = undef;
-    $self->{valid_requests_} = undef;
-    $self->{is_success_}     = 0;
-    bless ($self, $class);
-    return $self;
-}
-
-sub is_success 
-{
-    my $self = shift;
-    return $self->{is_success_};
-}
-
-sub count 
-{
-    my $self = shift;
-    return $self->{count_};
-}
-
-sub get_message
-{
-    my $self = shift;
-    return $self->{message_};
-}
-
-sub get_valid_requests
-{
-    my $self = shift;
-    return $self->{valid_requests_};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    $self->{count_}++;
-
-    if ( $event->isa(PCVSLib::MessageEvent) ) {
-        $self->{message_} = $event->get_message();
-    }
-    if ( $event->isa(PCVSLib::ErrorMessageEvent) ) {
-        $self->{message_} = $event->get_message();
-    }
-    if ( $event->isa(PCVSLib::ValidRequestsEvent) ) {
-        $self->{valid_requests_} = $event->get_valid_requests();
-    }
-    if ( $event->isa(PCVSLib::TerminatedEvent) ) {
-        $self->{is_success_} = $event->is_success();
-    }
-}
-
-package LogListener;
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-    $self->{is_success_} = 0;
-    $self->{log_}        = ();
-    bless ($self, $class);
-    return $self;
-}
-
-sub is_success 
-{
-    my $self = shift;
-    return $self->{is_success_};
-}
-
-sub get_log
-{
-    my $self = shift;
-    return $self->{log_};
-}
-
-sub notify
-{
-    my $self  = shift;
-    my $event = shift;
-
-    if ( $event->isa(PCVSLib::MessageEvent) ) {
-        push(@{$self->{log_}}, $event->get_message());
-    }
-    if ( $event->isa(PCVSLib::TerminatedEvent) ) {
-        $self->{is_success_} = $event->is_success();
-    }
-}
-
-1;
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/PCVSLib/t/daemon.pl b/solenv/bin/modules/PCVSLib/t/daemon.pl
deleted file mode 100644
index a46af2a496d3..000000000000
--- a/solenv/bin/modules/PCVSLib/t/daemon.pl
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: daemon.pl,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# dameon.pl - rudimentary daemon which spawns a CVS pserver instance
-#
-
-use IO::Socket::INET;
-use IO::Select;
-
-my $cvs_port = $ARGV[1];
-
-my $server = IO::Socket::INET->new(LocalPort => $cvs_port,
-                                  Type      => SOCK_STREAM,
-                                  Reuse     => 1,
-                                  Listen    => 10 )
-             or die "couldn't listen on port '$cvs_port'";
-
-my $select = IO::Select->new();
-my $client;
-REQUEST:
-    while ( $client = $server->accept() ) {
-        if ( $child_pid = fork() ) {
-            $client->close();
-            next REQUEST;
-        }
-
-        die "cannot fork: $!" if !defined($child_pid);
-
-        $server->close();
-        $select->add($client);
-
-        $select->can_read();
-        $client->autoflush(1);
-
-        my $infh  = IO::Handle->new_from_fd($client, 'r');
-        my $outfh = IO::Handle->new_from_fd($client, 'w');
-
-
-        open(STDIN,  "<&=".fileno($infh))  or die "can't dup client: $!";
-        open(STDOUT,  ">&=".fileno($outfh)) or die "can't dup client: $!";
-
-        $infh->close();
-        $outfh->close();
-
-        system("cvs -f --allow-root $ARGV[0] pserver");
-
-        $client->close();
-        $select->remove($client);
-    exit(0);
-    }
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 8d969c79df93..62a35193cd69 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -31,6 +31,7 @@
 
 package installer::archivefiles;
 
+use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 use installer::converter;
 use installer::existence;
 use installer::exiter;
@@ -198,15 +199,22 @@ sub resolving_archive_flag
 
             if ( $installer::globals::dounzip ) { installer::systemactions::create_directory($unzipdir); }  # creating subdirectories with the names of the zipfiles
 
-            $systemcall = "$installer::globals::unzippath -l $sourcepath |";
-            open (UNZIP, "$systemcall");
-            my @zipfile = <UNZIP>;
-            close (UNZIP);
+            my $zip = Archive::Zip->new();
+            if ( $zip->read($sourcepath) != AZ_OK )
+            {
+                $infoline = "ERROR: Could not unzip $sourcepath\n";
+                push( @installer::globals::logfileinfo, $infoline);
+            }
 
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
+            my $counter = 0;
+            my $contains_dll = 0;
+            foreach my $member ( $zip->memberNames() )
+            {
+                $counter++;
+                if ( $member =~ /.dll\s*$/ ) { $contains_dll = 1; }
+            }
 
-            if (!( $#zipfile > -1 ))    # the zipfile is empty
+            if (! ( $counter > 0 )) # the zipfile is empty
             {
                 $infoline = "ERROR: Could not unzip $sourcepath\n";
                 push( @installer::globals::logfileinfo, $infoline);
@@ -214,22 +222,11 @@ sub resolving_archive_flag
             }
             else
             {
-                # now really unpacking the files
-                # Parameter -o : overwrite files without prompting
-                # Parameter -q : quiet mode
-
                 if ( $installer::globals::dounzip )         # really unpacking the files
                 {
-                    $returnvalue = 1;
-                    $systemcall = "$installer::globals::unzippath -o -q $sourcepath -d $unzipdir";
-                    $returnvalue = system($systemcall);
-
-                    $infoline = "Systemcall: $systemcall\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    if ($returnvalue) { installer::exiter::exit_program("ERROR: $infoline", "resolving_archive_flag"); }
+                    if ( $zip->extractTree("", $unzipdir) != AZ_OK ) { installer::exiter::exit_program("ERROR: $infoline", "resolving_archive_flag"); }
 
-                    if ( $^O =~ /cygwin/i )
+                    if (( $^O =~ /cygwin/i ) && ( $contains_dll ))
                     {
                         # Make dll's executable
                         $systemcall = "cd $unzipdir; find . -name \\*.dll -exec chmod 775 \{\} \\\;";
@@ -264,133 +261,119 @@ sub resolving_archive_flag
                 my $zipfileref = \@zipfile;
                 my $unziperror = 0;
 
-                # Format: Length, Date, Time, Name
-                # This includes new destination directories!
-
-                for ( my $j = 0; $j <= $#{$zipfileref}; $j++ )
+                foreach my $zipname ( $zip->memberNames() )
                 {
-                    my $line = ${$zipfileref}[$j];
-
-                    # Format:
-                    #    0 07-25-03  18:21   dir1/
-                    # 1241 07-25-03  18:21   dir1/so7drawing.desktop
+                    # Format from Archive:::Zip :
+                    # dir1/
+                    # dir1/so7drawing.desktop
 
-                    if ( $line =~ /^\s*(\d+)\s+(\S+)\s+(\S+)\s+(\S+.*\S+?)\s*$/ )
-                    {
-                        my $zipsize = $1;
-                        my $zipdate = $2;
-                        my $ziptime = $3;
-                        my $zipname = $4;
+                    # some directories and files (from the help) start with "./simpress.idx"
 
-                        # some directories and files (from the help) start with "./simpress.idx"
+                    $zipname =~ s/^\s*\.\///;
 
-                        $zipname =~ s/^\s*\.\///;
+                    if ($installer::globals::iswin and $^O =~ /MSWin/i) { $zipname =~ s/\//\\/g; }
 
-                        if ($installer::globals::iswin and $^O =~ /MSWin/i) { $zipname =~ s/\//\\/g; }
-
-                        # if ( $zipsize == 0 )  # also files can have a size of 0
-                        if ( $zipname =~ /\Q$installer::globals::separator\E\s*$/ ) # slash or backslash at the end characterizes a directory
+                    if ( $zipname =~ /\Q$installer::globals::separator\E\s*$/ ) # slash or backslash at the end characterizes a directory
+                    {
+                        $zipname = $zipname . "\n";
+                        push(@{$additionalpathsref}, $zipname);
+
+                        # Also needed here:
+                        # Name
+                        # Language
+                        # ismultilingual
+                        # Basedirectory
+
+                        # This is not needed, because the list of all directories for the
+                        # epm list file is generated from the destination directories of the
+                        # files included in the product!
+                    }
+                    else
+                    {
+                        my %newfile = ();
+                        %newfile = %{$onefile};
+                        $newfile{'Name'} = $zipname;
+                        my $destination = $onefile->{'destination'};
+                        installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
+                        $newfile{'destination'} = $destination . $zipname;
+                        $newfile{'sourcepath'} = $unzipdir . $zipname;
+                        $newfile{'zipfilename'} = $onefile->{'Name'};
+                        $newfile{'zipfilesource'} = $onefile->{'sourcepath'};
+                        $newfile{'zipfiledestination'} = $onefile->{'destination'};
+
+                        if (( $use_internal_rights ) && ( ! $installer::globals::iswin ))
                         {
-                            $zipname = $zipname . "\n";
-                            push(@{$additionalpathsref}, $zipname);
-
-                            # Also needed here:
-                            # Name
-                            # Language
-                            # ismultilingual
-                            # Basedirectory
-
-                            # This is not needed, because the list of all directories for the
-                            # epm list file is generated from the destination directories of the
-                            # files included in the product!
+                            my $value = sprintf("%o", (stat($newfile{'sourcepath'}))[2]);
+                            $newfile{'UnixRights'} = substr($value, 3);
+                            $infoline = "Setting unix rights for \"$newfile{'sourcepath'}\" to \"$newfile{'UnixRights'}\"\n";
+                            push( @installer::globals::logfileinfo, $infoline);
                         }
-                        else
+
+                        if ( $select_files )
                         {
-                            my %newfile = ();
-                            %newfile = %{$onefile};
-                            $newfile{'Name'} = $zipname;
-                            my $destination = $onefile->{'destination'};
-                            installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-                            $newfile{'destination'} = $destination . $zipname;
-                            $newfile{'sourcepath'} = $unzipdir . $zipname;
-                            $newfile{'zipfilename'} = $onefile->{'Name'};
-                            $newfile{'zipfilesource'} = $onefile->{'sourcepath'};
-                            $newfile{'zipfiledestination'} = $onefile->{'destination'};
-
-                            if (( $use_internal_rights ) && ( ! $installer::globals::iswin ))
+                            if ( ! installer::existence::exists_in_array($zipname,$selectlistfiles) )
                             {
-                                my $value = sprintf("%o", (stat($newfile{'sourcepath'}))[2]);
-                                $newfile{'UnixRights'} = substr($value, 3);
-                                $infoline = "Setting unix rights for \"$newfile{'sourcepath'}\" to \"$newfile{'UnixRights'}\"\n";
+                                $infoline = "Removing from ARCHIVE file $onefilename: $zipname\n";
                                 push( @installer::globals::logfileinfo, $infoline);
+                                next; # ignoring files, that are not included in $selectlistfiles
                             }
-
-                            if ( $select_files )
+                            else
                             {
-                                if ( ! installer::existence::exists_in_array($zipname,$selectlistfiles) )
-                                {
-                                    $infoline = "Removing from ARCHIVE file $onefilename: $zipname\n";
-                                    push( @installer::globals::logfileinfo, $infoline);
-                                    next; # ignoring files, that are not included in $selectlistfiles
-                                }
-                                else
-                                {
-                                    $infoline = "Keeping from ARCHIVE file $onefilename: $zipname\n";
-                                    push( @installer::globals::logfileinfo, $infoline);
-                                    push( @keptfiles, $zipname); # collecting all kept files
-                                }
+                                $infoline = "Keeping from ARCHIVE file $onefilename: $zipname\n";
+                                push( @installer::globals::logfileinfo, $infoline);
+                                push( @keptfiles, $zipname); # collecting all kept files
                             }
+                        }
 
-                            if ( $select_patch_files )
+                        if ( $select_patch_files )
+                        {
+                            # Is this file listed in the Patchfile list?
+                            # $zipname (filename including path in zip file has to be listed in patchfile list
+
+                            if ( ! installer::existence::exists_in_array($zipname,$patchlistfiles) )
                             {
-                                # Is this file listed in the Patchfile list?
-                                # $zipname (filename including path in zip file has to be listed in patchfile list
-
-                                if ( ! installer::existence::exists_in_array($zipname,$patchlistfiles) )
-                                {
-                                    $newfile{'Styles'} =~ s/\bPATCH\b//;    # removing the flag PATCH
-                                    $newfile{'Styles'} =~ s/\,\s*\,/\,/;
-                                    $newfile{'Styles'} =~ s/\(\s*\,/\(/;
-                                    $newfile{'Styles'} =~ s/\,\s*\)/\)/;
-                                    # $infoline = "Removing PATCH flag from: $zipname\n";
-                                    # push( @installer::globals::logfileinfo, $infoline);
-                                }
-                                else
-                                {
-                                    # $infoline = "Keeping PATCH flag at: $zipname\n";
-                                    # push( @installer::globals::logfileinfo, $infoline);
-                                    push( @keptpatchflags, $zipname); # collecting all PATCH flags
-                                }
+                                $newfile{'Styles'} =~ s/\bPATCH\b//;    # removing the flag PATCH
+                                $newfile{'Styles'} =~ s/\,\s*\,/\,/;
+                                $newfile{'Styles'} =~ s/\(\s*\,/\(/;
+                                $newfile{'Styles'} =~ s/\,\s*\)/\)/;
+                                # $infoline = "Removing PATCH flag from: $zipname\n";
+                                # push( @installer::globals::logfileinfo, $infoline);
                             }
-
-                            if ( $rename_to_language )
+                            else
                             {
-                                my $newzipname = put_language_into_name($zipname, $onelanguage);
-                                my $oldfilename = $unzipdir . $zipname;
-                                my $newfilename = $unzipdir . $newzipname;
-
-                                installer::systemactions::copy_one_file($oldfilename, $newfilename);
+                                # $infoline = "Keeping PATCH flag at: $zipname\n";
+                                # push( @installer::globals::logfileinfo, $infoline);
+                                push( @keptpatchflags, $zipname); # collecting all PATCH flags
+                            }
+                        }
 
-                                $newfile{'Name'} = $newzipname;
-                                $newfile{'destination'} = $destination . $newzipname;
-                                $newfile{'sourcepath'} = $unzipdir . $newzipname;
+                        if ( $rename_to_language )
+                        {
+                            my $newzipname = put_language_into_name($zipname, $onelanguage);
+                            my $oldfilename = $unzipdir . $zipname;
+                            my $newfilename = $unzipdir . $newzipname;
 
-                                $infoline = "RENAME_TO_LANGUAGE: Using $newzipname instead of $zipname!\n";
-                                push( @installer::globals::logfileinfo, $infoline);
-                            }
+                            installer::systemactions::copy_one_file($oldfilename, $newfilename);
 
-                            my $sourcefiletest = $unzipdir . $zipname;
-                            if ( ! -f $sourcefiletest )
-                            {
-                                $infoline = "ATTENTION: Unzip failed for $sourcefiletest!\n";
-                                push( @installer::globals::logfileinfo, $infoline);
-                                $unziperror = 1;
-                            }
+                            $newfile{'Name'} = $newzipname;
+                            $newfile{'destination'} = $destination . $newzipname;
+                            $newfile{'sourcepath'} = $unzipdir . $newzipname;
 
-                            # only adding the new line into the files array, if not in repeat modus
+                            $infoline = "RENAME_TO_LANGUAGE: Using $newzipname instead of $zipname!\n";
+                            push( @installer::globals::logfileinfo, $infoline);
+                        }
 
-                            if ( ! $repeat_unzip ) { push(@newallfilesarray, \%newfile); }
+                        my $sourcefiletest = $unzipdir . $zipname;
+                        if ( ! -f $sourcefiletest )
+                        {
+                            $infoline = "ATTENTION: Unzip failed for $sourcefiletest!\n";
+                            push( @installer::globals::logfileinfo, $infoline);
+                            $unziperror = 1;
                         }
+
+                        # only adding the new line into the files array, if not in repeat modus
+
+                        if ( ! $repeat_unzip ) { push(@newallfilesarray, \%newfile); }
                     }
                 }
 
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 0b03b9f0b86a..b58f376486e0 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -80,7 +80,7 @@ sub check_needed_files_in_path
 sub check_system_path
 {
     # The following files have to be found in the environment variable PATH
-    # All platforms: zip, unzip
+    # All platforms: zip
     # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
     # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
 
@@ -103,7 +103,7 @@ sub check_system_path
 
     if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
     {
-        @needed_files_in_path = ("zip.exe", "unzip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
+        @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
 
         if ( $installer::globals::compiler eq "wntmsci8" )
         {
@@ -120,11 +120,11 @@ sub check_system_path
     }
     elsif ($installer::globals::iswin)
     {
-        @needed_files_in_path = ("zip.exe", "unzip.exe");
+        @needed_files_in_path = ("zip.exe");
     }
     else
     {
-        @needed_files_in_path = ("zip", "unzip");
+        @needed_files_in_path = ("zip");
     }
 
     foreach $onefile ( @needed_files_in_path )
@@ -714,6 +714,7 @@ sub set_addsystemintegration
 
     if ( $installer::globals::patch ) { $installer::globals::addsystemintegration = 0; }
     if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
+    if ( $installer::globals::packageformat eq "native" ) { $installer::globals::addsystemintegration = 0; }
 
     my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
     push( @installer::globals::globallogfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 5691272893dd..6c6baef328ab 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -270,7 +270,18 @@ sub get_path_for_library
     my ($includepatharrayref) = @_;
 
     my $getuidlibraryname = "getuid.so";
-    my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
+
+    my $getuidlibraryref = "";
+
+    if ( $installer::globals::include_pathes_read )
+    {
+        $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
+    }
+    else
+    {
+        $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname, $includepatharrayref, 0);
+    }
+
     if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); }
 
     return $$getuidlibraryref;
@@ -777,12 +788,21 @@ sub put_banner_bmp_into_template
     if ( ! $allvariables->{'DOWNLOADBANNER'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBANNER not defined in product definition!", "put_banner_bmp_into_template"); }
     my $filename = $allvariables->{'DOWNLOADBANNER'};
 
-    my $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
+    my $completefilenameref = "";
 
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
+    if ( $installer::globals::include_pathes_read )
+    {
+        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
+    }
+    else
+    {
+        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
+    }
 
     if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_banner_bmp_into_template"); }
 
+    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
+
     replace_one_variable($templatefile, "BANNERBMPPLACEHOLDER", $$completefilenameref);
 }
 
@@ -798,12 +818,21 @@ sub put_welcome_bmp_into_template
     if ( ! $allvariables->{'DOWNLOADBITMAP'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBITMAP not defined in product definition!", "put_welcome_bmp_into_template"); }
     my $filename = $allvariables->{'DOWNLOADBITMAP'};
 
-    my $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
+    my $completefilenameref = "";
 
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
+    if ( $installer::globals::include_pathes_read )
+    {
+        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
+    }
+    else
+    {
+        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
+    }
 
     if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_welcome_bmp_into_template"); }
 
+    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
+
     replace_one_variable($templatefile, "WELCOMEBMPPLACEHOLDER", $$completefilenameref);
 }
 
@@ -819,12 +848,21 @@ sub put_setup_ico_into_template
     if ( ! $allvariables->{'DOWNLOADSETUPICO'} ) { installer::exiter::exit_program("ERROR: DOWNLOADSETUPICO not defined in product definition!", "put_setup_ico_into_template"); }
     my $filename = $allvariables->{'DOWNLOADSETUPICO'};
 
-    my $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
+    my $completefilenameref = "";
 
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
+    if ( $installer::globals::include_pathes_read )
+    {
+        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
+    }
+    else
+    {
+        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
+    }
 
     if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_setup_ico_into_template"); }
 
+    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
+
     replace_one_variable($templatefile, "SETUPICOPLACEHOLDER", $$completefilenameref);
 }
 
@@ -957,6 +995,7 @@ sub get_file_list
             my $onefile = ${$files}[$j];
 
             my $fileline = "  " . "File" . " " . "\"" . $onefile . "\"" . "\n";
+
             if ( $^O =~ /cygwin/i ) {
                 $fileline =~ s/\//\\/g;
             }
@@ -1533,6 +1572,8 @@ sub call_nsis
 
     installer::logger::print_message( "... starting $makensisexe ... \n" );
 
+    if( $^O =~ /cygwin/i ) { $nsifile =~ s/\\/\//g; }
+
     my $systemcall = "$makensisexe $nsifile |";
 
     my $infoline = "Systemcall: $systemcall\n";
@@ -1706,6 +1747,7 @@ sub create_download_sets
     # removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"
 
     my $downloaddir = $firstdir . $lastdir;
+
     if ( -d $downloaddir ) { installer::systemactions::remove_complete_directory($downloaddir); }
 
     my $olddir = $downloaddir;
@@ -1742,7 +1784,18 @@ sub create_download_sets
         {
             # find and read setup script template
             my $scriptfilename = "downloadscript.sh";
-            my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
+
+            my $scriptref = "";
+
+            if ( $installer::globals::include_pathes_read )
+            {
+                $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
+            }
+            else
+            {
+                $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$scriptfilename, $includepatharrayref, 0);
+            }
+
             if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
             my $scriptfile = installer::files::read_file($$scriptref);
 
@@ -1797,7 +1850,18 @@ sub create_download_sets
 
         # find and read the nsi file template
         my $templatefilename = "downloadtemplate.nsi";
-        my $templateref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$templatefilename, $includepatharrayref, 0);
+
+        my $templateref = "";
+
+        if ( $installer::globals::include_pathes_read )
+        {
+            $templateref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$templatefilename, $includepatharrayref, 0);
+        }
+        else
+        {
+            $templateref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$templatefilename, $includepatharrayref, 0);
+        }
+
         if ($$templateref eq "") { installer::exiter::exit_program("ERROR: Could not find nsi template file $templatefilename!", "create_download_sets"); }
         my $templatefile = installer::files::read_file($$templateref);
 
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index d08a245f7a36..ad6ddabece55 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -45,12 +45,23 @@ sub usage
 {
     print <<Ende;
 --------------------------------------------------------------------------------
-make_download V1.0 (c) Ingo Schmidt-Rosbiegal 2009
+make_download V1.0
 The following parameter are needed:
 -d: Full path to the file containing the follow-me info or to a directory
     containing the follow-me info files. In the latter case, all follow-me
-    info files are evaluated.
+    info files are evaluated. If a directory is used, the successfully used
+    follow-me info files are renamed using a string "success". Files with
+    this string are ignored in repeated processes using "-d" with a
+    directory.
+
 The following parameter are optional:
+-nodownload: Only signing, no creation of download sets (Windows only)
+-useminor: Important for installation sets, created without minor set
+-writetotemp: Necessary, if you do not want to write into solver
+              This can be caused by missing privileges (Windows only)
+-internalcabinet: Not only the cabinet files are signed, but also all
+                  files included in the cabinet files (Windows only).
+
 -sign: Uses signing mechanism to sign installation sets
 If \"-sign\" is set, the following two parameter are required:
 -pfx: Full path to the pfx file
@@ -60,17 +71,19 @@ Examples:
 
 Specifying an installation set (with "-d"):
 
-perl make_sign_and_download.pl -d <followmeinfofilename>
-perl make_sign_and_download.pl -d <followmeinfofilename>
-                               -sign
-                               -pfx <pfxfilename>
-                               -pw <passwordfilename>
+perl make_download.pl -d <followmeinfofilename>
+
+perl make_download.pl -d <followmeinfofilename>
+                         -sign
+                         -pfx <pfxfilename>
+                         -pw <passwordfilename>
 
 or without specifying an installation set:
 
-perl make_sign_and_download.pl -sign
-                               -pfx <pfxfilename>
-                               -pw <passwordfilename>
+perl make_download.pl -d <followmedirectory>
+                      -sign
+                      -pfx <pfxfilename>
+                      -pw <passwordfilename>
 --------------------------------------------------------------------------------
 Ende
     exit(-1);
@@ -92,6 +105,10 @@ sub getparameter
         elsif ($param eq "-pw") { $installer::globals::pwfile = shift(@ARGV); }
         elsif ($param eq "-pfx") { $installer::globals::pfxfile = shift(@ARGV); }
         elsif ($param eq "-sign") { $installer::globals::dosign = 1; }
+        elsif ($param eq "-nodownload") { $installer::globals::nodownload = 1; }
+        elsif ($param eq "-writetotemp") { $installer::globals::writetotemp = 1; }
+        elsif ($param eq "-useminor") { $installer::globals::useminor = 1; }
+        elsif ($param eq "-internalcabinet") { $installer::globals::internal_cabinet_signing = 1; }
         else
         {
             installer::logger::print_error( "unknown parameter: $param" );
@@ -150,6 +167,165 @@ sub checkparameter
 }
 
 #############################################
+# Setting the temporary path for the download
+# and signing process
+#############################################
+
+sub set_temp_path
+{
+    my $temppath = "";
+    my $pid = $$;           # process id
+    my $time = time();      # time
+    my $helperdir = "unpackdir_" . $pid . $time;
+
+    if (( $ENV{'TMP'} ) || ( $ENV{'TEMP'} ))
+    {
+        if ( $ENV{'TMP'} ) { $temppath = $ENV{'TMP'}; }
+        elsif ( $ENV{'TEMP'} )  { $temppath = $ENV{'TEMP'}; }
+        $temppath =~ s/\Q$installer::globals::separator\E\s*$//;    # removing ending slashes and backslashes
+        $temppath = $temppath . $installer::globals::separator . $helperdir;
+
+        if( $^O =~ /cygwin/i )
+        {
+            $temppath = qx{cygpath -w "$temppath"};
+            $temppath =~ s/\\/\//g;
+            $temppath =~ s/\s*$//g;
+        }
+
+        installer::systemactions::create_directory_structure($temppath);
+    }
+    else
+    {
+        installer::logger::print_error( "Error: TMP and TEMP not defined. This is required for this process.\n" );
+        usage();
+        exit(-1);
+    }
+
+    installer::logger::print_message( "\n... using output path: $temppath ...\n" );
+
+    push(@installer::globals::removedirs, $temppath);
+
+    return $temppath;
+}
+
+#############################################
+# Setting output pathes to temp directory
+# This are the:
+# unpackpath and the loggingdir
+#############################################
+
+sub set_output_pathes_to_temp
+{
+    my ($followmeinfohash, $temppath) = @_;
+
+    $followmeinfohash->{'loggingdir'} = $temppath . $installer::globals::separator;
+    $installer::globals::unpackpath = $temppath;
+}
+
+#############################################
+# Setting the minor into the pathes. This is
+# required, if the original installation set
+# was created without minor
+# Value is always saved in
+# $installer::globals::lastminor
+# which is saved in the follow_me file
+#############################################
+
+sub set_minor_into_pathes
+{
+    my ($followmeinfohash, $temppath) = @_;
+
+    installer::logger::print_message( "\n... forcing into minor: $installer::globals::lastminor ...\n" );
+
+    my @pathnames = ("bin", "doc", "inc", "lib", "pck", "res", "xml");
+    my $sourcename = "src";
+    my $srcpath = $installer::globals::separator . $sourcename . $installer::globals::separator;
+
+    if ( $installer::globals::minor ne "" )
+    {
+        installer::logger::print_message( "\n... already defined minor: $installer::globals::minor -> ignoring parameter \"-useminor\" ...\n" );
+        return;
+    }
+
+    # Affected pathes:
+    # $contenthash{'installlogdir'}
+    # $contenthash{'includepatharray'}
+    # $installer::globals::unpackpath
+    # $installer::globals::idttemplatepath
+    # $installer::globals::idtlanguagepath
+
+    installer::logger::include_header_into_logfile("Changing saved pathes to add the minor");
+    my $infoline = "Old pathes:\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "Include pathes:\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
+
+    foreach $onepath ( @pathnames )
+    {
+        my $oldvalue = $installer::globals::separator . $onepath . $installer::globals::separator;
+        my $newvalue = $installer::globals::separator . $onepath . "\." . $installer::globals::lastminor . $installer::globals::separator;
+
+        if (( $followmeinfohash->{'installlogdir'} =~ /\Q$oldvalue\E/ ) && ( ! ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ))) { $followmeinfohash->{'installlogdir'} =~ s/\Q$oldvalue\E/$newvalue/; }
+        if (( $installer::globals::unpackpath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ))) { $installer::globals::unpackpath =~ s/\Q$oldvalue\E/$newvalue/; }
+        if (( $installer::globals::idttemplatepath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idttemplatepath =~ s/\Q$oldvalue\E/$newvalue/; }
+        if (( $installer::globals::idtlanguagepath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idtlanguagepath =~ s/\Q$oldvalue\E/$newvalue/; }
+        foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if (( $path =~ /\Q$oldvalue\E/ ) && ( ! ( $path =~ /\Q$srcpath\E/ ))) { $path =~ s/\Q$oldvalue\E/$newvalue/; } }
+
+        # Checking for the end of the path
+        $oldvalue = $installer::globals::separator . $onepath;
+        $newvalue = $installer::globals::separator . $onepath . "\." . $installer::globals::lastminor;
+
+        if (( $followmeinfohash->{'installlogdir'} =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ))) { $followmeinfohash->{'installlogdir'} =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
+        if (( $installer::globals::unpackpath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ))) { $installer::globals::unpackpath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
+        if (( $installer::globals::idttemplatepath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idttemplatepath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
+        if (( $installer::globals::idtlanguagepath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idtlanguagepath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
+        foreach my $path ( @{$followmeinfohash->{'includepatharray'}} )
+        {
+            if (( $path =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $path =~ /\Q$srcpath\E/ )))
+            {
+                $path =~ s/\Q$oldvalue\E\s*$/$newvalue/;
+                $path = $path . "\n";
+            }
+        }
+    }
+
+    # And now can follow the replacement for the source path "src". Subdirs like "bin" in the source tree
+    # must not get the minor. This is instead "src.m9/instsetoo_native/common.pro/bin/..."
+    # Directory "src" can never be the end of the path
+
+    my $newsrcpath = $installer::globals::separator . $sourcename . "\." . $installer::globals::lastminor . $installer::globals::separator;
+
+    if ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ) { $followmeinfohash->{'installlogdir'} =~ s/\Q$srcpath\E/$newsrcpath/; }
+    if ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ) { $installer::globals::unpackpath =~ s/\Q$srcpath\E/$newsrcpath/; }
+    if ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ) { $installer::globals::idttemplatepath =~ s/\Q$srcpath\E/$newsrcpath/; }
+    if ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ) { $installer::globals::idtlanguagepath =~ s/\Q$srcpath\E/$newsrcpath/; }
+    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if ( $path =~ /\Q$srcpath\E/ ) { $path =~ s/\Q$srcpath\E/$newsrcpath/; } }
+
+    $infoline = "\nNew pathes:\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    $infoline = "Include pathes:\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
+}
+
+#############################################
 # Setting the name of the log file
 #############################################
 
@@ -291,10 +467,13 @@ sub createproductlist
     # If "-d" specifies an installation set, there is only one product
 
     my @infofilelist = ();
+    my @infofilelist2 = ();
 
     if ( -f $installer::globals::followmeinfofilename )
     {
         push(@infofilelist, $installer::globals::followmeinfofilename);
+        # Saving info, that this is a file
+        $installer::globals::followme_from_directory = 0;
     }
     elsif ( -d $installer::globals::followmeinfofilename )
     {
@@ -309,6 +488,9 @@ sub createproductlist
             exit(-1);
         }
 
+        # Saving info, that this is a directory
+        $installer::globals::followme_from_directory = 1;
+
         # Collect all possible installation sets
         # CWS: All installation sets
         # Master: All installation sets with same major, minor and buildid. Additionally using the highest number.
@@ -322,7 +504,7 @@ sub createproductlist
             {
                 my $fullfilename = $installer::globals::followmeinfofilename . $installer::globals::separator . $onefile;
                 my $installdir = get_property_from_file($fullfilename, "finalinstalldir");
-                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist, $fullfilename); }
+                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist2, $fullfilename); }
             }
         }
         else
@@ -334,10 +516,18 @@ sub createproductlist
                 my $fullfilename = $installer::globals::followmeinfofilename . $installer::globals::separator . $onefile;
                 # Check, if installation set still exists
                 my $installdir = get_property_from_file($fullfilename, "finalinstalldir");
-                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist, $fullfilename); }
+                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist2, $fullfilename); }
             }
         }
 
+        # Removing all files, starting with "follow_me_success_" in their names. This have already been used successfully.
+
+        foreach my $onefile ( @infofilelist2 )
+        {
+            if ( $onefile =~ /follow_me_success_/ ) { next; }
+            push(@infofilelist, $onefile);
+        }
+
         # Checking, if there is content in the list
         if ( ! ( $#infofilelist > -1 ))
         {
@@ -374,4 +564,26 @@ sub logfollowmeinfohash
     foreach my $key ( sort keys %{$followmehash->{'allvariableshash'}} ) { print "allvariableshash: $key : $followmehash->{'allvariableshash'}->{$key}\n"; }
 }
 
+########################################################################
+# Renaming the follow me info file, if it was successfully used.
+# This can only be done, if the parameter "-d" was used with a
+# directory, not a name. In this case the repeated use of parameter
+# "-d" with this directory has to ignore this already successfully
+# used file.
+########################################################################
+
+sub rename_followme_infofile
+{
+    my ( $filename ) = @_;
+
+    my $newfilename = $filename;
+    $newfilename =~ s/follow_me_/follow_me_success_/;   # including "_success" after "follow_me"
+
+    if ( $filename ne $newfilename )
+    {
+        my $returnvalue = rename($filename, $newfilename);
+        if ( $returnvalue ) { installer::logger::print_message( "\n... renamed file \"$filename\" to \"$newfilename\" ...\n" ); }
+    }
+}
+
 1;
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 497479380331..01cf2aa5e08d 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -593,6 +593,9 @@ sub create_epm_header
     # if ( $installer::globals::patch )
     # {
     #   $onepackage->{$provides} = "";
+        my $isdict = 0;
+        if ( $onepackage->{'packagename'} =~ /-dict-/ ) { $isdict = 1;  }
+
     #   $onepackage->{$requires} = "";
     # }
 
@@ -636,7 +639,7 @@ sub create_epm_header
         {
             my $onerequires = ${$allrequires}[$i];
             $onerequires =~ s/\s*$//;
-            installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0);
+            installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0, $isdict);
 
             # Special handling for Solaris. In depend files, the names of the packages are required, not
             # only the abbreviation. Therefore there is a special syntax for names in packagelist:
@@ -2247,26 +2250,43 @@ sub determine_rpm_version
 {
     my $rpmversion = 0;
     my $rpmout = "";
+    my $systemcall = "";
+
+    # my $systemcall = "rpm --version |";
+    # "rpm --version" has problems since LD_LIBRARY_PATH was removed. Therefore the content of $RPM has to be called.
+    # "rpm --version" and "rpmbuild --version" have the same output. Therefore $RPM can be used. Its value
+    # is saved in $installer::globals::rpm
+
+    if ( $installer::globals::rpm ne "" )
+    {
+        $systemcall = "$installer::globals::rpm --version |";
+    }
+    else
+    {
+        $systemcall = "rpm --version |";
+    }
 
-    my $systemcall = "rpm --version |";
     open (RPM, "$systemcall");
     $rpmout = <RPM>;
     close (RPM);
 
-    $rpmout =~ s/\s*$//g;
+    if ( $rpmout ne "" )
+    {
+        $rpmout =~ s/\s*$//g;
 
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
+        my $infoline = "Systemcall: $systemcall\n";
+        push( @installer::globals::logfileinfo, $infoline);
 
-    if ( $rpmout eq "" ) { $infoline = "ERROR: Could not find file \"rpm\" !\n"; }
-    else { $infoline = "Success: rpm version: $rpmout\n"; }
+        if ( $rpmout eq "" ) { $infoline = "ERROR: Could not find file \"rpm\" !\n"; }
+        else { $infoline = "Success: rpm version: $rpmout\n"; }
 
-    push( @installer::globals::logfileinfo, $infoline);
+        push( @installer::globals::logfileinfo, $infoline);
 
-    if ( $rpmout =~ /(\d+)\.(\d+)\.(\d+)/ ) { $rpmversion = $1; }
-    elsif ( $rpmout =~ /(\d+)\.(\d+)/ ) { $rpmversion = $1; }
-    elsif ( $rpmout =~ /(\d+)/ ) { $rpmversion = $1; }
-    else { installer::exiter::exit_program("ERROR: Unknown format: $rpmout ! Expected: \"a.b.c\", or \"a.b\", or \"a\"", "determine_rpm_version"); }
+        if ( $rpmout =~ /(\d+)\.(\d+)\.(\d+)/ ) { $rpmversion = $1; }
+        elsif ( $rpmout =~ /(\d+)\.(\d+)/ ) { $rpmversion = $1; }
+        elsif ( $rpmout =~ /(\d+)/ ) { $rpmversion = $1; }
+        else { installer::exiter::exit_program("ERROR: Unknown format: $rpmout ! Expected: \"a.b.c\", or \"a.b\", or \"a\"", "determine_rpm_version"); }
+    }
 
     return $rpmversion;
 }
@@ -2502,7 +2522,7 @@ sub create_packages_without_epm
 
         # saving globally for later usage
         $installer::globals::rpmcommand = $rpmcommand;
-        $installer::globals::rpmquerycommand = "rpm"; # For queries "rpm" is used, not "rpmbuild" (for this call the LD_LIBRARY_PATH is not required!)
+        $installer::globals::rpmquerycommand = "rpm";
 
         my $target = "";
         if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
@@ -2519,11 +2539,12 @@ sub create_packages_without_epm
             $buildrootstring = "--buildroot=$buildroot";
         }
 
-        my $systemcall = "$rpmcommand -bb $specfilename --target $target $buildrootstring 2\>\&1 |";
+        my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
 
         installer::logger::print_message( "... $systemcall ...\n" );
 
         my $maxrpmcalls = 3;
+        my $rpm_failed = 0;
 
         for ( my $i = 1; $i <= $maxrpmcalls; $i++ )
         {
@@ -2540,7 +2561,8 @@ sub create_packages_without_epm
 
             for ( my $j = 0; $j <= $#rpmoutput; $j++ )
             {
-                if ( $i < $maxrpmcalls ) { $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
+                # if ( $i < $maxrpmcalls ) { $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
+                $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig;
                 push( @installer::globals::logfileinfo, "$rpmoutput[$j]");
             }
 
@@ -2548,16 +2570,64 @@ sub create_packages_without_epm
             {
                 $infoline = "Try $i : Could not execute \"$systemcall\"!\n";
                 push( @installer::globals::logfileinfo, $infoline);
-                if ( $i == $maxrpmcalls ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "create_packages_without_epm"); }
+                $rpm_failed = 1;
             }
             else
             {
                 installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
                 $infoline = "Success: Executed \"$systemcall\" successfully!\n";
                 push( @installer::globals::logfileinfo, $infoline);
+                $rpm_failed = 0;
                 last;
             }
         }
+
+        if ( $rpm_failed )
+        {
+            # Because of the problems with LD_LIBARY_PATH, a direct call of local "rpm" or "rpmbuild" might be successful
+            my $rpmprog = "";
+            if ( -f "/usr/bin/rpmbuild" ) { $rpmprog = "/usr/bin/rpmbuild"; }
+            elsif ( -f "/usr/bin/rpm" ) { $rpmprog = "/usr/bin/rpm"; }
+
+            if ( $rpmprog ne "" )
+            {
+                installer::logger::print_message( "... $rpmprog ...\n" );
+
+                my $helpersystemcall = "$rpmprog -bb $specfilename --target $target $buildrootstring 2\>\&1 |";
+
+                my @helperrpmoutput = ();
+
+                open (RPM, "$helpersystemcall");
+                while (<RPM>) {push(@helperrpmoutput, $_); }
+                close (RPM);
+
+                my $helperreturnvalue = $?; # $? contains the return value of the systemcall
+
+                $infoline = "\nLast try: Using $rpmprog directly (problem with LD_LIBARY_PATH)\n";
+                push( @installer::globals::logfileinfo, $infoline);
+
+                $infoline = "\nSystemcall: $helpersystemcall\n";
+                push( @installer::globals::logfileinfo, $infoline);
+
+                for ( my $j = 0; $j <= $#helperrpmoutput; $j++ ) { push( @installer::globals::logfileinfo, "$helperrpmoutput[$j]"); }
+
+                if ($helperreturnvalue)
+                {
+                    $infoline = "Could not execute \"$helpersystemcall\"!\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                }
+                else
+                {
+                    installer::logger::print_message( "Success: \"$helpersystemcall\"\n" );
+                    $infoline = "Success: Executed \"$helpersystemcall\" successfully!\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    $rpm_failed = 0;
+                }
+            }
+
+            # Now it is really time to exit this packaging process, if the error still occurs
+            if ( $rpm_failed ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "create_packages_without_epm"); }
+        }
     }
 }
 
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index fe61f10b023d..128dbcd9ed7e 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -144,13 +144,25 @@ sub read_followme_info
         my $line = ${$filecontent}[$i];
 
         if ( $line =~ /^\s*finalinstalldir:\s*(.*?)\s*$/ ) { $finalinstalldir = $1; }
+        if( $^O =~ /cygwin/i ) { $finalinstalldir =~ s/\\/\//; }
+        if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $finalinstalldir =~ s/\//\\/; }
         if ( $line =~ /^\s*downloadname:\s*(.*?)\s*$/ ) { $downloadname = $1; }
         if ( $line =~ /^\s*currentinstallnumber:\s*(.*?)\s*$/ ) { $currentinstallnumber = $1; }
         if ( $line =~ /^\s*loggingdir:\s*(.*?)\s*$/ ) { $loggingdir = $1; }
+        if( $^O =~ /cygwin/i ) { $loggingdir =~ s/\\/\//; }
+        if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $loggingdir =~ s/\//\\/; }
         if ( $line =~ /^\s*installlogdir:\s*(.*?)\s*$/ ) { $installlogdir = $1; }
+        if( $^O =~ /cygwin/i ) { $installlogdir =~ s/\\/\//; }
+        if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installlogdir =~ s/\//\\/; }
         if ( $line =~ /^\s*languagestring:\s*(.*?)\s*$/ ) { $languagestring = $1; }
         if ( $line =~ /^\s*languagesarray:\s*(.*?)\s*$/ ) { push(@languagesarray, $1); }
-        if ( $line =~ /^\s*includepatharray:\s*(.*?)\s*$/ ) { push(@includepatharray, $1 . "\n"); }
+        if ( $line =~ /^\s*includepatharray:\s*(.*?)\s*$/ )
+        {
+            my $path = $1;
+            if( $^O =~ /cygwin/i ) { $path  =~ s/\\/\//; }
+            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $path =~ s/\//\\/; }
+            push(@includepatharray, $path . "\n");
+        }
         if ( $line =~ /^\s*allvariableshash:\s*(.*?)\s*:\s*(.*?)\s*$/ ) { $allvariableshash{$1} = $2; }
         if ( $line =~ /^\s*globals:(.*?)\s*:\s*(.*?)\s*$/ )
         {
@@ -176,8 +188,14 @@ sub read_followme_info
             if ( $name eq "issolaris" ) { $installer::globals::issolaris = $value; }
             if ( $name eq "islinux" ) { $installer::globals::islinux = $value; }
             if ( $name eq "unpackpath" ) { $installer::globals::unpackpath = $value; }
+            if( $^O =~ /cygwin/i ) { $installer::globals::unpackpath =~ s/\\/\//; }
+            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::unpackpath =~ s/\//\\/; }
             if ( $name eq "idttemplatepath" ) { $installer::globals::idttemplatepath = $value; }
+            if( $^O =~ /cygwin/i ) { $installer::globals::idttemplatepath =~ s/\\/\//; }
+            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::idttemplatepath =~ s/\//\\/; }
             if ( $name eq "idtlanguagepath" ) { $installer::globals::idtlanguagepath = $value; }
+            if( $^O =~ /cygwin/i ) { $installer::globals::idtlanguagepath =~ s/\\/\//; }
+            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::idtlanguagepath =~ s/\//\\/; }
             if ( $name eq "logfilename" ) { $installer::globals::logfilename = $value; }
             if ( $name eq "product" ) { $installer::globals::product = $value; }
             if ( $name eq "patch" ) { $installer::globals::patch = $value; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 38fae7ff2fe0..4d3a1d1579aa 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -242,6 +242,11 @@ BEGIN
     $exitlog = "";
     $globalinfo_copied = 0;
     $quiet = 0;
+    $nodownload = 0;
+    $writetotemp = 0;
+    $useminor = 0;
+    $followme_from_directory = 0;
+    $internal_cabinet_signing = 0;
 
     $debug = 0;
     $debugfilename = "debug.txt";
@@ -332,6 +337,7 @@ BEGIN
     $patch = 0;
     $patchincludepath = "";
     $refresh_includepathes = 0;
+    $include_pathes_read = 0;
     $patchfilelistname = "patchfilelist.txt";
     @patchfilecollector = ();
     $nopatchfilecollector = "";
@@ -381,6 +387,7 @@ BEGIN
     $uredirgid = "";
     $sundirgid = "";
 
+    %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
     %treestyles = ("UREDIRECTORY" => "INSTALLURE", "BASISDIRECTORY" => "INSTALLBASIS", "OFFICEDIRECTORY" => "INSTALLOFFICE");
     %installlocations = ("INSTALLLOCATION" => "1", "BASISINSTALLLOCATION" => "1", "OFFICEINSTALLLOCATION" => "1", "UREINSTALLLOCATION" => "1");
     %treelayername = ("UREDIRECTORY" => "URE", "BASISDIRECTORY" => "BASIS", "OFFICEDIRECTORY" => "BRAND");
@@ -473,7 +480,6 @@ BEGIN
 
     if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
     {
-        $unzippath = "unzip.exe";           # Has to be in the path: r:\btw\unzip.exe
         $zippath= "zip.exe";                # Has to be in the path: r:\btw\zip.exe
         $checksumfile = "so_checksum.exe";
         $unopkgfile = "unopkg.exe";
@@ -500,7 +506,6 @@ BEGIN
     }
     elsif (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" ))
     {
-        $unzippath = "unzip";               # Has to be in the path: /usr/bin/unzip
         $zippath = "zip";                   # Has to be in the path: /usr/bin/zip
         $checksumfile = "so_checksum";
         $unopkgfile = "unopkg.exe";
@@ -518,7 +523,6 @@ BEGIN
     }
     else
     {
-        $unzippath = "unzip";               # Has to be in the path: /usr/bin/unzip
         $zippath = "zip";                   # Has to be in the path: /usr/bin/zip
         $checksumfile = "so_checksum";
         $unopkgfile = "unopkg";
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index fce606f7bfdf..79eaa3a96d7d 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -453,6 +453,38 @@ sub resolve_packagevariables
 
     my $key;
 
+    # Special handling for dictionaries
+    if ( $$packagenameref =~ /-dict-/ )
+    {
+        if (exists($variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}) ) { $$packagenameref =~ s/\%UNIXPRODUCTNAME/$variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}/g; }
+        if (exists($variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}) ) { $$packagenameref =~ s/\%BRANDPACKAGEVERSION/$variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}/g; }
+    }
+
+    foreach $key (keys %{$variableshashref})
+    {
+        my $value = $variableshashref->{$key};
+        if ( $make_lowercase ) { $value = lc($value); }
+        $$packagenameref =~ s/\%$key/$value/g;
+    }
+}
+
+#####################################################################
+# Resolving all variables in the packagename.
+#####################################################################
+
+sub resolve_packagevariables2
+{
+    my ($packagenameref, $variableshashref, $make_lowercase, $isdict ) = @_;
+
+    my $key;
+
+    # Special handling for dictionaries
+    if ( $isdict )
+    {
+        if (exists($variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}) ) { $$packagenameref =~ s/\%UNIXPRODUCTNAME/$variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}/g; }
+        if (exists($variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}) ) { $$packagenameref =~ s/\%BRANDPACKAGEVERSION/$variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}/g; }
+    }
+
     foreach $key (keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index 7ade6dee9c80..5d445d92dc13 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -78,7 +78,7 @@ sub convert_to_unicode
 
 sub replace_productname_in_file
 {
-    my ($sourcepath, $destpath, $variableshashref) = @_;
+    my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_;
 
     my $onefile = installer::files::read_binary_file($sourcepath);
 
@@ -87,6 +87,7 @@ sub replace_productname_in_file
     for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
 
     my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
+    if ( $filedescription ne "" ) { $productname = $filedescription; }
     my $unicode_productname = convert_to_unicode($productname);
 
     change_length_of_string(\$unicode_productname, $replacestring);
@@ -124,6 +125,7 @@ sub resolving_patchsoname_flag
             # Language specific subdirectory
 
             my $onelanguage = $onefile->{'specificlanguage'};
+            my $filedescription = "";
 
             if ($onelanguage eq "")
             {
@@ -140,6 +142,8 @@ sub resolving_patchsoname_flag
             my $destinationpath = $replacedir . $onefilename;
             my $movepath = $destinationpath . ".orig";
 
+            if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; }
+
             # if (!(-f $destinationpath))   # do nothing if the file already exists
             # {
 
@@ -148,7 +152,7 @@ sub resolving_patchsoname_flag
             if ( $copysuccess )
             {
                 # Now the file can be patch (binary!)
-                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref);
+                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription);
 
                 if ($found == 0)
                 {
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index d02f91a62dcc..0ef8283705b6 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -638,6 +638,28 @@ sub shift_basis_directory_parents
 }
 
 ################################################################################
+# Setting the name of the directory with style OFFICEDIRECTORY.
+# The name can be defined in property OFFICEDIRECTORYNAME.
+################################################################################
+
+sub set_officedirectory_name
+{
+    my ($dirsref, $officedirname) = @_;
+
+    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
+    {
+        my $onedir = ${$dirsref}[$i];
+        my $styles = "";
+        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
+        if ( $styles =~ /\bOFFICEDIRECTORY\b/ )
+        {
+            $onedir->{'HostName'} = $officedirname;
+            last;
+        }
+    }
+}
+
+################################################################################
 # Simplifying the name for language dependent items from "Name (xy)" to "Name"
 ################################################################################
 
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 0e5a588d3299..e43a8325f775 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -31,7 +31,9 @@
 
 package installer::simplepackage;
 
+# use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 use Cwd;
+use File::Copy;
 use installer::download;
 use installer::exiter;
 use installer::globals;
@@ -86,6 +88,14 @@ sub register_extensions
 
     my $unopkgfile = $installer::globals::unopkgfile;
 
+    my $unopkgexists = 1;
+    if (( $installer::globals::languagepack ) && ( ! -f $unopkgfile ))
+    {
+        $unopkgexists = 0;
+        $infoline = "Language packs do not contain unopkg!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
     # my $extensiondir = $officedir . $installer::globals::separator . "share" .
     #           $installer::globals::separator . "extension" .
     #           $installer::globals::separator . "install";
@@ -94,7 +104,7 @@ sub register_extensions
 
     my $allextensions = installer::systemactions::find_file_with_file_extension("oxt", $extensiondir);
 
-    if ( $#{$allextensions} > -1)
+    if (( $#{$allextensions} > -1 ) && ( $unopkgexists ))
     {
         my $currentdir = cwd();
         print "... current dir: $currentdir ...\n";
@@ -114,7 +124,7 @@ sub register_extensions
 
             if ( $installer::globals::iswindowsbuild )
             {
-                if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" ))
+                if ( $^O =~ /cygwin/i )
                 {
                     $localtemppath = $installer::globals::cyg_temppath;
                 }
@@ -135,7 +145,11 @@ sub register_extensions
             my @unopkgoutput = ();
 
             open (UNOPKG, $systemcall);
-            while (<UNOPKG>) {push(@unopkgoutput, $_); }
+            while (<UNOPKG>)
+            {
+                my $lastline = $_;
+                push(@unopkgoutput, $lastline);
+            }
             close (UNOPKG);
 
             for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
@@ -157,8 +171,11 @@ sub register_extensions
     }
     else
     {
-        $infoline = "No extensions located in directory $extensiondir.\n";
-        push( @installer::globals::logfileinfo, $infoline);
+        if ( ! ( $#{$allextensions} > -1 ))
+        {
+            $infoline = "No extensions located in directory $extensiondir.\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
     }
 
     chdir($from);
@@ -180,13 +197,14 @@ sub create_package
     my $tempdir = $installdir . "_temp" . "." . $pid;
     my $systemcall = "";
     my $from = "";
+    my $makesystemcall = 1;
     my $return_to_start = 0;
     installer::systemactions::rename_directory($installdir, $tempdir);
 
     # creating new directory with original name
     installer::systemactions::create_directory($installdir);
 
-        my $archive =  $installdir . $installer::globals::separator . $packagename . $installer::globals::archiveformat;
+    my $archive =  $installdir . $installer::globals::separator . $packagename . $installer::globals::archiveformat;
 
     if ( $archive =~ /zip$/ )
     {
@@ -194,7 +212,12 @@ sub create_package
         $return_to_start = 1;
         chdir($tempdir);
         $systemcall = "$installer::globals::zippath -qr $archive .";
-        # $systemcall = "$installer::globals::zippath -r $archive .";
+
+        # Using Archive::Zip fails because of very long path names below "share/uno_packages/cache"
+        # my $packzip = Archive::Zip->new();
+        # $packzip->addTree(".");   # after changing into $tempdir
+        # $packzip->writeToFileNamed($archive);
+        # $makesystemcall = 0;
     }
      elsif ( $archive =~ /dmg$/ )
     {
@@ -234,20 +257,23 @@ sub create_package
         $systemcall = "cd $tempdir; $ldpreloadstring tar -cf - . | gzip > $archive";
     }
 
-    print "... $systemcall ...\n";
-    my $returnvalue = system($systemcall);
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
+    if ( $makesystemcall )
     {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        print "... $systemcall ...\n";
+        my $returnvalue = system($systemcall);
+        my $infoline = "Systemcall: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
+
+        if ($returnvalue)
+        {
+            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        else
+        {
+            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
     }
 
     if ( $return_to_start ) { chdir($from); }
@@ -319,7 +345,20 @@ sub create_simple_package
         if ( $onedir->{'HostName'} )
         {
             my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
-            if ( ! -d $destdir ) { installer::systemactions::create_directory_structure($destdir); }
+            if ( ! -d $destdir )
+            {
+                if ( $^O =~ /cygwin/i ) # Cygwin performance check
+                {
+                    $infoline = "Try to create directory $destdir\n";
+                    push(@installer::globals::logfileinfo, $infoline);
+                    # Directories in $dirsref are sorted and all parents were added -> "mkdir" works without parent creation!
+                    if ( ! ( -d $destdir )) { mkdir($destdir, 0775); }
+                }
+                else
+                {
+                    installer::systemactions::create_directory_structure($destdir);
+                }
+            }
         }
     }
 
@@ -345,19 +384,32 @@ sub create_simple_package
         $source =~ s/\$\$/\$/;
         $destination =~ s/\$\$/\$/;
 
-        installer::systemactions::copy_one_file($source, $destination);
+        if ( $^O =~ /cygwin/i ) # Cygwin performance, do not use copy_one_file. "chmod -R" at the end
+        {
+            my $copyreturn = copy($source, $destination);
 
-        if (( ! $installer::globals::iswindowsbuild ) ||
-            (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" )))
+            if ($copyreturn)
+            {
+                $infoline = "Copy: $source to $destination\n";
+                $returnvalue = 1;
+            }
+            else
+            {
+                $infoline = "ERROR: Could not copy $source to $destination\n";
+                $returnvalue = 0;
+            }
+
+            push(@installer::globals::logfileinfo, $infoline);
+        }
+        else
         {
+            installer::systemactions::copy_one_file($source, $destination);
+            # see issue 102274
             my $unixrights = "";
             if ( $onefile->{'UnixRights'} )
             {
                 $unixrights = $onefile->{'UnixRights'};
 
-                # special unix rights "555" on cygwin
-                if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" ) && ( $unixrights =~ /444/ )) { $unixrights = "555"; }
-
                 my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
                 system($localcall);
             }
@@ -396,6 +448,17 @@ sub create_simple_package
         push(@installer::globals::logfileinfo, $infoline);
     }
 
+    # Setting privileges for cygwin globally
+
+    if ( $^O =~ /cygwin/i )
+    {
+        installer::logger::print_message( "... changing privileges in $subfolderdir ...\n" );
+        installer::logger::include_header_into_logfile("Changing privileges in $subfolderdir:");
+
+        my $localcall = "chmod -R 755 " . "\"" . $subfolderdir . "\"";
+        system($localcall);
+    }
+
     # Registering the extensions
 
     installer::logger::print_message( "... registering extensions ...\n" );
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 16cd938c6280..4ed369d625e5 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -1640,4 +1640,41 @@ sub read_complete_directory
     }
 }
 
+##############################################################
+# Reading all files from a directory and its subdirectories
+# Version 2
+##############################################################
+
+sub read_full_directory {
+    my ( $currentdir, $pathstring, $collector ) = @_;
+    my $item;
+    my $fullname;
+    local *DH;
+
+    unless (opendir(DH, $currentdir))
+    {
+        return;
+    }
+    while (defined ($item = readdir(DH)))
+    {
+        next if($item eq "." or $item eq "..");
+        $fullname = $currentdir . $installer::globals::separator . $item;
+        my $sep = "";
+        if ( $pathstring ne "" ) { $sep = $installer::globals::separator; }
+
+        if( -d $fullname)
+        {
+            my $newpathstring = $pathstring . $sep . $item;
+            read_full_directory($fullname, $newpathstring, $collector) if(-d $fullname);
+        }
+        else
+        {
+            my $content = $pathstring . $sep . $item;
+            push(@{$collector}, $content);
+        }
+    }
+    closedir(DH);
+    return
+}
+
 1;
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 0c8a7ff9912c..7e8a14a94123 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -37,6 +37,7 @@ use installer::files;
 use installer::globals;
 use installer::pathanalyzer;
 use installer::systemactions;
+use installer::worker;
 use installer::windows::idtglobal;
 
 #################################################################################
@@ -51,6 +52,19 @@ sub unpack_cabinet_file
     push( @installer::globals::logfileinfo, $infoline);
 
     my $expandfile = "expand.exe";  # Has to be in the path
+
+    # expand.exe has to be located in the system directory.
+    # Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course.
+    # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack
+    # cabinet files.
+
+    if ( $^O =~ /cygwin/i )
+    {
+        $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
+        $expandfile =~ s/\\/\//;
+        if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
+    }
+
     my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log";
 
     # exclude cabinet file
@@ -60,7 +74,9 @@ sub unpack_cabinet_file
     if ( $^O =~ /cygwin/i ) {
         my $localunpackdir = qx{cygpath -w "$unpackdir"};
         $localunpackdir =~ s/\\/\\\\/g;
-        $systemcall = $expandfile . " " . $cabfilename . " -F:\\\* " . $localunpackdir;
+        $cabfilename =~ s/\\/\\\\/g;
+        $cabfilename =~ s/\s*$//g;
+        $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir;
     }
     else
     {
@@ -152,9 +168,33 @@ sub extract_tables_from_pcpfile
     my $systemcall = "";
     my $returnvalue = "";
 
+    my $localfullmsidatabasepath = $fullmsidatabasepath;
+
     # Export of all tables by using "*"
 
-    $systemcall = $msidb . " -d " . $fullmsidatabasepath . " -f " . $workdir . " -e $tablelist";
+    if ( $^O =~ /cygwin/i ) {
+        # Copying the msi database locally guarantees the format of the directory.
+        # Otherwise it is defined in the file of UPDATE_DATABASE_LISTNAME
+
+        my $msifilename = $localfullmsidatabasepath;
+        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$msifilename);
+        my $destdatabasename = $workdir . $installer::globals::separator . $msifilename;
+        installer::systemactions::copy_one_file($localfullmsidatabasepath, $destdatabasename);
+        $localfullmsidatabasepath = $destdatabasename;
+
+        chomp( $localfullmsidatabasepath = qx{cygpath -w "$localfullmsidatabasepath"} );
+        chomp( $workdir = qx{cygpath -w "$workdir"} );
+
+        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $localfullmsidatabasepath =~ s/\\/\\\\/g;
+        $workdir =~ s/\\/\\\\/g;
+
+        # and if there are still slashes, they also need to be double backslash
+        $localfullmsidatabasepath =~ s/\//\\\\/g;
+        $workdir =~ s/\//\\\\/g;
+    }
+
+    $systemcall = $msidb . " -d " . $localfullmsidatabasepath . " -f " . $workdir . " -e $tablelist";
     $returnvalue = system($systemcall);
 
     $infoline = "Systemcall: $systemcall\n";
@@ -164,7 +204,7 @@ sub extract_tables_from_pcpfile
     {
         $infoline = "ERROR: Could not execute $systemcall !\n";
         push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not exclude tables from pcp file: $fullmsidatabasepath !", "extract_tables_from_pcpfile");
+        installer::exiter::exit_program("ERROR: Could not exclude tables from pcp file: $localfullmsidatabasepath !", "extract_tables_from_pcpfile");
     }
     else
     {
@@ -672,7 +712,16 @@ sub write_sis_info
     my $lastprinted = get_sis_time_string();
     my $lastsavedby = "Installer";
 
-    $systemcall = $msiinfo . " " . "\"" . $msidatabase . "\"" . " -w " . $wordcount . " -s " . "\"" . $lastprinted . "\"" . " -l $lastsavedby";
+    my $localmsidatabase = $msidatabase;
+
+    if( $^O =~ /cygwin/i )
+    {
+        $localmsidatabase = qx{cygpath -w "$localmsidatabase"};
+        $localmsidatabase =~ s/\\/\\\\/g;
+        $localmsidatabase =~ s/\s*$//g;
+    }
+
+    $systemcall = $msiinfo . " " . "\"" . $localmsidatabase . "\"" . " -w " . $wordcount . " -s " . "\"" . $lastprinted . "\"" . " -l $lastsavedby";
     push(@installer::globals::logfileinfo, $systemcall);
     $returnvalue = system($systemcall);
 
@@ -706,7 +755,13 @@ sub make_admin_install
 
     # Unpack all cab files into $helperdir, cab files must be located next to msi database
     my $installdir = $databasepath;
+
+    if ( $^O =~ /cygwin/i ) { $installdir =~ s/\\/\//g; } # backslash to slash
+
     installer::pathanalyzer::get_path_from_fullqualifiedname(\$installdir);
+
+    if ( $^O =~ /cygwin/i ) { $installdir =~ s/\//\\/g; } # slash to backslash
+
     my $databasefilename = $databasepath;
     installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$databasefilename);
 
@@ -720,7 +775,15 @@ sub make_admin_install
 
     for ( my $i = 0; $i <= $#{$cabfiles}; $i++ )
     {
-        my $cabfile = $installdir . $installer::globals::separator . ${$cabfiles}[$i];
+        my $cabfile = "";
+        if ( $^O =~ /cygwin/i )
+        {
+            $cabfile = $installdir . ${$cabfiles}[$i];
+        }
+        else
+        {
+            $cabfile = $installdir . $installer::globals::separator . ${$cabfiles}[$i];
+        }
         unpack_cabinet_file($cabfile, $unpackdir);
     }
 
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 505bd39979c7..e8d46c124317 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -39,6 +39,7 @@ use installer::globals;
 use installer::logger;
 use installer::pathanalyzer;
 use installer::worker;
+use installer::windows::font;
 use installer::windows::idtglobal;
 use installer::windows::language;
 
@@ -453,7 +454,7 @@ sub get_filesize
 
 sub get_fileversion
 {
-    my ($onefile, $allvariables) = @_;
+    my ($onefile, $allvariables, $styles) = @_;
 
     my $fileversion = "";
 
@@ -473,6 +474,12 @@ sub get_fileversion
         if ( $allvariables->{'VENDORPATCHVERSION'} ) { $vendornumber = $allvariables->{'VENDORPATCHVERSION'}; }
         $fileversion = $libraryversion . "\." . $installer::globals::buildid . "\." . $vendornumber;
         if ( $onefile->{'FileVersion'} ) { $fileversion = $onefile->{'FileVersion'}; } # overriding FileVersion in scp
+
+        # if ( $styles =~ /\bFONT\b/ )
+        # {
+        #   my $newfileversion = installer::windows::font::get_font_version($onefile->{'sourcepath'});
+        #   if ( $newfileversion != 0 ) { $fileversion = $newfileversion; }
+        # }
     }
 
     if ( $installer::globals::prepare_winpatch ) { $fileversion = ""; } # Windows patches do not allow this version # -> who says so?
@@ -803,7 +810,7 @@ sub create_files_table
 
         $file{'FileSize'} = get_filesize($onefile);
 
-        $file{'Version'} = get_fileversion($onefile, $allvariables);
+        $file{'Version'} = get_fileversion($onefile, $allvariables, $styles);
 
         $file{'Language'} = get_language_for_file($onefile);
 
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
index 86294771e56d..fec60e719150 100644
--- a/solenv/bin/modules/installer/windows/font.pm
+++ b/solenv/bin/modules/installer/windows/font.pm
@@ -80,4 +80,35 @@ sub create_font_table
 
 }
 
-1;
\ No newline at end of file
+#################################################################################
+# Reading the Font version from the ttf file, to avoid installation
+# of older files over newer files.
+#################################################################################
+
+sub get_font_version
+{
+    my ( $fontfile ) = @_;
+
+    if ( ! -f $fontfile ) { installer::exiter::exit_program("ERROR: Font file does not exist: \"$fontfile\"", "get_font_version"); }
+
+    my $fontversion = 0;
+    my $infoline = "";
+
+    my $onefile = installer::files::read_binary_file($fontfile);
+
+    if ( $onefile =~ /Version\s+(\d+\.\d+\.*\d*)/ )
+    {
+        $fontversion = $1;
+        $infoline = "FONT: Font \"$fontfile\" version: $fontversion\n";
+        push(@installer::globals::logfileinfo, $infoline);
+    }
+    else
+    {
+        $infoline = "FONT: Could not determine font version: \"$fontfile\"\n";
+        push(@installer::globals::logfileinfo, $infoline);
+    }
+
+    return $fontversion;
+}
+
+1;
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index c61a6789fdcb..991f0025e714 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1381,7 +1381,7 @@ sub add_custom_action_to_install_table
         my $line = $actionname . "\t" . $actioncondition . "\t" . $actionposition . "\n";
         push(@{$installtable}, $line);
 
-        $infoline = "Added $actionname CustomAction into table $customactionidttablename (NO_FILE has been set)\n";
+        $infoline = "Added $actionname CustomAction into table $installtablename (NO_FILE has been set)\n";
         push(@installer::globals::logfileinfo, $infoline);
         return;
     }
@@ -2089,7 +2089,7 @@ sub get_customaction_position
     {
         my $line = ${$sequencetable}[$i];
 
-        if ( $line =~ /^\s*(\w+)\t.*\t\s*(\d+)\s$/ )    # matching only, if position is a number!
+        if ( $line =~ /^\s*([\w\.]+)\t.*\t\s*(\d+)\s$/ )    # matching only, if position is a number!
         {
             my $compareaction = $1;
             my $localposition = $2;
@@ -2123,7 +2123,7 @@ sub set_positions_in_table
 
     for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
     {
-        if ( ${$sequencetable}[$i] =~ /^\s*(\w+)\t.*\t\s*POSITIONTEMPLATE_end\s*$/ )
+        if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*POSITIONTEMPLATE_end\s*$/ )
         {
             my $customaction = $1;
             $lastposition = $lastposition + 25;
@@ -2150,7 +2150,7 @@ sub set_positions_in_table
 
         for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
         {
-            if ( ${$sequencetable}[$i] =~ /^\s*(\w+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
+            if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
             {
                 my $onename = $1;
                 my $templatename = $2;
@@ -2208,7 +2208,7 @@ sub set_positions_in_table
 
         for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
         {
-            if ( ${$sequencetable}[$i] =~ /^\s*(\w+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
+            if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
             {
                 my $customactionname = $1;
                 my $fulltemplate = $2;
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 030bb2d6ac50..bac79e83d2e1 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -8,8 +8,6 @@
 #
 # $RCSfile: msiglobal.pm,v $
 #
-# $Revision: 1.51 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1162,34 +1160,6 @@ sub put_databasename_into_setupini
 }
 
 ##########################################################################
-# Writing the path to the instmsiw.exe into setup.ini
-##########################################################################
-
-sub put_instmsiwpath_into_setupini
-{
-    my ($setupinifile) = @_;
-
-    my $instmsiwexepath = "instmsiw.exe";
-    my $line = "instmsiw=" . $instmsiwexepath . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the path to the instmsia.exe into setup.ini
-##########################################################################
-
-sub put_instmsiapath_into_setupini
-{
-    my ($setupinifile) = @_;
-
-    my $instmsiaexepath = "instmsia.exe";
-    my $line = "instmsia=" . $instmsiaexepath . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
 # Writing the required msi version into setup.ini
 ##########################################################################
 
@@ -1335,8 +1305,6 @@ sub create_setup_ini
     push(@setupinifile, $line);
 
     put_databasename_into_setupini($setupinifile, $allvariableshashref);
-    put_instmsiwpath_into_setupini($setupinifile);
-    put_instmsiapath_into_setupini($setupinifile);
     put_msiversion_into_setupini($setupinifile);
     put_productname_into_setupini($setupinifile, $allvariableshashref);
     put_productcode_into_setupini($setupinifile);
@@ -1406,7 +1374,7 @@ sub copy_scpactions_into_installset
 
 #################################################################
 # Copying the files for the Windows installer into the
-# installation set (setup.exe, instmsia.exe, instmsiw.exe).
+# installation set (setup.exe).
 #################################################################
 
 sub copy_windows_installer_files_into_installset
@@ -1416,8 +1384,6 @@ sub copy_windows_installer_files_into_installset
     installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
 
     @copyfile = ();
-    push(@copyfile, "instmsia.exe");
-    push(@copyfile, "instmsiw.exe");
     push(@copyfile, "loader2.exe");
 
     if ( $allvariables->{'NOLOADERREQUIRED'} ) { @copyfile = (); }
@@ -2011,6 +1977,7 @@ sub set_msiproductversion
         {
             if ( $allvariables->{'PACKAGEVERSION'} =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
         }
+
         $productversion = $productversion . "\." . $productminor . "\." . $installer::globals::buildid;
     }
 
@@ -2173,7 +2140,7 @@ sub read_saved_mappings
         while (<F>)
         {
             m/^([^\t]+)\t([^\t]+)\t((.*)\|)?([^\t]*)/;
-            print "AAA1: \$1: $1, \$2: $2, \$3: $3, \$4: $4, \$5: $5\n";
+            print "OUT1: \$1: $1, \$2: $2, \$3: $3, \$4: $4, \$5: $5\n";
             next if ("$1" eq "$5") && (!defined($3));
             my $lc1 = lc($1);
 
@@ -2250,7 +2217,7 @@ sub read_saved_mappings
             next if (!defined($3));
             my $lc1 = lc($1);
 
-            print "AAA2: \$1: $1, \$2: $2, \$3: $3\n";
+            print "OUT2: \$1: $1, \$2: $2, \$3: $3\n";
 
             if ( exists($installer::globals::saved83dirmapping{$1}) )
             {
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 27f3342e4cc9..e65b649885f0 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -78,6 +78,13 @@ sub install_installation_sets
     my $olddatabase = installer::windows::admin::make_admin_install($oldinstallsetdatabasepath, $oldinstallpath);
     my $newdatabase = installer::windows::admin::make_admin_install($newinstallsetdatabasepath, $newinstallpath);
 
+    if ( $^O =~ /cygwin/i ) {
+        $olddatabase = qx{cygpath -w "$olddatabase"};
+        $olddatabase =~ s/\s*$//g;
+        $newdatabase = qx{cygpath -w "$newdatabase"};
+        $newdatabase =~ s/\s*$//g;
+    }
+
     return ($olddatabase, $newdatabase);
 }
 
@@ -93,10 +100,21 @@ sub extract_all_tables_from_pcpfile
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
+    my $extraslash = "";        # Has to be set for non-ActiveState perl
+
+    my $localfullpcpfile = $fullpcpfilepath;
+    my $localworkdir = $workdir;
+
+    if ( $^O =~ /cygwin/i ) {
+        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $localfullpcpfile =~ s/\//\\\\/g;
+        $localworkdir =~ s/\//\\\\/g;
+        $extraslash = "\\";
+    }
 
     # Export of all tables by using "*"
 
-    $systemcall = $msidb . " -d " . $fullpcpfilepath . " -f " . $workdir . " -e \*";
+    $systemcall = $msidb . " -d " . $localfullpcpfile . " -f " . $localworkdir . " -e " . $extraslash . "*";
     $returnvalue = system($systemcall);
 
     $infoline = "Systemcall: $systemcall\n";
@@ -148,7 +166,16 @@ sub include_tables_into_pcpfile
 
     # Import of tables
 
-    $systemcall = $msidb . " -d " . $fullpcpfilepath . " -f " . $workdir . " -i " . $tables;
+    my $localworkdir = $workdir;
+    my $localfullpcpfilepath = $fullpcpfilepath;
+
+    if ( $^O =~ /cygwin/i ) {
+        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $localfullpcpfilepath =~ s/\//\\\\/g;
+        $localworkdir =~ s/\//\\\\/g;
+    }
+
+    $systemcall = $msidb . " -d " . $localfullpcpfilepath . " -f " . $localworkdir . " -i " . $tables;
 
     $returnvalue = system($systemcall);
 
@@ -195,7 +222,25 @@ sub execute_msimsp
 
     if ( -f $logfilename ) { unlink $logfilename; }
 
-    $systemcall = $msimsp . " -s " . $fullpcpfilename . " -p " . $mspfilename . " -l " . $logfilename . " -f " . $msimsptemppath;
+    my $localfullpcpfilename = $fullpcpfilename;
+    my $localmspfilename = $mspfilename;
+    my $locallogfilename = $logfilename;
+    my $localmsimsptemppath = $msimsptemppath;
+
+    if ( $^O =~ /cygwin/i ) {
+        # msimsp.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $localfullpcpfilename =~ s/\//\\\\/g;
+        $locallogfilename =~ s/\//\\\\/g;
+
+        $localmspfilename =~ s/\\/\\\\/g; # path already contains backslash
+        # $localmspfilename =~ s/\//\\\\/g;
+
+        $localmsimsptemppath = qx{cygpath -w "$localmsimsptemppath"};
+        $localmsimsptemppath =~ s/\\/\\\\/g;
+        $localmsimsptemppath =~ s/\s*$//g;
+    }
+
+    $systemcall = $msimsp . " -s " . $localfullpcpfilename . " -p " . $localmspfilename . " -l " . $locallogfilename . " -f " . $localmsimsptemppath;
     installer::logger::print_message( "... $systemcall ...\n" );
 
     $returnvalue = system($systemcall);
@@ -284,6 +329,8 @@ sub set_mspfilename
 
     my $fullmspname = $mspdir . $installer::globals::separator . $databasename;
 
+    if ( $^O =~ /cygwin/i ) { $fullmspname =~ s/\//\\/g; }
+
     return $fullmspname;
 }
 
@@ -1191,6 +1238,9 @@ sub create_msp_patch
     installer::logger::print_message( "... copying installation set ...\n" );
 
     my $oldinstallationsetpath = $installer::globals::updatedatabasepath;
+
+    if ( $^O =~ /cygwin/i ) { $oldinstallationsetpath =~ s/\\/\//g; }
+
     installer::pathanalyzer::get_path_from_fullqualifiedname(\$oldinstallationsetpath);
     installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir);
 
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index b1abbbfb73a7..83404388d611 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -8,8 +8,6 @@
 #
 # $RCSfile: binary.pm,v $
 #
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -125,6 +123,11 @@ sub check_system_path
     # Windows : "msicert.exe", "msidb.exe", "signtool.exe"
 
     my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe");
+    if ( $installer::globals::internal_cabinet_signing )
+    {
+        push(@needed_files_in_path, "cabarc.exe");
+        push(@needed_files_in_path, "makecab.exe");
+    }
 
     my $onefile;
     my $error = 0;
@@ -195,6 +198,82 @@ sub make_systemcall
     return $success;
 }
 
+######################################################
+# Making systemcall with warning
+######################################################
+
+sub make_systemcall_with_warning
+{
+    my ($systemcall, $displaysystemcall) = @_;
+
+    installer::logger::print_message( "... $displaysystemcall ...\n" );
+
+    my $success = 1;
+    my $returnvalue = system($systemcall);
+
+    my $infoline = "Systemcall: $displaysystemcall\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ($returnvalue)
+    {
+        $infoline = "WARNING: Could not execute \"$displaysystemcall\"!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+        $success = 0;
+    }
+    else
+    {
+        $infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    return $success;
+}
+
+######################################################
+# Making systemcall with more return data
+######################################################
+
+sub execute_open_system_call
+{
+    my ( $systemcall ) = @_;
+
+    my @openoutput = ();
+    my $success = 1;
+
+    my $comspec = $ENV{COMSPEC};
+    $comspec = $comspec . " -c ";
+
+    if( $^O =~ /cygwin/i )
+    {
+        # $comspec =~ s/\\/\\\\/g;
+        # $comspec = qx{cygpath -u "$comspec"};
+        # $comspec =~ s/\s*$//g;
+        $comspec = "";
+    }
+
+    my $localsystemcall = "$comspec $systemcall 2>&1 |";
+
+    open( OPN, "$localsystemcall") or warn "Can't execute $localsystemcall\n";
+    while (<OPN>) { push(@openoutput, $_); }
+    close (OPN);
+
+    my $returnvalue = $?;   # $? contains the return value of the systemcall
+
+    if ($returnvalue)
+    {
+        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+        $success = 0;
+    }
+    else
+    {
+        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    return ($success, \@openoutput);
+}
+
 ########################################################
 # Reading first line of pw file.
 ########################################################
@@ -257,7 +336,7 @@ sub analyze_media_file
 # Collect all DiskIds from database table "Media".
 ########################################################
 
-sub collect_diskid
+sub collect_diskid_from_media_table
 {
     my ($msidatabase, $languagestring) = @_;
 
@@ -267,7 +346,7 @@ sub collect_diskid
 
     # Reading tables
     my $filename = $workdir . $installer::globals::separator . "Media.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid"); }
+    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
     my $filecontent = installer::files::read_file($filename);
     my $diskidhash = analyze_media_file($filecontent);
 
@@ -275,6 +354,34 @@ sub collect_diskid
 }
 
 ########################################################
+# Check, if this installation set contains
+# internal cabinet files included into the msi
+# database.
+########################################################
+
+sub check_for_internal_cabfiles
+{
+    my ($cabfilehash) = @_;
+
+    my $contains_internal_cabfiles = 0;
+    my %allcabfileshash = ();
+
+    foreach my $filename ( keys %{$cabfilehash} )
+    {
+        if ( $filename =~ /^\s*\#/ )     # starting with a hash
+        {
+            $contains_internal_cabfiles = 1;
+            # setting real filename without hash as key and name with hash as value
+            my $realfilename = $filename;
+            $realfilename =~ s/^\s*\#//;
+            $allcabfileshash{$realfilename} = $filename;
+        }
+    }
+
+    return ( $contains_internal_cabfiles, \%allcabfileshash );
+}
+
+########################################################
 # Collecting all files in an installation set.
 ########################################################
 
@@ -291,19 +398,19 @@ sub analyze_installset_content
     my %allcabfileshash = ();
     my %allmsidatabaseshash = ();
     my %allfileshash = ();
-    my $contains_cab_file = 0;
+    my $contains_external_cabfiles = 0;
     my $msidatabase = "";
+    my $contains_msidatabase = 0;
 
     for ( my $j = 0; $j <= $#sourcefiles; $j++ )
     {
         if ( $sourcefiles[$j] =~ /\.cab\s*$/ ) { $allcabfileshash{$sourcefiles[$j]} = 1; }
         else
         {
-            if ( $sourcefiles[$j] =~ /instmsi\w+.exe\s*$/ ) { next; } # no signing of instmsia.exe and instmsiw.exe
-            if ( $sourcefiles[$j] =~ /jre[-\w]+.exe\s*$/ ) { next; } # no signing of java executable
             if ( $sourcefiles[$j] =~ /\.txt\s*$/ ) { next; }
             if ( $sourcefiles[$j] =~ /\.html\s*$/ ) { next; }
             if ( $sourcefiles[$j] =~ /\.ini\s*$/ ) { next; }
+            if ( $sourcefiles[$j] =~ /\.bmp\s*$/ ) { next; }
             if ( $sourcefiles[$j] =~ /\.msi\s*$/ )
             {
                 if ( $msidatabase eq "" ) { $msidatabase = $sourcefiles[$j]; }
@@ -315,12 +422,14 @@ sub analyze_installset_content
 
     # Is there at least one cab file in the installation set?
     my $cabcounter = get_hash_count(\%allcabfileshash);
-    if ( $cabcounter > 0 ) { $contains_cab_file = 1; }
+    if ( $cabcounter > 0 ) { $contains_external_cabfiles = 1; }
 
     # How about a cab file without a msi database?
     if (( $cabcounter > 0 ) && ( $msidatabase eq "" )) { installer::exiter::exit_program("ERROR: There is no msi database in the installation set, but an external cabinet file. Path: $installsetpath !", "collect_installset_content"); }
 
-    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_cab_file);
+    if ( $msidatabase ne "" ) { $contains_msidatabase = 1; }
+
+    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase);
 }
 
 ########################################################
@@ -330,17 +439,17 @@ sub analyze_installset_content
 
 sub msicert_database
 {
-    my ($msidatabase, $allcabfiles, $languagestring) = @_;
-
-    # exclude media table from msi database and get all diskids.
-    my $cabfilehash = collect_diskid($msidatabase, $languagestring);
+    my ($msidatabase, $allcabfiles, $cabfilehash, $internalcabfile) = @_;
 
     my $fullsuccess = 1;
 
     foreach my $cabfile ( keys %{$allcabfiles} )
     {
-        if ( ! exists($cabfilehash->{$cabfile}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
-        my $diskid = $cabfilehash->{$cabfile};
+        my $mediacabfilename = $cabfile;
+        if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; }
+        if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
+        my $diskid = $cabfilehash->{$mediacabfilename};
+
         my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h";
          $success = make_systemcall($systemcall, $systemcall);
         if ( ! $success ) { $fullsuccess = 0; }
@@ -355,36 +464,453 @@ sub msicert_database
 
 sub sign_files
 {
-    my ( $followmeinfohash, $allfiles, $pw ) = @_;
+    my ( $followmeinfohash, $allfiles, $pw, $cabinternal ) = @_;
 
     my $infoline = "";
     my $fullsuccess = 1;
+    my $maxcounter = 3;
 
     my $productname = "";
     if ( $followmeinfohash->{'allvariableshash'}->{'PRODUCTNAME'} ) { $productname = "/d " . "\"$followmeinfohash->{'allvariableshash'}->{'PRODUCTNAME'}\""; }
     my $url = "";
-    if ( $followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'} == 0 ) { $url = "/du " . "\"http://www.sun.com\""; }
+    if (( ! exists($followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'}) ) || ( $followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'} == 0 )) { $url = "/du " . "\"http://www.sun.com\""; }
     else { $url = "/du " . "\"http://www.openoffice.org\""; }
     my $timestampurl = "http://timestamp.verisign.com/scripts/timestamp.dll";
 
-    foreach my $onefile ( keys %{$allfiles} )
+    my $pfxfilepath = $installer::globals::pfxfile;
+
+    if( $^O =~ /cygwin/i )
+    {
+        $pfxfilepath = qx{cygpath -w "$pfxfilepath"};
+        $pfxfilepath =~ s/\\/\\\\/g;
+        $pfxfilepath =~ s/\s*$//g;
+    }
+
+    foreach my $onefile ( reverse sort keys %{$allfiles} )
+    {
+        if ( already_certified($onefile) )
+        {
+            $infoline = "Already certified: Skipping file $onefile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            next;
+        }
+
+        my $counter = 1;
+        my $success = 0;
+
+        while (( $counter <= $maxcounter ) && ( ! $success ))
+        {
+            if ( $counter > 1 ) { installer::logger::print_message( "\n\n... repeating file $onefile ...\n" ); }
+            if ( $cabinternal ) { installer::logger::print_message("    Signing: $onefile\n"); }
+            my $systemcall = "signtool.exe sign /f \"$pfxfilepath\" /p $pw $productname $url /t \"$timestampurl\" \"$onefile\"";
+            my $displaysystemcall = "signtool.exe sign /f \"$pfxfilepath\" /p ***** $productname $url /t \"$timestampurl\" \"$onefile\"";
+             $success = make_systemcall_with_warning($systemcall, $displaysystemcall);
+             $counter++;
+         }
+
+         if ( ! $success )
+         {
+             $fullsuccess = 0;
+            installer::exiter::exit_program("ERROR: Could not sign file: $onefile!", "sign_files");
+        }
+    }
+
+    return $fullsuccess;
+}
+
+##########################################################################
+# Lines in ddf files must not contain more than 256 characters
+##########################################################################
+
+sub check_ddf_file
+{
+    my ( $ddffile, $ddffilename ) = @_;
+
+    my $maxlength = 0;
+    my $maxline = 0;
+    my $linelength = 0;
+    my $linenumber = 0;
+
+    for ( my $i = 0; $i <= $#{$ddffile}; $i++ )
+    {
+        my $oneline = ${$ddffile}[$i];
+
+        $linelength = length($oneline);
+        $linenumber = $i + 1;
+
+        if ( $linelength > 256 )
+        {
+            installer::exiter::exit_program("ERROR \"$ddffilename\" line $linenumber: Lines in ddf files must not contain more than 256 characters!", "check_ddf_file");
+        }
+
+        if ( $linelength > $maxlength )
+        {
+            $maxlength = $linelength;
+            $maxline = $linenumber;
+        }
+    }
+
+    my $infoline = "Check of ddf file \"$ddffilename\": Maximum length \"$maxlength\" in line \"$maxline\" (allowed line length: 256 characters)\n";
+    push( @installer::globals::logfileinfo, $infoline);
+}
+
+#################################################################
+# Setting the path, where the cab files are unpacked.
+#################################################################
+
+sub get_cab_path
+{
+    my ($temppath) = @_;
+
+    my $cabpath = "cabs_" . $$;
+    $cabpath = $temppath . $installer::globals::separator . $cabpath;
+    if ( ! -d $cabpath ) { installer::systemactions::create_directory($cabpath); }
+
+    return $cabpath;
+}
+
+#################################################################
+# Exclude all cab files from the msi database.
+#################################################################
+
+sub extract_cabs_from_database
+{
+    my ($msidatabase, $allcabfiles) = @_;
+
+    installer::logger::include_header_into_logfile("Extracting cabs from msi database");
+
+    my $infoline = "";
+    my $fullsuccess = 1;
+    my $msidb = "msidb.exe";    # Has to be in the path
+
+    if ( $ENV{'USE_SHELL'} ne "4nt" ) {
+        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $msidatabase =~ s/\//\\\\/g;
+    }
+
+    foreach my $onefile ( keys %{$allcabfiles} )
     {
-        my $systemcall = "signtool.exe sign /f \"$installer::globals::pfxfile\" /p $pw $productname $url /t \"$timestampurl\" \"$onefile\"";
-        my $displaysystemcall = "signtool.exe sign /f \"$installer::globals::pfxfile\" /p ***** $productname $url /t \"$timestampurl\" \"$onefile\"";
-         my $success = make_systemcall($systemcall, $displaysystemcall);
-         if ( ! $success ) { $fullsuccess = 0; }
+        my $systemcall = $msidb . " -d " . $msidatabase . " -x " . $onefile;
+         my $success = make_systemcall($systemcall, $systemcall);
+        if ( ! $success ) { $fullsuccess = 0; }
+
+        # and removing the stream from the database
+        $systemcall = $msidb . " -d " . $msidatabase . " -k " . $onefile;
+         $success = make_systemcall($systemcall, $systemcall);
+        if ( ! $success ) { $fullsuccess = 0; }
     }
 
     return $fullsuccess;
 }
 
+#################################################################
+# Include cab files into the msi database.
+#################################################################
+
+sub include_cabs_into_database
+{
+    my ($msidatabase, $allcabfiles) = @_;
+
+    installer::logger::include_header_into_logfile("Including cabs into msi database");
+
+    my $infoline = "";
+    my $fullsuccess = 1;
+    my $msidb = "msidb.exe";    # Has to be in the path
+
+    if ( $ENV{'USE_SHELL'} ne "4nt" ) {
+        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $msidatabase =~ s/\//\\\\/g;
+    }
+
+    foreach my $onefile ( keys %{$allcabfiles} )
+    {
+        my $systemcall = $msidb . " -d " . $msidatabase . " -a " . $onefile;
+         my $success = make_systemcall($systemcall, $systemcall);
+        if ( ! $success ) { $fullsuccess = 0; }
+    }
+
+    return $fullsuccess;
+}
+
+########################################################
+# Reading the order of the files inside the
+# cabinet files.
+########################################################
+
+sub read_cab_file
+{
+    my ($cabfilename) = @_;
+
+    installer::logger::print_message( "\n... reading cabinet file $cabfilename ...\n" );
+    my $infoline = "Reading cabinet file $cabfilename\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    my $systemcall = "cabarc.exe" . " L " . $cabfilename;
+    push(@logfile, "$systemcall\n");
+
+    my ($success, $fileorder) = execute_open_system_call($systemcall);
+
+    my @allfiles = ();
+
+    for ( my $i = 0; $i <= $#{$fileorder}; $i++ )
+    {
+        my $line = ${$fileorder}[$i];
+        if ( $line =~ /^\s*(.*?)\s+\d+\s+\d+\/\d+\/\d+\s+\d+\:\d+\:\d+\s+[\w-]+\s*$/ )
+        {
+            my $filename = $1;
+            push(@allfiles, $filename);
+        }
+    }
+
+    return \@allfiles;
+}
+
+########################################################
+# Unpacking a cabinet file.
+########################################################
+
+sub unpack_cab_file
+{
+    my ($cabfilename, $temppath) = @_;
+
+    installer::logger::print_message( "\n... unpacking cabinet file $cabfilename ...\n" );
+    my $infoline = "Unpacking cabinet file $cabfilename\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    my $dirname = $cabfilename;
+    $dirname =~ s/\.cab\s*$//;
+    my $workingpath = $temppath . $installer::globals::separator . "unpack_". $dirname . "_" . $$;
+    if ( ! -d $workingpath ) { installer::systemactions::create_directory($workingpath); }
+
+    # changing into unpack directory
+    my $from = cwd();
+    chdir($workingpath);
+
+    my $fullcabfilename = $from . $installer::globals::separator . $cabfilename;
+
+    if( $^O =~ /cygwin/i )
+    {
+        $fullcabfilename = qx{cygpath -w "$fullcabfilename"};
+        $fullcabfilename =~ s/\\/\\\\/g;
+        $fullcabfilename =~ s/\s*$//g;
+    }
+
+    my $systemcall = "cabarc.exe" . " -p X " . $fullcabfilename;
+    $success = make_systemcall($systemcall, $systemcall);
+    if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not unpack cabinet file: $fullcabfilename!", "unpack_cab_file"); }
+
+    # returning to directory
+    chdir($from);
+
+    return $workingpath;
+}
+
+########################################################
+# Returning the header of a ddf file.
+########################################################
+
+sub get_ddf_file_header
+{
+    my ($ddffileref, $cabinetfile, $installdir) = @_;
+
+    my $oneline;
+    my $compressionlevel = 2;
+
+    if( $^O =~ /cygwin/i )
+    {
+        $installdir = qx{cygpath -w "$installdir"};
+        $installdir =~ s/\s*$//g;
+    }
+
+    $oneline = ".Set CabinetName1=" . $cabinetfile . "\n";
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set ReservePerCabinetSize=128\n";  # This reserves space for a digital signature.
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set MaxDiskSize=CDROM\n";          # This allows the .cab file to be as large as needed.
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set CompressionType=LZX\n";
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set Compress=ON\n";
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set CompressionLevel=$compressionlevel\n";
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set Cabinet=ON\n";
+    push(@{$ddffileref} ,$oneline);
+    $oneline = ".Set DiskDirectoryTemplate=" . $installdir . "\n";
+    push(@{$ddffileref} ,$oneline);
+}
+
+########################################################
+# Writing content into ddf file.
+########################################################
+
+sub put_all_files_into_ddffile
+{
+    my ($ddffile, $allfiles, $workingpath) = @_;
+
+    $workingpath =~ s/\//\\/g;
+
+    for ( my $i = 0; $i <= $#{$allfiles}; $i++ )
+    {
+        my $filename = ${$allfiles}[$i];
+        if( $^O =~ /cygwin/i ) { $filename =~ s/\//\\/g; } # Backslash for Cygwin!
+        if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file: $filename!", "put_all_files_into_ddffile"); }
+        my $infoline = "\"" . $filename . "\"" . " " . ${$allfiles}[$i] . "\n";
+        push( @{$ddffile}, $infoline);
+    }
+}
+
+########################################################
+# Packing a cabinet file.
+########################################################
+
+sub do_pack_cab_file
+{
+    my ($cabfilename, $allfiles, $workingpath, $temppath) = @_;
+
+    installer::logger::print_message( "\n... packing cabinet file $cabfilename ...\n" );
+    my $infoline = "Packing cabinet file $cabfilename\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ( -f $cabfilename ) { unlink($cabfilename); } # removing cab file
+    if ( -f $cabfilename ) { installer::exiter::exit_program("ERROR: Failed to remove file: $cabfilename!", "do_pack_cab_file"); }
+
+    # generate ddf file for makecab.exe
+    my @ddffile = ();
+
+    my $dirname = $cabfilename;
+    $dirname =~ s/\.cab\s*$//;
+    my $ddfpath = $temppath . $installer::globals::separator . "ddf_". $dirname . "_" . $$;
+
+    my $ddffilename = $cabfilename;
+    $ddffilename =~ s/.cab/.ddf/;
+    $ddffilename = $ddfpath . $installer::globals::separator . $ddffilename;
+
+    if ( ! -d $ddfpath ) { installer::systemactions::create_directory($ddfpath); }
+
+    my $from = cwd();
+
+    chdir($workingpath); # changing into the directory with the unpacked files
+
+    get_ddf_file_header(\@ddffile, $cabfilename, $from);
+    put_all_files_into_ddffile(\@ddffile, $allfiles, $workingpath);
+    # lines in ddf files must not be longer than 256 characters
+    check_ddf_file(\@ddffile, $ddffilename);
+
+    installer::files::save_file($ddffilename, \@ddffile);
+
+    if( $^O =~ /cygwin/i )
+    {
+        $ddffilename = qx{cygpath -w "$ddffilename"};
+        $ddffilename =~ s/\\/\\\\/g;
+        $ddffilename =~ s/\s*$//g;
+    }
+
+    my $systemcall = "makecab.exe /V1 /F " . $ddffilename;
+    my $success = make_systemcall($systemcall, $systemcall);
+    if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not pack cabinet file!", "do_pack_cab_file"); }
+
+    chdir($from);
+
+    return ($success);
+}
+
+########################################################
+# Extraction the file extension from a file
+########################################################
+
+sub get_extension
+{
+    my ( $file ) = @_;
+
+    my $extension = "";
+
+    if ( $file =~ /^\s*(.*)\.(\w+?)\s*$/ ) { $extension = $2; }
+
+    return $extension;
+}
+
+########################################################
+# Checking, if a file already contains a certificate.
+# This must not be overwritten.
+########################################################
+
+sub already_certified
+{
+    my ( $filename ) = @_;
+
+    my $success = 1;
+    my $is_certified = 0;
+
+    my $systemcall = "signtool.exe verify /q /pa \"$filename\"";
+    my $returnvalue = system($systemcall);
+
+    if ( $returnvalue ) { $success = 0; }
+
+    # my $success = make_systemcall($systemcall, $systemcall);
+
+     if ( $success )
+     {
+         $is_certified = 1;
+        installer::logger::print_message( "... already certified -> skipping $filename ...\n" );
+    }
+
+    return $is_certified;
+}
+
+########################################################
+# Signing the files, that are included into
+# cabinet files.
+########################################################
+
+sub sign_files_in_cabinet_files
+{
+    my ( $followmeinfohash, $allcabfiles, $pw, $temppath ) = @_;
+
+    my $complete_success = 1;
+    my $from = cwd();
+
+    foreach my $cabfilename ( keys %{$allcabfiles} )
+    {
+        my $success = 1;
+
+        # saving order of files in cab file
+        my $fileorder = read_cab_file($cabfilename);
+
+        # unpack into $working path
+        my $workingpath = unpack_cab_file($cabfilename, $temppath);
+
+        chdir($workingpath);
+
+        # sign files
+        my %allfileshash = ();
+        foreach my $onefile ( @{$fileorder} )
+        {
+            my $extension = get_extension($onefile);
+            if ( exists( $installer::globals::sign_extensions{$extension} ) )
+            {
+                $allfileshash{$onefile} = 1;
+            }
+        }
+         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1);
+        if ( ! $success ) { $complete_success = 0; }
+
+        chdir($from);
+
+        # pack into new directory
+        do_pack_cab_file($cabfilename, $fileorder, $workingpath, $temppath);
+    }
+
+    return $complete_success;
+}
+
 ########################################################
 # Signing an existing Windows installation set.
 ########################################################
 
 sub sign_install_set
 {
-    my ($followmeinfohash, $make_copy) = @_;
+    my ($followmeinfohash, $make_copy, $temppath) = @_;
 
     my $installsetpath = $followmeinfohash->{'finalinstalldir'};
 
@@ -407,24 +933,66 @@ sub sign_install_set
     else { $installsetpath = rename_install_set($installsetpath); }
 
     # collecting all files in the installation set
-    my ($allcabfiles, $allfiles, $msidatabase, $contains_cab_file) = analyze_installset_content($installsetpath);
+    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase) = analyze_installset_content($installsetpath);
 
     # changing into installation set
     my $from = cwd();
+    my $fullmsidatabase = $installsetpath . $installer::globals::separator . $msidatabase;
+
+    if( $^O =~ /cygwin/i )
+    {
+        $fullmsidatabase = qx{cygpath -w "$fullmsidatabase"};
+        $fullmsidatabase =~ s/\\/\\\\/g;
+        $fullmsidatabase =~ s/\s*$//g;
+    }
+
     chdir($installsetpath);
 
-    # Warning: There might be a problem with very big cabinet files
-    # signing all external cab files first
-    if ( $contains_cab_file )
+    if ( $contains_msidatabase )
     {
-        $success = sign_files($followmeinfohash, $allcabfiles, $pw);
-        if ( ! $success ) { $complete_success = 0; }
-        $success = msicert_database($msidatabase, $allcabfiles, $followmeinfohash->{'languagestring'});
-        if ( ! $success ) { $complete_success = 0; }
+        # exclude media table from msi database and get all diskids.
+        my $cabfilehash = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
+
+        # Check, if there are internal cab files
+        my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
+
+        if ( $contains_internal_cabfiles )
+        {
+            my $cabpath = get_cab_path($temppath);
+            chdir($cabpath);
+
+            # Exclude all cabinet files from database
+            $success = extract_cabs_from_database($fullmsidatabase, $all_internal_cab_files);
+            if ( ! $success ) { $complete_success = 0; }
+
+            if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); }
+
+            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0);
+            if ( ! $success ) { $complete_success = 0; }
+            $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1);
+            if ( ! $success ) { $complete_success = 0; }
+
+            # Include all cabinet files into database
+            $success = include_cabs_into_database($fullmsidatabase, $all_internal_cab_files);
+            if ( ! $success ) { $complete_success = 0; }
+            chdir($installsetpath);
+        }
+
+        # Warning: There might be a problem with very big cabinet files
+        # signing all external cab files first
+        if ( $contains_external_cabfiles )
+        {
+            if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); }
+
+            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0);
+            if ( ! $success ) { $complete_success = 0; }
+            $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0);
+            if ( ! $success ) { $complete_success = 0; }
+        }
     }
 
     # finally all other files can be signed
-    $success = sign_files($followmeinfohash, $allfiles, $pw);
+    $success = sign_files($followmeinfohash, $allfiles, $pw, 0);
     if ( ! $success ) { $complete_success = 0; }
 
     # and changing back
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index a20e84d1f1d3..4c1081fa8458 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -50,10 +50,18 @@ sub extract_all_tables_from_msidatabase
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
+    my $extraslash = "";        # Has to be set for non-ActiveState perl
 
     # Export of all tables by using "*"
 
-    $systemcall = $msidb . " -d " . $fulldatabasepath . " -f " . $workdir . " -e \*";
+    if ( $^O =~ /cygwin/i ) {
+        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+        $fulldatabasepath =~ s/\//\\\\/g;
+        $workdir =~ s/\//\\\\/g;
+        $extraslash = "\\";
+    }
+
+    $systemcall = $msidb . " -d " . $fulldatabasepath . " -f " . $workdir . " -e " . $extraslash . "*";
     $returnvalue = system($systemcall);
 
     $infoline = "Systemcall: $systemcall\n";
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index cf410c32c7a3..d64ac15ff73a 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -797,7 +797,7 @@ sub install_simple ($$$$$$)
 
         push @lines, "$destination\n";
         # printf "cp $sourcepath $destdir$destination\n";
-        copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!";
+        copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
         my $sourcestat = stat($sourcepath);
         utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
         chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
@@ -2373,7 +2373,8 @@ sub collect_all_files_from_includepathes
 
         my @sourcefiles = ();
         my $pathstring = "";
-        installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles);
+        # installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles);
+        installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles);
 
         if ( ! ( $#sourcefiles > -1 ))
         {
@@ -2398,6 +2399,8 @@ sub collect_all_files_from_includepathes
         }
     }
 
+    $installer::globals::include_pathes_read = 1;
+
     installer::logger::globallog("Reading all directories: End");
     push( @installer::globals::globallogfileinfo, "\n");
 }
@@ -2681,7 +2684,6 @@ sub generate_cygwin_pathes
     }
 }
 
-
 sub filter_pkgmapfile
 {
     my ($pkgmapfile) = @_;
@@ -3275,4 +3277,42 @@ sub add_license_into_systemintegrationpackages
     }
 }
 
+#########################################################
+# Collecting all pkgmap files from an installation set
+#########################################################
+
+sub collectpackagemaps
+{
+    my ( $installdir, $languagestringref, $allvariables ) = @_;
+
+    installer::logger::include_header_into_logfile("Collecing all packagemaps (pkgmap):");
+
+    my $pkgmapdir = installer::systemactions::create_directories("pkgmap", $languagestringref);
+    my $subdirname = $allvariables->{'UNIXPRODUCTNAME'} . "_pkgmaps";
+    my $pkgmapsubdir = $pkgmapdir . $installer::globals::separator . $subdirname;
+    if ( -d $pkgmapsubdir ) { installer::systemactions::remove_complete_directory($pkgmapsubdir); }
+    if ( ! -d $pkgmapsubdir ) { installer::systemactions::create_directory($pkgmapsubdir); }
+
+    $installdir =~ s/\/\s*$//;
+    # Collecting all packages in $installdir and its sub package ("packages")
+    my $searchdir = $installdir . $installer::globals::separator . $installer::globals::epmoutpath;
+
+    my $allpackages = installer::systemactions::get_all_directories_without_path($searchdir);
+
+    for ( my $i = 0; $i <= $#{$allpackages}; $i++ )
+    {
+        my $pkgmapfile = $searchdir . $installer::globals::separator . ${$allpackages}[$i] . $installer::globals::separator . "pkgmap";
+        my $destfilename = $pkgmapsubdir . $installer::globals::separator . ${$allpackages}[$i] . "_pkgmap";
+        installer::systemactions::copy_one_file($pkgmapfile, $destfilename);
+    }
+
+    # Create a tar gz file with all package maps
+    my $tarfilename = $subdirname . ".tar";
+    my $targzname = $tarfilename . ".gz";
+    # my $systemcall = "cd $pkgmapdir; tar -cf - $subdirname > $tarfilename";
+    $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname";
+    make_systemcall($systemcall);
+    installer::systemactions::remove_complete_directory($pkgmapsubdir, 1);
+}
+
 1;
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index 6611012985be..16be9cd6a0ec 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -570,10 +570,29 @@ sub get_size_value
     if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile ))
     {
         # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); }
-        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; } # For queries "rpm" is used, not "rpmbuild"
+        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
 
         my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
-        my $rpmout = make_systemcall($systemcall, 0);
+        my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
+        if ( defined $ENV{SYSBASE}) {
+            my $sysbase = $ENV{SYSBASE};
+            if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
+                $ld_library_backup = "" if ! defined $ld_library_backup;
+                $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
+            } else {
+                $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
+            }
+        }
+        my ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
+        # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
+        if ( $error )
+        {
+            installer::logger::print_message( "... trying /usr/bin/rpm ...\n" );
+            my $systemcall = "/usr/bin/rpm -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
+            ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
+            if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_size_value"); }
+        }
+        $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
         $value = do_sum($rpmout);       # adding all filesizes in bytes
         $value = $value/1000;
 
@@ -690,10 +709,29 @@ sub get_fullpkgname_value
         }
 
         # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_fullpkgname_value"); }
-        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; } # For queries "rpm" is used, not "rpmbuild"
+        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
         my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
-        my $returnarray = make_systemcall($systemcall, 0);
+        my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
+        if ( defined $ENV{SYSBASE}) {
+            my $sysbase = $ENV{SYSBASE};
+            if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
+                $ld_library_backup = "" if ! defined $ld_library_backup;
+                $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
+            } else {
+                $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
+            }
+        }
+        my ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
+        # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
+        if ( $error )
+        {
+            installer::logger::print_message( "... trying /usr/bin/rpm ...\n" );
+            my $systemcall = "/usr/bin/rpm -qp $packagename |";
+            ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
+            if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_fullpkgname_value"); }
+        }
         $value = ${$returnarray}[0];
+        $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
         installer::remover::remove_leading_and_ending_whitespaces(\$value);
 
         my $rpmname = $packagename;
@@ -849,6 +887,56 @@ sub make_systemcall
     return \@returns;
 }
 
+#######################################################
+# Executing one system call
+#######################################################
+
+sub make_systemcall_allowing_error
+{
+    my ( $systemcall, $logreturn, $can_fail ) = @_;
+
+    my @returns = ();
+
+    installer::logger::print_message( "... $systemcall ...\n" );
+
+    open (REG, "$systemcall");
+    while (<REG>) {push(@returns, $_); }
+    close (REG);
+
+    my $returnvalue = $?;   # $? contains the return value of the systemcall
+
+    my $infoline = "Systemcall: $systemcall\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ( $logreturn )
+    {
+        for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
+    }
+
+    if ($returnvalue)
+    {
+        if ( $can_fail )
+        {
+            $infoline = "WARNING: Failed system call:  $systemcall\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            $error_occured = 1;
+        }
+        else
+        {
+            $infoline = "ERROR: $systemcall\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            $error_occured = 1;
+        }
+    }
+    else
+    {
+        $infoline = "SUCCESS: $systemcall\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    return (\@returns, $returnvalue);
+}
+
 ###################################################
 # Setting product name tag
 ###################################################
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 2ccb50989298..86a5fa1a2b85 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -650,6 +650,8 @@ unxlngi6
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
+            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
+            HAVE_LD_HASH_STYLE TRUE
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
@@ -695,6 +697,7 @@ unxlngi6
 			CVER C432
 			ENABLE_KAB TRUE
 			ENABLE_KDE TRUE
+			ENABLE_EVOAB2 TRUE
 			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
 			GLIBC 2SUSE90
 			GUI UNX
@@ -972,6 +975,8 @@ unxlngx6
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
+            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
+            HAVE_LD_HASH_STYLE TRUE
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
@@ -1644,6 +1649,7 @@ unxsoli4
 			CPU I
 			CPUNAME INTEL
 			CVER C52
+			ENABLE_EVOAB2 TRUE
 			ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
 			GUI UNX
 			GUIBASE unx
@@ -1950,6 +1956,7 @@ unxsols4
 			CPU S
 			CPUNAME SPARC
 			CVER C52
+			ENABLE_EVOAB2 TRUE
 			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
 			GUI UNX
 			GUIBASE unx
@@ -3454,6 +3461,7 @@ wntmsci12
 			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
 			USE_DIRECTX5 TRUE
 			WINDOWS_VISTA_PSDK TRUE
+			SYSBASE TRUE
             WITH_VC_REDIST TRUE
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 327798ec1116..aa1442cc649d 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -67,7 +67,6 @@ common
 		DIC_ALL
 		DPKG
 		DYLD_LIBRARY_PATH
-		LD_LIBRARY_PATH
 		DMAKE_INC
 		DMAKE
 		DRIVE_O
@@ -77,6 +76,7 @@ common
 		ENABLE_CRASHDUMP
 		ENABLE_CUPS
         ENABLE_DIRECTX
+        ENABLE_EVOAB2
 		ENABLE_FONTCONFIG
         ENABLE_GTK
         ENABLE_GCONF
@@ -87,6 +87,7 @@ common
         ENABLE_PASF
         ENABLE_RANDR
         ENABLE_REPORTBUILDER
+        ENABLE_REPORTDESIGN
         ENABLE_SVCTAGS
 		ENABLE_VBA
 		FORCE2ARCHIVE
@@ -244,7 +245,6 @@ common
         XAU_LIBS
 		WINDOWS_VISTA_PSDK
         WITH_LDAP
-        WITH_VC_REDIST
 		WST
 		XCLASSPATH
         XSLTPROC
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index e080d4dd8530..596ecf8eac17 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -32,6 +32,14 @@ SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH))
 SHL1DEF*=$(MISC)$/$(SHL1TARGET).def
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 
+EXTRALIBPATHS1=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL1NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL1NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -233,7 +241,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL1TARGET8=$(shell @fix_shl.cmd $(SHL1TARGET))
+SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -436,7 +444,7 @@ $(SHL1TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL1NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
 .ENDIF				# "$(SHL1NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -451,7 +459,7 @@ $(SHL1TARGETN) : \
 .IF "$(SHL1NOCHECK)"==""
     -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
     $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
 .ENDIF				# "$(SHL1NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -572,6 +580,14 @@ SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH))
 SHL2DEF*=$(MISC)$/$(SHL2TARGET).def
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 
+EXTRALIBPATHS2=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL2NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL2NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -773,7 +789,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL2TARGET8=$(shell @fix_shl.cmd $(SHL2TARGET))
+SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -976,7 +992,7 @@ $(SHL2TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL2NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
 .ENDIF				# "$(SHL2NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -991,7 +1007,7 @@ $(SHL2TARGETN) : \
 .IF "$(SHL2NOCHECK)"==""
     -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
     $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
 .ENDIF				# "$(SHL2NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -1112,6 +1128,14 @@ SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH))
 SHL3DEF*=$(MISC)$/$(SHL3TARGET).def
 .ENDIF			# "$(SHL3USE_EXPORTS)"==""
 
+EXTRALIBPATHS3=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL3NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL3NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1313,7 +1337,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL3TARGET8=$(shell @fix_shl.cmd $(SHL3TARGET))
+SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -1516,7 +1540,7 @@ $(SHL3TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL3NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
 .ENDIF				# "$(SHL3NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -1531,7 +1555,7 @@ $(SHL3TARGETN) : \
 .IF "$(SHL3NOCHECK)"==""
     -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
     $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
 .ENDIF				# "$(SHL3NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -1652,6 +1676,14 @@ SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH))
 SHL4DEF*=$(MISC)$/$(SHL4TARGET).def
 .ENDIF			# "$(SHL4USE_EXPORTS)"==""
 
+EXTRALIBPATHS4=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL4NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL4NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1853,7 +1885,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL4TARGET8=$(shell @fix_shl.cmd $(SHL4TARGET))
+SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -2056,7 +2088,7 @@ $(SHL4TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL4NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
 .ENDIF				# "$(SHL4NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -2071,7 +2103,7 @@ $(SHL4TARGETN) : \
 .IF "$(SHL4NOCHECK)"==""
     -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
     $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
 .ENDIF				# "$(SHL4NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -2192,6 +2224,14 @@ SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH))
 SHL5DEF*=$(MISC)$/$(SHL5TARGET).def
 .ENDIF			# "$(SHL5USE_EXPORTS)"==""
 
+EXTRALIBPATHS5=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL5NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL5NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2393,7 +2433,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL5TARGET8=$(shell @fix_shl.cmd $(SHL5TARGET))
+SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -2596,7 +2636,7 @@ $(SHL5TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL5NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
 .ENDIF				# "$(SHL5NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -2611,7 +2651,7 @@ $(SHL5TARGETN) : \
 .IF "$(SHL5NOCHECK)"==""
     -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
     $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
 .ENDIF				# "$(SHL5NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -2732,6 +2772,14 @@ SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH))
 SHL6DEF*=$(MISC)$/$(SHL6TARGET).def
 .ENDIF			# "$(SHL6USE_EXPORTS)"==""
 
+EXTRALIBPATHS6=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL6NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL6NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2933,7 +2981,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL6TARGET8=$(shell @fix_shl.cmd $(SHL6TARGET))
+SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -3136,7 +3184,7 @@ $(SHL6TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL6NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
 .ENDIF				# "$(SHL6NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -3151,7 +3199,7 @@ $(SHL6TARGETN) : \
 .IF "$(SHL6NOCHECK)"==""
     -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
     $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
 .ENDIF				# "$(SHL6NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -3272,6 +3320,14 @@ SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH))
 SHL7DEF*=$(MISC)$/$(SHL7TARGET).def
 .ENDIF			# "$(SHL7USE_EXPORTS)"==""
 
+EXTRALIBPATHS7=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL7NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL7NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -3473,7 +3529,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL7TARGET8=$(shell @fix_shl.cmd $(SHL7TARGET))
+SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -3676,7 +3732,7 @@ $(SHL7TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL7NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
 .ENDIF				# "$(SHL7NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -3691,7 +3747,7 @@ $(SHL7TARGETN) : \
 .IF "$(SHL7NOCHECK)"==""
     -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
     $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
 .ENDIF				# "$(SHL7NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -3812,6 +3868,14 @@ SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH))
 SHL8DEF*=$(MISC)$/$(SHL8TARGET).def
 .ENDIF			# "$(SHL8USE_EXPORTS)"==""
 
+EXTRALIBPATHS8=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL8NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL8NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -4013,7 +4077,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL8TARGET8=$(shell @fix_shl.cmd $(SHL8TARGET))
+SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -4216,7 +4280,7 @@ $(SHL8TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL8NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
 .ENDIF				# "$(SHL8NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -4231,7 +4295,7 @@ $(SHL8TARGETN) : \
 .IF "$(SHL8NOCHECK)"==""
     -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
     $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
 .ENDIF				# "$(SHL8NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -4352,6 +4416,14 @@ SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH))
 SHL9DEF*=$(MISC)$/$(SHL9TARGET).def
 .ENDIF			# "$(SHL9USE_EXPORTS)"==""
 
+EXTRALIBPATHS9=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL9NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL9NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -4553,7 +4625,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL9TARGET8=$(shell @fix_shl.cmd $(SHL9TARGET))
+SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -4756,7 +4828,7 @@ $(SHL9TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL9NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
 .ENDIF				# "$(SHL9NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -4771,7 +4843,7 @@ $(SHL9TARGETN) : \
 .IF "$(SHL9NOCHECK)"==""
     -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
     $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
 .ENDIF				# "$(SHL9NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
@@ -4892,6 +4964,14 @@ SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH))
 SHL10DEF*=$(MISC)$/$(SHL10TARGET).def
 .ENDIF			# "$(SHL10USE_EXPORTS)"==""
 
+EXTRALIBPATHS10=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL10NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL10NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -5093,7 +5173,7 @@ $(MISC)$/%linkinc.ls:
 .IF "$(GUI)" == "OS2"
 #21/02/2006 YD dll names must be 8.3, invoke fix script
 #check osl/os2/module.c/osl_loadModule()
-SHL10TARGET8=$(shell @fix_shl.cmd $(SHL10TARGET))
+SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
@@ -5296,7 +5376,7 @@ $(SHL10TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL10NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
 .ENDIF				# "$(SHL10NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -5311,7 +5391,7 @@ $(SHL10TARGETN) : \
 .IF "$(SHL10NOCHECK)"==""
     -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
     $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
 .ENDIF				# "$(SHL10NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
diff --git a/solenv/inc/layout.mk b/solenv/inc/layout.mk
new file mode 100644
index 000000000000..97bdc9e72c2c
--- /dev/null
+++ b/solenv/inc/layout.mk
@@ -0,0 +1,32 @@
+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
+XML_DEST=$(DLLDEST)
+XML_LANGS=$(alllangiso)
+
+ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j"))
+
+# Must remove the -j (no duplicate base file names) flag
+ZIPUPDATE=-u
+XML_ZIP = $(PRJNAME)-layout
+
+ALLTAR: localize.sdf $(XML_ZIP)
+
+$(XML_ZIP): $(ALL_XMLS)
+
+ZIP1DIR=$(XML_DEST)
+ZIP1TARGET=$(XML_ZIP)
+ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
+
+$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
+    -$(MKDIR) $(@:d)
+    @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
+    $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<"
+
+$(XML_DEST)/%.xml: %.xml
+    -$(MKDIR) $(@:d)
+    $(COPY) "$<" "$@"
+
+# Don't want to overwrite filled localize.sdf with empty template
+template.sdf:
+    $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@
+
+$(ZIP1LIST): localize.sdf
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 20ad4728c394..a3b4fff24be4 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m46(Build:9397)
-BUILD=9397
-LAST_MINOR=m46
+RSCREVISION=300m50(Build:9406)
+BUILD=9406
+LAST_MINOR=m50
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 02f0ffdcf9a0..4fc5532f66bd 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -33,7 +33,7 @@ MKFILENAME:=RULES.MK
 
 $(OBJ)$/%.obj : %.cxx
     @echo ------------------------------
-    @echo Making: $@
+    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
@@ -58,7 +58,7 @@ $(OBJ)$/%.obj : %.cxx
 
 $(OBJ)$/%.obj : %.cpp
     @echo ------------------------------
-    @echo Making: $@
+    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
@@ -81,7 +81,7 @@ $(OBJ)$/%.obj : %.cpp
 
 $(OBJ)$/%.obj : %.cc
     @echo ------------------------------
-    @echo Making: $@
+    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc
@@ -163,7 +163,7 @@ $(SLO)$/precompiled_ex.% .PHONY:
 
 $(SLO)$/%.obj : %.cxx
     @echo ------------------------------
-    @echo Making: $@
+    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
@@ -528,7 +528,7 @@ $(MISC)$/%.dpslo :
     @@$(RM) $@
     @@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
     @@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
-    @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:^"\n") : $(MISC)$/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:^"\n") : $(MISC)$/s_$i)) >> $@
+    @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)$/s_$i)) >> $@
     @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
 
 $(MISC)$/%.dpobj :
@@ -536,7 +536,7 @@ $(MISC)$/%.dpobj :
     @@$(RM) $@
     @@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f)
     @@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f)
-    @$(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".dpcc") $(@:^"\n") : $(MISC)$/o_$i) $(foreach,i,$(all_misc_obj:b:+".dpcc") $(@:^"\n") : $(MISC)$/o_$i)) >> $@
+    @$(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/o_$i) $(foreach,i,$(all_misc_obj:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/o_$i)) >> $@
     @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_obj:b:+".dpcc":^"s_") $(all_misc_obj:b:+".dpcc":^"s_")) >> $@
 
 # see also %.dpslo 
@@ -818,12 +818,12 @@ $(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf
     @$(RENAME) $@.$(INPATH) $@
     @-$(RM) $@.$(INPATH)
 
-$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
-    -$(MKDIR) $(@:d)
-    -$(RM) $@
-    $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    $(RENAME) $@.$(INPATH) $@
-    -$(RM) $@.$(INPATH)
+#$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
+#    -$(MKDIR) $(@:d)
+#    -$(RM) $@
+#	$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+#    $(RENAME) $@.$(INPATH) $@
+#    -$(RM) $@.$(INPATH)
 
 # dirty hack
 # if local *.sdf file is missing
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 2af4ae71e47f..94623d259906 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -817,14 +817,6 @@ SOLARCOMMONRESDIR=$(SOLARRESDIR)
 SOLARCOMMONPCKDIR=$(SOLARPCKDIR)
 .ENDIF
 
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL$(TNR)NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF
-
 .IF "$(PRE)"==""
 #JARDIR=$(CLASSDIR)
 JARDIR=$(OUT)$/class
@@ -1129,6 +1121,18 @@ GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_OFF
 LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
 LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
 
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CDEFS+=-DENABLE_LAYOUT=1
+.ELSE # ENABLE_LAYOUT != TRUE
+CFLAGS+=-DENABLE_LAYOUT=0
+.ENDIF # ENABLE_LAYOUT != TRUE
+
+.IF "$(ENABLE_LAYOUT_EXPERIMENTAL)" == "TRUE"
+CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1
+.ELSE # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
+CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0
+.ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
+
 # compose flags and defines for GUI
 .IF "$(TARGETTYPE)"=="GUI"
 CDEFS+= $(CDEFSGUI)
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 60a69f8bd393..07853e84862e 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shlinfo.rc,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,30 +25,11 @@
  *
  ************************************************************************/
 
-#define VERSION			3
-#define SUBVERSION		0
-#define VERVARIANT		0
-
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
-
-#define VER_DAY			1
-#define VER_MONTH		9
-#define VER_YEAR		2008
-
-// -----------------------------------------------------------------------
-
 #if !defined(ENGLISH)
 #define LG_D 					// generate always german version
 #endif
 
-#define VER_FIRSTYEAR	VER_YEAR
+#define VER_FIRSTYEAR	2008
 
 
 #if defined(OS2)
@@ -61,30 +39,7 @@
 #else
 
 #include <windows.h>
-#include "verinfo.hrc"
-
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
-// -----------------------------------------------------------------------
-// 				language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-#ifdef LG_D
-	"040704B0", 	// Germany -> Unicode
-	"040704E4", 	// Germany -> Windows, Multilingual
-#else
-	"040904B0", 	// Germany -> Unicode
-	"040904E4", 	// USA -> Windows, Multilingual
-#endif
-	"04090000", 	// USA -> 7-Bit-ASCII
-	0				// end of table
-}
+#include "version.hrc"
 
 // -----------------------------------------------------------------------
 // 				version information
@@ -92,11 +47,11 @@ RCD_LANGUAGE rcdata
 
 VS_VERSION_INFO versioninfo
 #ifndef SUBVERSION
-	fileversion    VERSION, 0, 0, VERVARIANT
-	productversion VERSION, 0, 0, VERVARIANT
+	fileversion    VERSION, 0, VERVARIANT, VER_COUNT
+	productversion VERSION, 0, VERVARIANT, VER_COUNT
 #else
-	fileversion    VERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, VERVARIANT, VER_COUNT
+	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
 #endif
 	fileflagsmask 0x3F
 	fileflags
@@ -120,7 +75,7 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"Sun Microsystems, Inc.\0"
+				value "CompanyName",		"OpenOffice.org\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
@@ -133,7 +88,7 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"Sun Microsystems, Inc.\0"
+				value "CompanyName",		"OpenOffice.org\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
@@ -155,11 +110,4 @@ VS_VERSION_INFO versioninfo
 		}
 	}
 
-// version binary entry
-VS_VERSION_INFO rcdata
-{
-	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-	VERSION, VERVARIANT, VER_COUNT
-};
-
 #endif // OS2
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 4a2240df53ac..61de65158927 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -226,7 +226,7 @@ NEWCLASS+=$(CLASSGENDIR)
 .ENDIF			# "$(GENJAVACLASSFILES)"!=""
 .IF "$(NEWCLASS)"!=""
 # See iz36027 for the reason for the strange $(subst ..) construct
-CLASSPATH:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(XCLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(NEWCLASS:s/ /%Z*Z%/))}
+CLASSPATH:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(XCLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(NEWCLASS:s/ /%Z*Z%/))}$(PATH_SEPERATOR)$(SOLARLIBDIR)
 .ENDIF			# "$(NEWCLASS)"!=""
 .ENDIF			# "$(L10N_framework)"==""
 
@@ -1442,9 +1442,9 @@ $(SCP_PRODUCT_TYPE):
 
 .IF "$(COMPVERMK)"!=""
 .IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
-.IF "$(COMPATH)"!="$(COMPATH_STORED)"
+.IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 COMPVERMK_PHONY:=.PHONY
-.ENDIF			# "$(COMPATH)"!="$(COMPATH_STORED)"
+.ENDIF			# "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 COMPVTMP:=$(mktmp iii)
 "$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
 .IF "$(CCNUMVER)"!=""
@@ -1456,9 +1456,9 @@ COMPVTMP:=$(mktmp iii)
     @echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP)
     @echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP)
     @echo CDEFS+=-DCPPU_ENV=$(COMNAME) >> $(COMPVTMP)
-    @echo COMPATH_STORED:=$(COMPATH) >> $(COMPVTMP)
+    @echo COMPATH_STORED:=$(COMPATH:s!\!/!) >> $(COMPVTMP)
     @@-$(RM) $(@)_$(COMPVTMP:b)
-    @$(TYPE) $(COMPVTMP) > $(@)_$(COMPVTMP:b)
+    @$(TYPE) $(COMPVTMP) | tr -d "\015" > $(@)_$(COMPVTMP:b)
     @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
     @-$(RENAME) $(@)_$(COMPVTMP:b) $@
     @@-$(RM) $(@)_$(COMPVTMP:b)
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 64ba62171e73..8ad196a17057 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -33,7 +33,7 @@ COMPVERMK:=$(SOLARINCDIR)$/comp_ver.mk
 
 .INCLUDE .IGNORE : $(COMPVERMK)
 
-.IF "$(COMNAME)"=="" || "$(COMPATH)"!="$(COMPATH_STORED)"
+.IF "$(COMNAME)"=="" || "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 .IF "$(L10N_framework)"==""
 
 COMNAME:=
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 490b327f564d..53d35aa77955 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -50,10 +50,16 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
 #override
 PACKAGE_DIR=$(MISC)$/build
 ABS_PACKAGE_DIR:=$(MAKEDIR)$/$(MISC)$/build
+
 #MUST match with PACKAGE_DIR
 BACK_PATH=..$/..$/..$/
 #MUST match with reference (currently MISC)
 MBACK_PATH=..$/..$/
+.IF "$(TARFILE_IS_FLAT)" != ""
+fake_root_dir=$/$(TARFILE_NAME)
+#MUST match fake_root_dir in directory levels
+fake_back=..$/
+.ENDIF "$(TARFILE_IS_FLAT)" != ""
 
 P_CONFIGURE_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(CONFIGURE_DIR)
 P_BUILD_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(BUILD_DIR)
@@ -102,9 +108,9 @@ clean:
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
@@ -112,43 +118,43 @@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.Z | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.Z | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.gz $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tgz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)download$/$(TARFILE_NAME).tgz $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tgz $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
     @-$(RM) $@
-    noop $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)download$/$(TARFILE_NAME).tar)
+    noop $(assign UNPACKCMD := $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.zip
     @-$(RM) $@
-    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)download$/$(TARFILE_NAME).zip)
+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).zip)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.jar
     @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-    noop $(assign UNPACKCMD := jar xf $(BACK_PATH)download$/$(TARFILE_NAME).jar)
+    noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar)
 .ELSE			# "$(OS)"=="SOLARIS"
-    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)download$/$(TARFILE_NAME).jar)
+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar)
 .ENDIF			# "$(OS)"=="SOLARIS"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
@@ -157,8 +163,8 @@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.jar
 $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
     $(IFEXIST) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme $(FI)
     -rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme
-    @-$(MKDIRHIER) $(PACKAGE_DIR)
-    cd $(PACKAGE_DIR) && ( $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
+    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+    cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
@@ -300,7 +306,8 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
 $(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES)
     @-mv $(MISC)$/$(TARFILE_ROOTDIR) $(MISC)$/$(TARFILE_ROOTDIR).old
     @-rm -rf $(MISC)$/$(TARFILE_ROOTDIR).old
-    cd $(MISC) && $(subst,$(BACK_PATH),..$/..$/ $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack))
+    @-$(MKDIRHIER) $(MISC)$(fake_root_dir)
+    cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack))
 .IF "$(P_ADDITIONAL_FILES)"!=""
     noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i))
 .ENDIF			 "$(P_ADDITIONAL_FILES)"!=""
@@ -318,7 +325,7 @@ $(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES
 .ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE           # "$(GUI)"=="WNT"
 .IF "$(BSCLIENT)"=="TRUE"
-    cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/${(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
+    cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
 .ELSE           # "$(BSCLIENT)"!=""
     cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
 .ENDIF          # "$(BSCLIENT)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 283b7bafd855..327e205c22f8 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -65,6 +65,14 @@ SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH))
 SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 
+EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS)
+.IF "$(UPDATER)"=="YES"
+.IF "$(SHL$(TNR)NOCHECK)"==""
+.IF "$(SOLAR_STLLIBPATH)"!=""
+EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH)
+.ENDIF
+.ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
+.ENDIF
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -469,7 +477,7 @@ $(SHL$(TNR)TARGETN) : \
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
 .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
@@ -484,7 +492,7 @@ $(SHL$(TNR)TARGETN) : \
 .IF "$(SHL$(TNR)NOCHECK)"==""
     -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
     $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
 .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 4fff82ede315..f62357808ef6 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -73,7 +73,7 @@ PIPEERROR=|&
 
 # iz31658
 .IF "$(USE_SHELL)"=="bash"
-CHECKZIPRESULT:=|| if test "$$?" != "12" && "$$?" != "1" ; then exit $$? ; fi && echo "Nothing to update for zip"
+CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then exit $$ret ; fi && echo "Nothing to update for zip"
 .ELSE
 CHECKZIPRESULT:=|| if ("$$status" != "12" && "$$status" != "1") exit $$status && echo "Nothing to update for zip"
 .ENDIF
@@ -172,6 +172,7 @@ COPYRECURSE=-r
 AWK*=nawk
 GNUCOPY*=gnucp
 GNUPATCH*=gnupatch
+GNUTAR*=gtar
 .ELSE			# "$(OS)"=="SOLARIS"
 AWK*=awk
 GNUCOPY*=cp
@@ -223,6 +224,8 @@ MKDIR*=mkdir$E
 MKDIRHIER*=mkdir$E -p
 RMDIR*=rmdir
 XARGS*=xargs
+GNUTAR*:=tar
+TAR*:=tar
 
 RM+=$(RMFLAGS)
 ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) adjustvisibility
diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk
index 51d52241b498..3cc514c8b9a0 100644
--- a/solenv/inc/unxlngi6.mk
+++ b/solenv/inc/unxlngi6.mk
@@ -157,10 +157,15 @@ LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
 LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
 
 # linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
 
 # linker flags for linking shared libraries
 LINKFLAGSSHLGUI= -shared
@@ -202,11 +207,11 @@ LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
 # libraries for linking applications
-STDLIBGUIMT+=-lX11 -ldl -lpthread -lm
-STDLIBCUIMT+=-ldl -lpthread -lm
+STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
+STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 # libraries for linking shared libraries
-STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
-STDSHLCUIMT+=-ldl -lpthread -lm
+STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
+STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk
index f2fc03f20eac..073293c33652 100644
--- a/solenv/inc/unxlngx6.mk
+++ b/solenv/inc/unxlngx6.mk
@@ -77,12 +77,6 @@ CFLAGS+=-Wreturn-type -fmessage-length=0 -c
 CFLAGSENABLESYMBOLS=-g1
 .ELSE
 CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-LINKFLAGS += -Wl,--hash-style=both
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
 # flags for the C++ Compiler
@@ -139,7 +133,6 @@ CFLAGSWERRCC=-Werror
 # settings.mk):
 
 MODULES_WITH_WARNINGS := \
-    extensions \
     soldep \
     svx
 
@@ -162,10 +155,21 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
+
+.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+LINKFLAGS += -Wl,--hash-style=both
+.ELSE
+LINKFLAGS += -Wl,-zdynsort
+.ENDIF
 
 # linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
 
 # linker flags for linking shared libraries
 LINKFLAGSSHLGUI= -shared
@@ -195,11 +199,11 @@ STDOBJCUI=
 STDSLOCUI=
 
 # libraries for linking applications
-STDLIBGUIMT+=-lX11 -ldl -lpthread -lm
-STDLIBCUIMT+=-ldl -lpthread -lm
+STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
+STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 # libraries for linking shared libraries
-STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
-STDSHLCUIMT+=-ldl -lpthread -lm
+STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
+STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
index 16a412f9bbba..58e98b3a1c6d 100644
--- a/solenv/inc/verinfo.hrc
+++ b/solenv/inc/verinfo.hrc
@@ -206,7 +206,7 @@
 #define VERC4(a, b, c) VERC3(a, b, c)
 #define VER_DATE VERC4(VER5, VER2, VER_YEAR)
 
-#if VER_FIRSTYEAR==VER_YEAR
+#if PPCAT(1, VER_FIRSTYEAR)==PPCAT(1, VER_YEAR)
   #define VER_YEARRANGE VER_FIRSTYEAR
 #else
   #define VER_YEARRANGE VER_FIRSTYEAR-VER_YEAR
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
new file mode 100644
index 000000000000..6de6b3c99763
--- /dev/null
+++ b/solenv/inc/version.hrc
@@ -0,0 +1,80 @@
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2009 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ *************************************************************************/

+

+#define VERSION         3

+#define SUBVERSION      2

+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)

+// .0 + VER_CONCEPT

+// .100 + VER_ALPHA

+// .200 + VER_BETA

+// .300 + VER_GAMMA

+// .500 + VER_FINAL

+//#define VER_CONCEPT       0

+//#define VER_BETA      6

+#define VER_FINAL       0

+

+#define VER_DAY         1

+#define VER_MONTH       9

+#define VER_YEAR        2009

+

+#ifndef VER_FIRSTYEAR

+#define VER_FIRSTYEAR   VER_YEAR

+#endif

+

+#include "verinfo.hrc"

+

+#ifdef WIN32

+#define FOR_WIN_X " (32 Bit)"

+#else

+#define FOR_WIN_X ""

+#endif

+

+// -----------------------------------------------------------------------

+//              language/character set specification table

+// -----------------------------------------------------------------------

+

+RCD_LANGUAGE rcdata

+{

+#ifdef LG_D

+    "040704B0",     // Germany -> Unicode

+    "040704E4",     // Germany -> Windows, Multilingual

+#else

+    "040904B0",     // Germany -> Unicode

+    "040904E4",     // USA -> Windows, Multilingual

+#endif

+    "04090000",     // USA -> 7-Bit-ASCII

+    0               // end of table

+}

+

+

+// version binary entry

+VS_VERSION_INFO rcdata

+{

+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

+};

+

diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
new file mode 100644
index 000000000000..6eb9a183d6bd
--- /dev/null
+++ b/solenv/inc/version_so.hrc
@@ -0,0 +1,79 @@
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2009 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ *************************************************************************/

+

+#define VERSION         9

+#define SUBVERSION      2

+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)

+// .0 + VER_CONCEPT

+// .100 + VER_ALPHA

+// .200 + VER_BETA

+// .300 + VER_GAMMA

+// .500 + VER_FINAL

+//#define VER_CONCEPT       0

+//#define VER_BETA      6

+#define VER_FINAL       0

+

+#define VER_DAY         1

+#define VER_MONTH       9

+#define VER_YEAR        2009

+

+#ifndef VER_FIRSTYEAR

+#define VER_FIRSTYEAR   VER_YEAR

+#endif

+

+#include "verinfo.hrc"

+

+#ifdef WIN32

+#define FOR_WIN_X " (32 Bit)"

+#else

+#define FOR_WIN_X ""

+#endif

+

+// -----------------------------------------------------------------------

+//              language/character set specification table

+// -----------------------------------------------------------------------

+

+RCD_LANGUAGE rcdata

+{

+#ifdef LG_D

+    "040704B0",     // Germany -> Unicode

+    "040704E4",     // Germany -> Windows, Multilingual

+#else

+    "040904B0",     // Germany -> Unicode

+    "040904E4",     // USA -> Windows, Multilingual

+#endif

+    "04090000",     // USA -> 7-Bit-ASCII

+    0               // end of table

+}

+

+// version binary entry

+VS_VERSION_INFO rcdata

+{

+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

+};

+

diff --git a/solenv/unxmacxp/inc/poll.h b/solenv/unxmacxp/inc/poll.h
new file mode 100644
index 000000000000..761b59dbec1f
--- /dev/null
+++ b/solenv/unxmacxp/inc/poll.h
@@ -0,0 +1,173 @@
+// poll.h
+// MacOS X does not implement poll().  Therefore, this replacement
+// is required.  It uses select().
+
+#ifndef _FAKE_POLL_H
+#define _FAKE_POLL_H
+
+#include <sys/errno.h>
+#include <string.h>
+#include <limits.h>
+#undef FD_SETSIZE
+#define FD_SETSIZE OPEN_MAX
+#include <sys/types.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+typedef struct pollfd {
+    int fd;                         /* file desc to poll */
+    short events;                   /* events of interest on fd */
+    short revents;                  /* events that occurred on fd */
+} pollfd_t;
+
+
+// poll flags
+#define POLLIN  0x0001
+#define POLLOUT 0x0004
+#define POLLERR 0x0008
+
+// synonyms
+#define POLLNORM POLLIN
+#define POLLPRI POLLIN
+#define POLLRDNORM POLLIN
+#define POLLRDBAND POLLIN
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND POLLOUT
+
+// ignored
+#define POLLHUP 0x0010
+#define POLLNVAL 0x0020
+
+inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
+{
+    struct timeval      tv;
+    struct timeval      *tvp;
+    fd_set          readFDs, writeFDs, exceptFDs;
+    fd_set          *readp, *writep, *exceptp;
+    struct pollfd       *pollEnd, *p;
+    int             selected;
+    int             result;
+    int             maxFD;
+
+    if ( !pollSet )
+    {
+        pollEnd = NULL;
+        readp = NULL;
+        writep = NULL;
+        exceptp = NULL;
+        maxFD = 0;
+    }
+    else
+    {
+        pollEnd = pollSet + pollCount;
+        readp = &readFDs;
+        writep = &writeFDs;
+        exceptp = &exceptFDs;
+
+        FD_ZERO(readp);
+        FD_ZERO(writep);
+        FD_ZERO(exceptp);
+
+        // Find the biggest fd in the poll set
+        maxFD = 0;
+        for (p = pollSet; p < pollEnd; p++)
+        {
+            if (p->fd > maxFD)
+                maxFD = p->fd;
+        }
+
+        if (maxFD >= FD_SETSIZE)
+        {
+            // At least one fd is too big
+            errno = EINVAL;
+            return -1;
+        }
+
+        // Transcribe flags from the poll set to the fd sets
+        for (p = pollSet; p < pollEnd; p++)
+        {
+            if (p->fd < 0)
+            {
+                // Negative fd checks nothing and always reports zero
+            }
+            else
+            {
+                if (p->events & POLLIN)
+                    FD_SET(p->fd, readp);
+                if (p->events & POLLOUT)
+                    FD_SET(p->fd, writep);
+                if (p->events != 0)
+                    FD_SET(p->fd, exceptp);
+                // POLLERR is never set coming in; poll() always reports errors
+                // But don't report if we're not listening to anything at all.
+            }
+        }
+    }
+
+    // poll timeout is in milliseconds. Convert to struct timeval.
+    // poll timeout == -1 : wait forever : select timeout of NULL
+    // poll timeout == 0  : return immediately : select timeout of zero
+    if (pollTimeout >= 0)
+    {
+        tv.tv_sec = pollTimeout / 1000;
+        tv.tv_usec = (pollTimeout % 1000) * 1000;
+        tvp = &tv;
+    }
+    else
+    {
+        tvp = NULL;
+    }
+
+    selected = select(maxFD+1, readp, writep, exceptp, tvp);
+
+    if (selected < 0)
+    {
+        // Error during select
+        result = -1;
+    }
+    else if (selected > 0)
+    {
+        // Select found something
+        // Transcribe result from fd sets to poll set.
+        // Also count the number of selected fds. poll returns the
+        // number of ready fds; select returns the number of bits set.
+        int polled = 0;
+        for (p = pollSet; p < pollEnd; p++)
+        {
+            p->revents = 0;
+            if (p->fd < 0) {
+                // Negative fd always reports zero
+            }
+            else
+            {
+                if ( (p->events & POLLIN) && FD_ISSET(p->fd, readp) )
+                    p->revents |= POLLIN;
+                if ( (p->events & POLLOUT) && FD_ISSET(p->fd, writep) )
+                    p->revents |= POLLOUT;
+                if ( (p->events != 0) && FD_ISSET(p->fd, exceptp) )
+                    p->revents |= POLLERR;
+
+                if (p->revents)
+                    polled++;
+            }
+        }
+        result = polled;
+    }
+    else
+    {
+        // selected == 0, select timed out before anything happened
+        // Clear all result bits and return zero.
+        for (p = pollSet; p < pollEnd; p++)
+            p->revents = 0;
+
+        result = 0;
+    }
+
+    return result;
+}
+
+
+#undef FD_SETSIZE
+
+#endif
diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl
index b6c576c3195b..eb9e540f0a82 100644
--- a/soltools/testhxx/create.pl
+++ b/soltools/testhxx/create.pl
@@ -91,9 +91,59 @@ if ($ENV{OS} eq 'LINUX') {
         "\n";
     print STDOUT 'QUIT %my_ret%', "\n";
 } elsif ($ENV{OS} eq 'WNT' and $ENV{USE_SHELL} ne '4nt') {
-    print STDOUT '#!/bin/bash', "\n";
-    print STDOUT 'echo testhxx not yet available on this platform 1>&2', "\n";
-    print STDOUT 'exit 1', "\n";
+  if ($ENV{COM} eq 'GCC') {
+    1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
+    $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og;
+        # macrofy includes to solver
+    $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o';
+    $in =~ s!\S+/testhxx.cxx!\${my_tmp}!
+        || die 'bad input: no source file';
+    print STDOUT '#!/bin/sh', "\n";
+    print STDOUT
+        'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n";
+    print STDOUT 'my_pat=`dirname $1`', "\n";
+    print STDOUT 'my_fil=`basename $1`', "\n";
+    print STDOUT 'my_org=${PWD}', "\n";
+    print STDOUT 'cd $my_pat || exit 1', "\n";
+    print STDOUT 'my_pat=`cygpath -m \`pwd\``', "\n";
+    print STDOUT 'cd $my_org || exit 1', "\n";
+    print STDOUT
+        'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n";
+    print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n";
+    print STDOUT 'my_ret=$?', "\n";
+    print STDOUT
+        'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;',
+        ' fi', "\n";
+    print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
+    print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
+    print STDOUT 'exit ${my_ret}', "\n";
+  } else {
+    1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
+    $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og;
+        # macrofy includes to solver
+    $in =~ s!\s+-Fo\s*\S+! -Fo$[my_tmp}obj! || die 'bad input: no -Fo';
+    $in =~ s!\s+-Zi\s! !;
+    $in =~ s!\s+-Fd\s*\S+!!;
+    print STDOUT '#!/bin/sh', "\n";
+    print STDOUT
+        'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n";
+    print STDOUT 'my_pat=`dirname $1`', "\n";
+    print STDOUT 'my_fil=`basename $1`', "\n";
+    print STDOUT 'my_org=${PWD}', "\n";
+    print STDOUT 'cd $my_pat || exit 1', "\n";
+    print STDOUT 'my_pat=`pwd`', "\n";
+    print STDOUT 'cd $my_org || exit 1', "\n";
+    print STDOUT
+        'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n";
+    print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n";
+    print STDOUT 'my_ret=$?', "\n";
+    print STDOUT
+        'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;',
+        ' fi', "\n";
+    print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
+    print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
+    print STDOUT 'exit ${my_ret}', "\n";
+  }
 } else {
     print STDOUT 'echo \'no testhxx on this platform\'', "\n";
 }
diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx
index ffe70d1bfeb1..fcded0bd9521 100644
--- a/soltools/testhxx/testhxx.cxx
+++ b/soltools/testhxx/testhxx.cxx
@@ -28,7 +28,8 @@
  *
  ************************************************************************/
 
+// NO PCH here - breaks the purpose of this file
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
+//#include "precompiled_soltools.hxx"
 
 // This is just a dummy file; see the makefile.mk for the real work.
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index b20966b8ef7b..9689db5da3b6 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -151,6 +151,10 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
 CXX+= -Wl,--hash-style=both
 .ENDIF
 
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
+CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
+
 .IF "$(COM)"=="C52"
 BUILD_ACTION=make
 .IF "$(CCNUMVER)">="00050008"
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index 88a186ffeb87..f379d7d14c36 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -17,9 +17,8 @@ mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
 ..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
 ..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
 ..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
-..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%\lib*.so*
+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll